diff --git a/.gitignore b/.gitignore index b9dd788..7ee56bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .idea .project jy_parkingOS.iml +.idea/misc.xml # Windows [Dd]esktop.ini diff --git a/common/uni.css b/common/uni.css index a875397..2775b67 100644 --- a/common/uni.css +++ b/common/uni.css @@ -9,9 +9,11 @@ .fix-left-window { padding-left: var(--window-left); } + .pc-hide { display: none !important; } + /* #endif */ /*通用 */ @@ -20,50 +22,62 @@ font-size:28rpx; line-height:1.8; } */ -progress, checkbox-group{ +progress, +checkbox-group { width: 100%; } + form { width: 100%; } + .uni-flex { display: flex; flex-direction: row; } + .uni-flex-item { flex: 1; } + .uni-row { flex-direction: row; } + .uni-column { flex-direction: column; } -.uni-link{ - color:#576B95; - font-size:26rpx; + +.uni-link { + color: #576B95; + font-size: 26rpx; } -.uni-center{ - text-align:center; + +.uni-center { + text-align: center; } -.uni-inline-item{ + +.uni-inline-item { display: flex; flex-direction: row; - align-items:center; + align-items: center; } -.uni-inline-item text{ + +.uni-inline-item text { margin-right: 20rpx; } -.uni-inline-item text:last-child{ + +.uni-inline-item text:last-child { margin-right: 0rpx; margin-left: 20rpx; } /* page */ -.common-page-head{ - padding:35rpx; +.common-page-head { + padding: 35rpx; text-align: center; } + .common-page-head-title { display: inline-block; padding: 0 40rpx; @@ -75,122 +89,181 @@ form { border-bottom: 2rpx solid #D8D8D8; } -.uni-padding-wrap{ +.uni-padding-wrap { /* width:690rpx; */ - padding:0 30rpx; + padding: 0 30rpx; } + .uni-word { text-align: center; - padding:200rpx 100rpx; + padding: 200rpx 100rpx; } + .uni-title { - font-size:30rpx; - font-weight:500; - padding:20rpx 0; - line-height:1.5; + font-size: 30rpx; + font-weight: 500; + padding: 20rpx 0; + line-height: 1.5; } -.uni-text{ - font-size:28rpx; + +.uni-text { + font-size: 28rpx; } -.uni-title text{ - font-size:24rpx; - color:#888; + +.uni-title text { + font-size: 24rpx; + color: #888; } -.uni-text-gray{ +.uni-text-gray { color: #ccc; } + .uni-text-small { - font-size:24rpx; + font-size: 24rpx; } -.uni-common-mb{ - margin-bottom:30rpx; + +.uni-common-mb { + margin-bottom: 30rpx; } -.uni-common-pb{ - padding-bottom:30rpx; + +.uni-common-pb { + padding-bottom: 30rpx; } -.uni-common-pl{ - padding-left:30rpx; + +.uni-common-pl { + padding-left: 30rpx; } -.uni-common-mt{ - margin-top:30rpx; + +.uni-common-mt { + margin-top: 30rpx; } + /* 背景色 */ -.uni-bg-red{ - background:#F76260; color:#FFF; +.uni-bg-red { + background: #F76260; + color: #FFF; } -.uni-bg-green{ - background:#09BB07; color:#FFF; + +.uni-bg-green { + background: #09BB07; + color: #FFF; } -.uni-bg-blue{ - background:#007AFF; color:#FFF; + +.uni-bg-blue { + background: #007AFF; + color: #FFF; } + /* 标题 */ -.uni-h1 {font-size: 80rpx; font-weight:700;} -.uni-h2 {font-size: 60rpx; font-weight:700;} -.uni-h3 {font-size: 48rpx; font-weight:700;} -.uni-h4 {font-size: 36rpx; font-weight:700;} -.uni-h5 {font-size: 28rpx; color: #8f8f94;} -.uni-h6 {font-size: 24rpx; color: #8f8f94;} -.uni-bold{font-weight:bold;} +.uni-h1 { + font-size: 80rpx; + font-weight: 700; +} + +.uni-h2 { + font-size: 60rpx; + font-weight: 700; +} + +.uni-h3 { + font-size: 48rpx; + font-weight: 700; +} + +.uni-h4 { + font-size: 36rpx; + font-weight: 700; +} + +.uni-h5 { + font-size: 28rpx; + color: #8f8f94; +} + +.uni-h6 { + font-size: 24rpx; + color: #8f8f94; +} + +.uni-bold { + font-weight: bold; +} /* 文本溢出隐藏 */ -.uni-ellipsis {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} +.uni-ellipsis { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} /* 竖向百分百按钮 */ -.uni-btn-v{ - padding:10rpx 0; +.uni-btn-v { + padding: 10rpx 0; +} + +.uni-btn-v button { + margin: 20rpx 0; } -.uni-btn-v button{margin:20rpx 0;} /* 表单 */ -.uni-form-item{ - display:flex; - width:100%; - padding:10rpx 0; +.uni-form-item { + display: flex; + width: 100%; + padding: 10rpx 0; } -.uni-form-item .title{ - padding:10rpx 25rpx; + +.uni-form-item .title { + padding: 10rpx 25rpx; } + .uni-label { width: 210rpx; word-wrap: break-word; word-break: break-all; - text-indent:20rpx; + text-indent: 20rpx; } + .uni-input { height: 50rpx; padding: 15rpx 25rpx; - line-height:50rpx; - font-size:28rpx; - background:#FFF; + line-height: 50rpx; + font-size: 28rpx; + background: #FFF; flex: 1; } -radio-group, checkbox-group{ - width:100%; + +radio-group, +checkbox-group { + width: 100%; } -radio-group label, checkbox-group label{ - padding-right:20rpx; + +radio-group label, +checkbox-group label { + padding-right: 20rpx; } -.uni-form-item .with-fun{ - display:flex; - flex-wrap:nowrap; - background:#FFFFFF; + +.uni-form-item .with-fun { + display: flex; + flex-wrap: nowrap; + background: #FFFFFF; } -.uni-form-item .with-fun .uni-icon{ - width:40px; - height:80rpx; - line-height:80rpx; - flex-shrink:0; + +.uni-form-item .with-fun .uni-icon { + width: 40px; + height: 80rpx; + line-height: 80rpx; + flex-shrink: 0; } /* loadmore */ -.uni-loadmore{ - height:80rpx; - line-height:80rpx; - text-align:center; - padding-bottom:30rpx; +.uni-loadmore { + height: 80rpx; + line-height: 80rpx; + text-align: center; + padding-bottom: 30rpx; } + /*数字角标*/ /* .uni-badge, .uni-badge-default { @@ -208,50 +281,60 @@ radio-group label, checkbox-group label{ color: #929292; background-color: transparent } + .uni-badge-primary { color: #fff; background-color: #007aff } + .uni-badge-blue.uni-badge-inverted, .uni-badge-primary.uni-badge-inverted { color: #007aff; background-color: transparent } + .uni-badge-green, .uni-badge-success { color: #fff; background-color: #4cd964; } + .uni-badge-green.uni-badge-inverted, .uni-badge-success.uni-badge-inverted { color: #4cd964; background-color: transparent } + .uni-badge-warning, .uni-badge-yellow { color: #fff; background-color: #f0ad4e } + .uni-badge-warning.uni-badge-inverted, .uni-badge-yellow.uni-badge-inverted { color: #f0ad4e; background-color: transparent } + .uni-badge-danger, .uni-badge-red { color: #fff; background-color: #dd524d } + .uni-badge-danger.uni-badge-inverted, .uni-badge-red.uni-badge-inverted { color: #dd524d; background-color: transparent } + .uni-badge-purple, .uni-badge-royal { color: #fff; background-color: #8a6de9 } + .uni-badge-purple.uni-badge-inverted, .uni-badge-royal.uni-badge-inverted { color: #8a6de9; @@ -264,6 +347,7 @@ radio-group label, checkbox-group label{ width: 100%; overflow: hidden; } + .uni-collapse-content.uni-active { height: auto; } @@ -272,21 +356,25 @@ radio-group label, checkbox-group label{ .uni-card { background: #fff; border-radius: 8rpx; - margin:20rpx 0; + margin: 20rpx 0; position: relative; /* box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, .3); */ } + .uni-card-content { font-size: 30rpx; } -.uni-card-content.image-view{ - width: 100%; - margin: 0; + +.uni-card-content.image-view { + width: 100%; + margin: 0; } + .uni-card-content-inner { position: relative; padding: 30rpx; } + .uni-card-footer, .uni-card-header { position: relative; @@ -296,12 +384,15 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: center; } + .uni-card-header { font-size: 36rpx; } + .uni-card-footer { color: #6d6d72; } + .uni-card-footer:before, .uni-card-header:after { position: absolute; @@ -314,18 +405,22 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-card-header:after { top: auto; bottom: 0; } + .uni-card-media { justify-content: flex-start; } + .uni-card-media-logo { height: 84rpx; width: 84rpx; margin-right: 20rpx; } + .uni-card-media-body { height: 84rpx; display: flex; @@ -333,15 +428,18 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: flex-start; } + .uni-card-media-text-top { line-height: 36rpx; font-size: 34rpx; } + .uni-card-media-text-bottom { line-height: 30rpx; font-size: 28rpx; color: #8f8f94; } + .uni-card-link { color: #007AFF; } @@ -354,6 +452,7 @@ radio-group label, checkbox-group label{ display: flex; flex-direction: column; } + .uni-list:after { position: absolute; z-index: 10; @@ -366,6 +465,7 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + /* .uni-list::before { position: absolute; z-index: 10; @@ -385,21 +485,26 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: center; } + .uni-list-cell-hover { background-color: #eee; } + .uni-list-cell-pd { padding: 22rpx 30rpx; } + .uni-list-cell-left { - white-space: nowrap; - font-size:28rpx; + white-space: nowrap; + font-size: 28rpx; padding: 0 30rpx; } + .uni-list-cell-db, .uni-list-cell-right { flex: 1; } + .uni-list-cell::after { position: absolute; z-index: 3; @@ -412,19 +517,23 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list .uni-list-cell:last-child::after { height: 0rpx; } + .uni-list-cell-last.uni-list-cell::after { height: 0rpx; } + .uni-list-cell-divider { position: relative; display: flex; color: #999; background-color: #f7f7f7; - padding:15rpx 20rpx; + padding: 15rpx 20rpx; } + .uni-list-cell-divider::before { position: absolute; right: 0; @@ -436,6 +545,7 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list-cell-divider::after { position: absolute; right: 0; @@ -447,8 +557,9 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list-cell-navigate { - font-size:30rpx; + font-size: 30rpx; padding: 22rpx 30rpx; line-height: 48rpx; position: relative; @@ -459,12 +570,15 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: center; } + .uni-list-cell-navigate { padding-right: 36rpx; } + .uni-navigate-badge { padding-right: 50rpx; } + .uni-list-cell-navigate.uni-navigate-right:after { font-family: uniicons; content: '\e583'; @@ -475,6 +589,7 @@ radio-group label, checkbox-group label{ -webkit-transform: translateY(-50%); transform: translateY(-50%); } + .uni-list-cell-navigate.uni-navigate-bottom:after { font-family: uniicons; content: '\e581'; @@ -485,6 +600,7 @@ radio-group label, checkbox-group label{ -webkit-transform: translateY(-50%); transform: translateY(-50%); } + .uni-list-cell-navigate.uni-navigate-bottom.uni-active::after { font-family: uniicons; content: '\e580'; @@ -495,23 +611,29 @@ radio-group label, checkbox-group label{ -webkit-transform: translateY(-50%); transform: translateY(-50%); } + .uni-collapse.uni-list-cell { flex-direction: column; } + .uni-list-cell-navigate.uni-active { background: #eee; } + .uni-list.uni-collapse { box-sizing: border-box; height: 0; overflow: hidden; } + .uni-collapse .uni-list-cell { padding-left: 20rpx; } + .uni-collapse .uni-list-cell::after { left: 52rpx; } + .uni-list.uni-active { height: auto; } @@ -525,18 +647,26 @@ radio-group label, checkbox-group label{ flex-direction: row; padding: 22rpx 30rpx; } + .uni-triplex-right, .uni-triplex-left { display: flex; flex-direction: column; } + .uni-triplex-left { width: 84%; } -.uni-triplex-left .uni-title{ - padding:8rpx 0; + +.uni-triplex-left .uni-title { + padding: 8rpx 0; +} + +.uni-triplex-left .uni-text, +.uni-triplex-left .uni-text-small { + color: #999999; } -.uni-triplex-left .uni-text, .uni-triplex-left .uni-text-small{color:#999999;} + .uni-triplex-right { width: 16%; text-align: right; @@ -550,25 +680,31 @@ radio-group label, checkbox-group label{ width: 100%; flex-direction: row; } + .uni-navigate-right.uni-media-list { padding-right: 74rpx; } + .uni-pull-right { flex-direction: row-reverse; } + .uni-pull-right>.uni-media-list-logo { margin-right: 0rpx; margin-left: 20rpx; } + .uni-media-list-logo { height: 84rpx; width: 84rpx; margin-right: 20rpx; } + .uni-media-list-logo image { height: 100%; width: 100%; } + .uni-media-list-body { height: 84rpx; display: flex; @@ -578,11 +714,13 @@ radio-group label, checkbox-group label{ align-items: flex-start; overflow: hidden; } + .uni-media-list-text-top { width: 100%; line-height: 36rpx; font-size: 30rpx; } + .uni-media-list-text-bottom { width: 100%; line-height: 30rpx; @@ -599,6 +737,7 @@ radio-group label, checkbox-group label{ flex-wrap: wrap; border-top: 2rpx solid #eee; } + .uni-grid-9-item { width: 250rpx; height: 200rpx; @@ -611,13 +750,16 @@ radio-group label, checkbox-group label{ border-color: #eee; box-sizing: border-box; } + .no-border-right { border-right: none; } + .uni-grid-9-image { width: 100rpx; height: 100rpx; } + .uni-grid-9-text { width: 250rpx; line-height: 4rpx; @@ -625,6 +767,7 @@ radio-group label, checkbox-group label{ text-align: center; font-size: 30rpx; } + .uni-grid-9-item-hover { background: rgba(0, 0, 0, 0.1); } @@ -634,39 +777,47 @@ radio-group label, checkbox-group label{ flex: 1; flex-direction: column; } + .uni-uploader-head { display: flex; flex-direction: row; justify-content: space-between; } + .uni-uploader-info { color: #B2B2B2; } + .uni-uploader-body { margin-top: 16rpx; } + .uni-uploader__files { display: flex; flex-direction: row; flex-wrap: wrap; } + .uni-uploader__file { margin: 10rpx; width: 210rpx; height: 210rpx; } + .uni-uploader__img { display: block; width: 210rpx; height: 210rpx; } + .uni-uploader__input-box { position: relative; - margin:10rpx; + margin: 10rpx; width: 208rpx; height: 208rpx; border: 2rpx solid #D9D9D9; } + .uni-uploader__input-box:before, .uni-uploader__input-box:after { content: " "; @@ -677,21 +828,26 @@ radio-group label, checkbox-group label{ transform: translate(-50%, -50%); background-color: #D9D9D9; } + .uni-uploader__input-box:before { width: 4rpx; height: 79rpx; } + .uni-uploader__input-box:after { width: 79rpx; height: 4rpx; } + .uni-uploader__input-box:active { border-color: #999999; } + .uni-uploader__input-box:active:before, .uni-uploader__input-box:active:after { background-color: #999999; } + .uni-uploader__input { position: absolute; z-index: 1; @@ -712,14 +868,17 @@ radio-group label, checkbox-group label{ color: #8f8f94; font-size: 28rpx; } + .feedback-star-view.feedback-title { justify-content: flex-start; margin: 0; } + .feedback-quick { position: relative; padding-right: 40rpx; } + .feedback-quick:after { font-family: uniicons; font-size: 40rpx; @@ -731,9 +890,11 @@ radio-group label, checkbox-group label{ -webkit-transform: translateY(-50%); transform: translateY(-50%); } + .feedback-body { background: #fff; } + .feedback-textare { height: 200rpx; font-size: 34rpx; @@ -742,6 +903,7 @@ radio-group label, checkbox-group label{ box-sizing: border-box; padding: 20rpx 30rpx 0; } + .feedback-input { font-size: 34rpx; height: 50rpx; @@ -749,26 +911,33 @@ radio-group label, checkbox-group label{ padding: 15rpx 20rpx; line-height: 50rpx; } + .feedback-uploader { padding: 22rpx 20rpx; } + .feedback-star { font-family: uniicons; font-size: 40rpx; margin-left: 6rpx; } + .feedback-star-view { margin-left: 20rpx; } + .feedback-star:after { content: '\e408'; } + .feedback-star.active { color: #FFB400; } + .feedback-star.active:after { content: '\e438'; } + .feedback-submit { background: #007AFF; color: #FFFFFF; @@ -809,7 +978,7 @@ radio-group label, checkbox-group label{ position: relative; display: flex; flex-direction: row; - font-size:28rpx; + font-size: 28rpx; padding: 22rpx 30rpx; justify-content: space-between; } @@ -830,16 +999,17 @@ radio-group label, checkbox-group label{ } /* textarea */ -.uni-textarea{ - width:100%; - background:#FFF; -} -.uni-textarea textarea{ - width:96%; - padding:18rpx 2%; - line-height:1.6; - font-size:28rpx; - height:150rpx; +.uni-textarea { + width: 100%; + background: #FFF; +} + +.uni-textarea textarea { + width: 96%; + padding: 18rpx 2%; + line-height: 1.6; + font-size: 28rpx; + height: 150rpx; } /* tab bar */ @@ -882,175 +1052,256 @@ radio-group label, checkbox-group label{ height: calc(100% - 100rpx); } -.uni-tab-bar-loading{ - padding:20rpx 0; +.uni-tab-bar-loading { + padding: 20rpx 0; } /* comment */ -.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;} -.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;} -.uni-comment-face{width:70rpx; height:70rpx; border-radius:100%; margin-right:20rpx; flex-shrink:0; overflow:hidden;} -.uni-comment-face image{width:100%; border-radius:100%;} -.uni-comment-body{width:100%;} -.uni-comment-top{line-height:1.5em; justify-content:space-between;} -.uni-comment-top text{color:#0A98D5; font-size:24rpx;} -.uni-comment-date{line-height:38rpx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;} -.uni-comment-date view{color:#666666; font-size:24rpx; line-height:38rpx;} -.uni-comment-content{line-height:1.6em; font-size:28rpx; padding:8rpx 0;} -.uni-comment-replay-btn{background:#FFF; font-size:24rpx; line-height:28rpx; padding:5rpx 20rpx; border-radius:30rpx; color:#333 !important; margin:0 10rpx;} +.uni-comment { + padding: 5rpx 0; + display: flex; + flex-grow: 1; + flex-direction: column; +} + +.uni-comment-list { + flex-wrap: nowrap; + padding: 10rpx 0; + margin: 10rpx 0; + width: 100%; + display: flex; +} + +.uni-comment-face { + width: 70rpx; + height: 70rpx; + border-radius: 100%; + margin-right: 20rpx; + flex-shrink: 0; + overflow: hidden; +} + +.uni-comment-face image { + width: 100%; + border-radius: 100%; +} + +.uni-comment-body { + width: 100%; +} + +.uni-comment-top { + line-height: 1.5em; + justify-content: space-between; +} + +.uni-comment-top text { + color: #0A98D5; + font-size: 24rpx; +} + +.uni-comment-date { + line-height: 38rpx; + flex-direction: row; + justify-content: space-between; + display: flex !important; + flex-grow: 1; +} + +.uni-comment-date view { + color: #666666; + font-size: 24rpx; + line-height: 38rpx; +} + +.uni-comment-content { + line-height: 1.6em; + font-size: 28rpx; + padding: 8rpx 0; +} + +.uni-comment-replay-btn { + background: #FFF; + font-size: 24rpx; + line-height: 28rpx; + padding: 5rpx 20rpx; + border-radius: 30rpx; + color: #333 !important; + margin: 0 10rpx; +} /* swiper msg */ -.uni-swiper-msg{width:100%; padding:12rpx 0; flex-wrap:nowrap; display:flex;} -.uni-swiper-msg-icon{width:50rpx; margin-right:20rpx;} -.uni-swiper-msg-icon image{width:100%; flex-shrink:0;} -.uni-swiper-msg swiper{width:100%; height:50rpx;} -.uni-swiper-msg swiper-item{line-height:50rpx;} +.uni-swiper-msg { + width: 100%; + padding: 12rpx 0; + flex-wrap: nowrap; + display: flex; +} + +.uni-swiper-msg-icon { + width: 50rpx; + margin-right: 20rpx; +} + +.uni-swiper-msg-icon image { + width: 100%; + flex-shrink: 0; +} + +.uni-swiper-msg swiper { + width: 100%; + height: 50rpx; +} + +.uni-swiper-msg swiper-item { + line-height: 50rpx; +} /* product */ .uni-product-list { - display: flex; - width: 100%; - flex-wrap: wrap; - flex-direction: row; + display: flex; + width: 100%; + flex-wrap: wrap; + flex-direction: row; } .uni-product { - padding: 20rpx; - display: flex; - flex-direction: column; + padding: 20rpx; + display: flex; + flex-direction: column; } .image-view { - height: 330rpx; - width: 330rpx; - margin:12rpx 0; + height: 330rpx; + width: 330rpx; + margin: 12rpx 0; } .uni-product-image { - height: 330rpx; - width: 330rpx; + height: 330rpx; + width: 330rpx; } .uni-product-title { - width: 300rpx; - word-break: break-all; - display: -webkit-box; - overflow: hidden; - line-height:1.5; - text-overflow: ellipsis; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + width: 300rpx; + word-break: break-all; + display: -webkit-box; + overflow: hidden; + line-height: 1.5; + text-overflow: ellipsis; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } .uni-product-price { - margin-top:10rpx; - font-size: 28rpx; - line-height:1.5; - position: relative; + margin-top: 10rpx; + font-size: 28rpx; + line-height: 1.5; + position: relative; } .uni-product-price-original { - color: #e80080; + color: #e80080; } .uni-product-price-favour { - color: #888888; - text-decoration: line-through; - margin-left: 10rpx; + color: #888888; + text-decoration: line-through; + margin-left: 10rpx; } .uni-product-tip { - position: absolute; - right: 10rpx; - background-color: #ff3333; - color: #ffffff; - padding: 0 10rpx; - border-radius: 5rpx; + position: absolute; + right: 10rpx; + background-color: #ff3333; + color: #ffffff; + padding: 0 10rpx; + border-radius: 5rpx; } /* timeline */ .uni-timeline { - margin: 35rpx 0; - display: flex; - flex-direction: column; - position: relative; - } - - - .uni-timeline-item { - display: flex; - flex-direction: row; - position: relative; - padding-bottom: 20rpx; - box-sizing: border-box; - overflow: hidden; - - } - - .uni-timeline-item .uni-timeline-item-keynode { - width: 160rpx; - flex-shrink: 0; - box-sizing: border-box; - padding-right: 20rpx; - text-align: right; - line-height: 65rpx; - } - - .uni-timeline-item .uni-timeline-item-divider { - flex-shrink: 0; - position: relative; - width: 30rpx; - height: 30rpx; - top: 15rpx; - border-radius: 50%; - background-color: #bbb; - } - - - - .uni-timeline-item-divider::before, - .uni-timeline-item-divider::after { - position: absolute; - left: 15rpx; - width: 1rpx; - height: 100vh; - content: ''; - background: inherit; - } - - .uni-timeline-item-divider::before { - bottom: 100%; - } - - .uni-timeline-item-divider::after { - top: 100%; - } - - - .uni-timeline-last-item .uni-timeline-item-divider:after { - display: none; - } - - .uni-timeline-first-item .uni-timeline-item-divider:before { - display: none; - } - - .uni-timeline-item .uni-timeline-item-content { - padding-left: 20rpx; - } - - .uni-timeline-last-item .bottom-border::after{ - display: none; - } - - .uni-timeline-item-content .datetime{ - color: #CCCCCC; - } - - /* 自定义节点颜色 */ - .uni-timeline-last-item .uni-timeline-item-divider{ - background-color: #1AAD19; - } + margin: 35rpx 0; + display: flex; + flex-direction: column; + position: relative; +} + + +.uni-timeline-item { + display: flex; + flex-direction: row; + position: relative; + padding-bottom: 20rpx; + box-sizing: border-box; + overflow: hidden; + +} + +.uni-timeline-item .uni-timeline-item-keynode { + width: 160rpx; + flex-shrink: 0; + box-sizing: border-box; + padding-right: 20rpx; + text-align: right; + line-height: 65rpx; +} + +.uni-timeline-item .uni-timeline-item-divider { + flex-shrink: 0; + position: relative; + width: 30rpx; + height: 30rpx; + top: 15rpx; + border-radius: 50%; + background-color: #bbb; +} + + + +.uni-timeline-item-divider::before, +.uni-timeline-item-divider::after { + position: absolute; + left: 15rpx; + width: 1rpx; + height: 100vh; + content: ''; + background: inherit; +} + +.uni-timeline-item-divider::before { + bottom: 100%; +} + +.uni-timeline-item-divider::after { + top: 100%; +} + + +.uni-timeline-last-item .uni-timeline-item-divider:after { + display: none; +} + +.uni-timeline-first-item .uni-timeline-item-divider:before { + display: none; +} + +.uni-timeline-item .uni-timeline-item-content { + padding-left: 20rpx; +} + +.uni-timeline-last-item .bottom-border::after { + display: none; +} + +.uni-timeline-item-content .datetime { + color: #CCCCCC; +} + +/* 自定义节点颜色 */ +.uni-timeline-last-item .uni-timeline-item-divider { + background-color: #1AAD19; +} /* uni-icon */ @@ -1423,84 +1674,121 @@ radio-group label, checkbox-group label{ } .uni-icon-scan:before { - content: "\e612"; + content: "\e612"; } /* 分界线 */ -.uni-divider{ - height: 110rpx; - display: flex; - align-items:center; - justify-content: center; - position: relative; -} -.uni-divider__content{ - font-size: 28rpx; - color: #999; - padding: 0 20rpx; - position: relative; - z-index: 101; - background: #F4F5F6; -} -.uni-divider__line{ - background-color: #CCCCCC; - height: 1px; - width: 100%; - position: absolute; - z-index: 100; - top: 50%; - left: 0; - transform: translateY(50%); -} - -.left-win-active text{ +.uni-divider { + height: 110rpx; + display: flex; + align-items: center; + justify-content: center; + position: relative; +} + +.uni-divider__content { + font-size: 28rpx; + color: #999; + padding: 0 20rpx; + position: relative; + z-index: 101; + background: #F4F5F6; +} + +.uni-divider__line { + background-color: #CCCCCC; + height: 1px; + width: 100%; + position: absolute; + z-index: 100; + top: 50%; + left: 0; + transform: translateY(50%); +} + +.left-win-active text { color: #007AFF !important; } .uni-right { - text-align: right; + text-align: right; } .border-bg { - height: 10px; - background: #FAFAFA; + height: 10px; + background: #FAFAFA; } .yellow-bg { - background: #f0ad4e; + background: #f0ad4e; } .color-green { - color: green; + color: green; } .color-blue { - color: #0A98D5; + color: #0A98D5; } .color-red { - color: #dd524d; + color: #dd524d; +} + +/* 自定义样式 */ +.margin-top-30 { + margin-top: 30px; +} + +.margin-left-13 { + margin-left: 13px; } + +.paddinglr30 { + padding: 0 30px; +} + +.text-center { + text-align: center; +} + +.color-black { + color: black; +} + +.bg-white { + background: white; +} +.border-bottom-1{ + border-bottom: 1px solid #e5e5e5; +} +.pos-rel { + position: relative; +} + +.pos-abs { + position: absolute; +} + .display-none { - display: none; + display: none; } -.float-left{ - float: left; +.float-left { + float: left; } -.float-right{ - float: right; +.float-right { + float: right; } .recordCon { - color: #999; - display: flex; - justify-content: space-between; + color: #999; + display: flex; + justify-content: space-between; } -.paddingTopBottom{ - padding-top: 8px; - padding-bottom: 8px; +.paddingTopBottom { + padding-top: 8px; + padding-bottom: 8px; } - diff --git a/pages.json b/pages.json index f6bb8b2..7525afa 100644 --- a/pages.json +++ b/pages.json @@ -110,7 +110,97 @@ "navigationBarTitleText": "商户管理" } } - ], + ,{ + "path" : "pages/login/login", + "style" : + { + "navigationBarTitleText": "商户中心", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/setting/setting", + "style" : + { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/manuals/manuals", + "style" : + { + "navigationBarTitleText": "使用指南", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/aboutOur/aboutOur", + "style" : + { + "navigationBarTitleText": "关于我们", + "enablePullDownRefresh": false + } + + }, + { + "path" : "pages/invoiceClaim/invoiceClaim", + "style" : + { + "navigationBarTitleText": "发票申领", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/billing/billing", + "style" : + { + "navigationBarTitleText": "发票申领", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/invoiceRecord/invoiceRecord", + "style" : + { + "navigationBarTitleText": "开票历史", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/invoiceForm/invoiceForm", + "style" : + { + "navigationBarTitleText": "开票历史", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/elecRecord/elecRecord", + "style" : + { + "navigationBarTitleText": "电子包含记录", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/invoicePreview/invoicePreview", + "style" : + { + "navigationBarTitleText": "发票预览", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "pageOrientation": "portrait", "navigationBarTitleText": "Hello uniapp", diff --git a/static/couponList/noCouponList.png b/static/couponList/noCouponList.png new file mode 100644 index 0000000..d3022c7 --- /dev/null +++ b/static/couponList/noCouponList.png diff --git a/static/orderInfo/orderinfo-alipay.png b/static/orderInfo/orderinfo-alipay.png new file mode 100644 index 0000000..dd00655 --- /dev/null +++ b/static/orderInfo/orderinfo-alipay.png diff --git a/static/orderInfo/orderinfo-money.png b/static/orderInfo/orderinfo-money.png new file mode 100644 index 0000000..f9cee82 --- /dev/null +++ b/static/orderInfo/orderinfo-money.png diff --git a/static/orderInfo/orderinfo-sel.png b/static/orderInfo/orderinfo-sel.png new file mode 100644 index 0000000..ba2e35c --- /dev/null +++ b/static/orderInfo/orderinfo-sel.png diff --git a/static/orderInfo/orderinfo-success.png b/static/orderInfo/orderinfo-success.png new file mode 100644 index 0000000..edbc795 --- /dev/null +++ b/static/orderInfo/orderinfo-success.png diff --git a/static/orderInfo/orderinfo-unsel.png b/static/orderInfo/orderinfo-unsel.png new file mode 100644 index 0000000..e09c177 --- /dev/null +++ b/static/orderInfo/orderinfo-unsel.png diff --git a/static/orderInfo/orderinfo-wechat.png b/static/orderInfo/orderinfo-wechat.png new file mode 100644 index 0000000..790e1c1 --- /dev/null +++ b/static/orderInfo/orderinfo-wechat.png diff --git a/static/parkColor/p-green.png b/static/parkColor/p-green.png new file mode 100644 index 0000000..9ac6669 --- /dev/null +++ b/static/parkColor/p-green.png diff --git a/static/parkColor/p-red.png b/static/parkColor/p-red.png new file mode 100644 index 0000000..0e3666d --- /dev/null +++ b/static/parkColor/p-red.png diff --git a/static/parkColor/p-yellow.png b/static/parkColor/p-yellow.png new file mode 100644 index 0000000..a0456c5 --- /dev/null +++ b/static/parkColor/p-yellow.png diff --git a/static/parkColor/park-record-location.png b/static/parkColor/park-record-location.png new file mode 100644 index 0000000..1f93e03 --- /dev/null +++ b/static/parkColor/park-record-location.png diff --git a/static/parkColor/park-record.png b/static/parkColor/park-record.png new file mode 100644 index 0000000..f389716 --- /dev/null +++ b/static/parkColor/park-record.png diff --git a/static/parkColor/parkNav-lv.png b/static/parkColor/parkNav-lv.png new file mode 100644 index 0000000..b6c9f07 --- /dev/null +++ b/static/parkColor/parkNav-lv.png diff --git a/static/parkColor/parkNav.png b/static/parkColor/parkNav.png new file mode 100644 index 0000000..b4e68c8 --- /dev/null +++ b/static/parkColor/parkNav.png diff --git a/static/parkColor/parkgreensel.png b/static/parkColor/parkgreensel.png new file mode 100644 index 0000000..8822491 --- /dev/null +++ b/static/parkColor/parkgreensel.png diff --git a/static/parkColor/parkinfo_bg.png b/static/parkColor/parkinfo_bg.png new file mode 100644 index 0000000..59d1c14 --- /dev/null +++ b/static/parkColor/parkinfo_bg.png diff --git a/static/parkColor/parkinfo_bg_lat.png b/static/parkColor/parkinfo_bg_lat.png new file mode 100644 index 0000000..4f5437a --- /dev/null +++ b/static/parkColor/parkinfo_bg_lat.png diff --git a/static/parkColor/parkinfo_bg_m.png b/static/parkColor/parkinfo_bg_m.png new file mode 100644 index 0000000..5fb14cd --- /dev/null +++ b/static/parkColor/parkinfo_bg_m.png diff --git a/static/parkColor/parkinfo_bg_time.png b/static/parkColor/parkinfo_bg_time.png new file mode 100644 index 0000000..c7bc228 --- /dev/null +++ b/static/parkColor/parkinfo_bg_time.png diff --git a/static/parkColor/parklistSearchIcon.png b/static/parkColor/parklistSearchIcon.png new file mode 100644 index 0000000..b14f673 --- /dev/null +++ b/static/parkColor/parklistSearchIcon.png diff --git a/static/parkColor/parklisticon.png b/static/parkColor/parklisticon.png new file mode 100644 index 0000000..08a485b --- /dev/null +++ b/static/parkColor/parklisticon.png diff --git a/static/parkColor/parklocationicon.png b/static/parkColor/parklocationicon.png new file mode 100644 index 0000000..0014661 --- /dev/null +++ b/static/parkColor/parklocationicon.png diff --git a/static/parkColor/parkredsel.png b/static/parkColor/parkredsel.png new file mode 100644 index 0000000..dff2efd --- /dev/null +++ b/static/parkColor/parkredsel.png diff --git a/static/parkColor/parkthird.png b/static/parkColor/parkthird.png new file mode 100644 index 0000000..155c177 --- /dev/null +++ b/static/parkColor/parkthird.png diff --git a/static/parkColor/parkyellowsel.png b/static/parkColor/parkyellowsel.png new file mode 100644 index 0000000..827c496 --- /dev/null +++ b/static/parkColor/parkyellowsel.png diff --git a/static/parkColor/vipcardbtn_bg.png b/static/parkColor/vipcardbtn_bg.png new file mode 100644 index 0000000..ea30794 --- /dev/null +++ b/static/parkColor/vipcardbtn_bg.png diff --git a/static/parkColor/vipcardbtn_card.png b/static/parkColor/vipcardbtn_card.png new file mode 100644 index 0000000..f74ef3b --- /dev/null +++ b/static/parkColor/vipcardbtn_card.png diff --git a/static/recordstate/orderrecordintime.png b/static/recordstate/orderrecordintime.png new file mode 100644 index 0000000..b29b4e0 --- /dev/null +++ b/static/recordstate/orderrecordintime.png diff --git a/static/recordstate/orderrecordtime.png b/static/recordstate/orderrecordtime.png new file mode 100644 index 0000000..4400c85 --- /dev/null +++ b/static/recordstate/orderrecordtime.png diff --git a/static/tabicon/index-tabsel.png b/static/tabicon/index-tabsel.png new file mode 100644 index 0000000..f4883a8 --- /dev/null +++ b/static/tabicon/index-tabsel.png diff --git a/static/tabicon/index-tabunsel.png b/static/tabicon/index-tabunsel.png new file mode 100644 index 0000000..3e473bd --- /dev/null +++ b/static/tabicon/index-tabunsel.png diff --git a/static/tabicon/me-tabsel.png b/static/tabicon/me-tabsel.png new file mode 100644 index 0000000..7abdedc --- /dev/null +++ b/static/tabicon/me-tabsel.png diff --git a/static/tabicon/me-tabunsel.png b/static/tabicon/me-tabunsel.png new file mode 100644 index 0000000..e4d4db6 --- /dev/null +++ b/static/tabicon/me-tabunsel.png diff --git a/static/tabicon/mid-tabsel.png b/static/tabicon/mid-tabsel.png new file mode 100644 index 0000000..c11c399 --- /dev/null +++ b/static/tabicon/mid-tabsel.png diff --git a/static/tabicon/mid-tabunsel.png b/static/tabicon/mid-tabunsel.png new file mode 100644 index 0000000..6deb414 --- /dev/null +++ b/static/tabicon/mid-tabunsel.png diff --git a/static/vipcard/myvipcard_bg.png b/static/vipcard/myvipcard_bg.png new file mode 100644 index 0000000..71a4960 --- /dev/null +++ b/static/vipcard/myvipcard_bg.png diff --git a/static/vipcard/novipcard.png b/static/vipcard/novipcard.png new file mode 100644 index 0000000..22bb1d9 --- /dev/null +++ b/static/vipcard/novipcard.png diff --git a/static/vipcard/vipcardbg.png b/static/vipcard/vipcardbg.png new file mode 100644 index 0000000..9269742 --- /dev/null +++ b/static/vipcard/vipcardbg.png diff --git a/static/vipcard/vipcardbg1.png b/static/vipcard/vipcardbg1.png new file mode 100644 index 0000000..17763a9 --- /dev/null +++ b/static/vipcard/vipcardbg1.png diff --git a/static/vipcard/vipcardbg2.png b/static/vipcard/vipcardbg2.png new file mode 100644 index 0000000..5119da6 --- /dev/null +++ b/static/vipcard/vipcardbg2.png diff --git a/static/vipcard/vipcardbtn_bg.png b/static/vipcard/vipcardbtn_bg.png new file mode 100644 index 0000000..8c945e9 --- /dev/null +++ b/static/vipcard/vipcardbtn_bg.png diff --git a/static/vipcard/vipcardcolor1.png b/static/vipcard/vipcardcolor1.png new file mode 100644 index 0000000..eaa3945 --- /dev/null +++ b/static/vipcard/vipcardcolor1.png diff --git a/static/vipcard/vipcardcolor2.png b/static/vipcard/vipcardcolor2.png new file mode 100644 index 0000000..a68c7f2 --- /dev/null +++ b/static/vipcard/vipcardcolor2.png diff --git a/static/vipcard/vipcardsub.png b/static/vipcard/vipcardsub.png new file mode 100644 index 0000000..01ebd1e --- /dev/null +++ b/static/vipcard/vipcardsub.png diff --git a/static/vipcard/vipcardsum.png b/static/vipcard/vipcardsum.png new file mode 100644 index 0000000..73a6bc9 --- /dev/null +++ b/static/vipcard/vipcardsum.png diff --git a/static/weatherimg/weather_baowu.png b/static/weatherimg/weather_baowu.png new file mode 100644 index 0000000..f38289f --- /dev/null +++ b/static/weatherimg/weather_baowu.png diff --git a/static/weatherimg/weather_baoxue.png b/static/weatherimg/weather_baoxue.png new file mode 100644 index 0000000..c8efa1c --- /dev/null +++ b/static/weatherimg/weather_baoxue.png diff --git a/static/weatherimg/weather_dabaoyu.png b/static/weatherimg/weather_dabaoyu.png new file mode 100644 index 0000000..0f688f8 --- /dev/null +++ b/static/weatherimg/weather_dabaoyu.png diff --git a/static/weatherimg/weather_dayu.png b/static/weatherimg/weather_dayu.png new file mode 100644 index 0000000..176dd13 --- /dev/null +++ b/static/weatherimg/weather_dayu.png diff --git a/static/weatherimg/weather_duoyun.png b/static/weatherimg/weather_duoyun.png new file mode 100644 index 0000000..daaa02b --- /dev/null +++ b/static/weatherimg/weather_duoyun.png diff --git a/static/weatherimg/weather_fengbao.png b/static/weatherimg/weather_fengbao.png new file mode 100644 index 0000000..555d5cd --- /dev/null +++ b/static/weatherimg/weather_fengbao.png diff --git a/static/weatherimg/weather_fuchen.png b/static/weatherimg/weather_fuchen.png new file mode 100644 index 0000000..85deecb --- /dev/null +++ b/static/weatherimg/weather_fuchen.png diff --git a/static/weatherimg/weather_leizhenyu.png b/static/weatherimg/weather_leizhenyu.png new file mode 100644 index 0000000..5c19f75 --- /dev/null +++ b/static/weatherimg/weather_leizhenyu.png diff --git a/static/weatherimg/weather_mai.png b/static/weatherimg/weather_mai.png new file mode 100644 index 0000000..da26fa0 --- /dev/null +++ b/static/weatherimg/weather_mai.png diff --git a/static/weatherimg/weather_qing.png b/static/weatherimg/weather_qing.png new file mode 100644 index 0000000..cb21f0b --- /dev/null +++ b/static/weatherimg/weather_qing.png diff --git a/static/weatherimg/weather_shaoyun.png b/static/weatherimg/weather_shaoyun.png new file mode 100644 index 0000000..44b2662 --- /dev/null +++ b/static/weatherimg/weather_shaoyun.png diff --git a/static/weatherimg/weather_tedabaoyu.png b/static/weatherimg/weather_tedabaoyu.png new file mode 100644 index 0000000..0469f50 --- /dev/null +++ b/static/weatherimg/weather_tedabaoyu.png diff --git a/static/weatherimg/weather_wu.png b/static/weatherimg/weather_wu.png new file mode 100644 index 0000000..ab8c7db --- /dev/null +++ b/static/weatherimg/weather_wu.png diff --git a/static/weatherimg/weather_xiaoxue.png b/static/weatherimg/weather_xiaoxue.png new file mode 100644 index 0000000..9470134 --- /dev/null +++ b/static/weatherimg/weather_xiaoxue.png diff --git a/static/weatherimg/weather_xiaoyu.png b/static/weatherimg/weather_xiaoyu.png new file mode 100644 index 0000000..cc0bba5 --- /dev/null +++ b/static/weatherimg/weather_xiaoyu.png diff --git a/static/weatherimg/weather_yin.png b/static/weatherimg/weather_yin.png new file mode 100644 index 0000000..9d0db33 --- /dev/null +++ b/static/weatherimg/weather_yin.png diff --git a/static/weatherimg/weather_yuxue.png b/static/weatherimg/weather_yuxue.png new file mode 100644 index 0000000..25ffcf5 --- /dev/null +++ b/static/weatherimg/weather_yuxue.png diff --git a/static/weatherimg/weather_zhenyu.png b/static/weatherimg/weather_zhenyu.png new file mode 100644 index 0000000..09c2112 --- /dev/null +++ b/static/weatherimg/weather_zhenyu.png diff --git a/static/weatherimg/weather_zhongyu.png b/static/weatherimg/weather_zhongyu.png new file mode 100644 index 0000000..971235e --- /dev/null +++ b/static/weatherimg/weather_zhongyu.png diff --git a/static/weatherimg/weayher_yujiaxue.png b/static/weatherimg/weayher_yujiaxue.png new file mode 100644 index 0000000..ff7a9db --- /dev/null +++ b/static/weatherimg/weayher_yujiaxue.png