From 456896f7c61b1aa683f65e85399df487da746dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E5=A8=81=E5=A8=81?= <1834256911@qq.com> Date: Tue, 30 Sep 2025 09:28:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/request.js | 23 +- common/uni.css | 802 ++++++++++++------ pages/car-info/car-info.vue | 7 +- pages/car-type-select/car-type-select.vue | 6 +- pages/shop/shop.vue | 28 +- pagesA/check-car/check-car.vue | 1 - pagesA/insurance-rescue/insurance-rescue.vue | 28 +- .../good-product-detail.vue | 2 +- .../home-shouhou-result.vue | 76 +- pagesB/request-refund/request-refund.vue | 16 +- .../shop-goods-detail/shop-goods-detail.vue | 2 +- pagesD/self-quick-buy/self-quick-buy.vue | 2 +- .../maintenance-detail/maintenance-detail.vue | 2 +- pagesF/oil-quan-detail/oil-quan-detail.vue | 17 +- .../VehicleConditionReport.vue | 226 ----- 15 files changed, 647 insertions(+), 591 deletions(-) delete mode 100644 static/VehicleConditionReport/VehicleConditionReport.vue diff --git a/common/request.js b/common/request.js index e62f602..a3f14ac 100644 --- a/common/request.js +++ b/common/request.js @@ -126,15 +126,20 @@ export default { return true; }, checkLoginExpired(res) { - uni.setStorageSync("token", ""); - console.log(res, 'aaaaaaaa'); - // uni.showToast({ - // title: '请先登录', - // icon: "none" - // }) - uni.navigateTo({ - url: '/pages/login/login' - }); + uni.clearStorageSync(); + uni.hideLoading() + uni.showModal({ + title: '提示', + content: '请先登录', + success(res) { + console.log(res) + if (res.confirm) { + uni.redirectTo({ + url: '/pages/login/login' + }) + } + } + }) return true; }, //封装日志打印函数 diff --git a/common/uni.css b/common/uni.css index 2200716..5140aa9 100644 --- a/common/uni.css +++ b/common/uni.css @@ -10,50 +10,62 @@ font-size:28upx; 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:26upx; + +.uni-link { + color: #576B95; + font-size: 26upx; } -.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: 20upx; } -.uni-inline-item text:last-child{ + +.uni-inline-item text:last-child { margin-right: 0upx; margin-left: 20upx; } /* page */ -.uni-page-head{ - padding:35upx; +.uni-page-head { + padding: 35upx; text-align: center; } + .uni-page-head-title { display: inline-block; padding: 0 40upx; @@ -64,127 +76,188 @@ form { box-sizing: border-box; border-bottom: 2upx solid #D8D8D8; } + .uni-page-body { width: 100%; flex-grow: 1; overflow-x: hidden; } -.uni-padding-wrap{ - width:690upx; - padding:0 30upx; + +.uni-padding-wrap { + width: 690upx; + padding: 0 30upx; } + .uni-word { text-align: center; - padding:200upx 100upx; + padding: 200upx 100upx; } + .uni-title { - font-size:30upx; - font-weight:500; - padding:20upx 0; - line-height:1.5; + font-size: 30upx; + font-weight: 500; + padding: 20upx 0; + line-height: 1.5; } -.uni-text{ - font-size:28upx; + +.uni-text { + font-size: 28upx; } -.uni-title text{ - font-size:24upx; - color:#888; + +.uni-title text { + font-size: 24upx; + color: #888; } -.uni-text-gray{ +.uni-text-gray { color: #ccc; } + .uni-text-small { - font-size:24upx; + font-size: 24upx; } -.uni-common-mb{ - margin-bottom:30upx; + +.uni-common-mb { + margin-bottom: 30upx; } -.uni-common-pb{ - padding-bottom:30upx; + +.uni-common-pb { + padding-bottom: 30upx; } -.uni-common-pl{ - padding-left:30upx; + +.uni-common-pl { + padding-left: 30upx; } -.uni-common-mt{ - margin-top:30upx; + +.uni-common-mt { + margin-top: 30upx; } + /* 背景色 */ -.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: 80upx; font-weight:700;} -.uni-h2 {font-size: 60upx; font-weight:700;} -.uni-h3 {font-size: 48upx; font-weight:700;} -.uni-h4 {font-size: 36upx; font-weight:700;} -.uni-h5 {font-size: 28upx; color: #8f8f94;} -.uni-h6 {font-size: 24upx; color: #8f8f94;} -.uni-bold{font-weight:bold;} +.uni-h1 { + font-size: 80upx; + font-weight: 700; +} + +.uni-h2 { + font-size: 60upx; + font-weight: 700; +} + +.uni-h3 { + font-size: 48upx; + font-weight: 700; +} + +.uni-h4 { + font-size: 36upx; + font-weight: 700; +} + +.uni-h5 { + font-size: 28upx; + color: #8f8f94; +} + +.uni-h6 { + font-size: 24upx; + 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:10upx 0; +.uni-btn-v { + padding: 10upx 0; +} + +.uni-btn-v button { + margin: 20upx 0; } -.uni-btn-v button{margin:20upx 0;} /* 表单 */ -.uni-form-item{ - display:flex; - width:100%; - padding:10upx 0; +.uni-form-item { + display: flex; + width: 100%; + padding: 10upx 0; } -.uni-form-item .title{ - padding:10upx 25upx; + +.uni-form-item .title { + padding: 10upx 25upx; } + .uni-label { width: 210upx; word-wrap: break-word; word-break: break-all; - text-indent:20upx; + text-indent: 20upx; } + .uni-input { height: 50upx; - padding: 15upx 25upx; - line-height:50upx; - font-size:28upx; - background:#FFF; + padding: 15upx 0; + line-height: 50upx; + font-size: 28upx; + background: #FFF; flex: 1; } -radio-group, checkbox-group{ - width:100%; + +radio-group, +checkbox-group { + width: 100%; } -radio-group label, checkbox-group label{ - padding-right:20upx; + +radio-group label, +checkbox-group label { + padding-right: 20upx; } -.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:80upx; - line-height:80upx; - flex-shrink:0; + +.uni-form-item .with-fun .uni-icon { + width: 40px; + height: 80upx; + line-height: 80upx; + flex-shrink: 0; } /* loadmore */ -.uni-loadmore{ - height:80upx; - line-height:80upx; - text-align:center; - padding-bottom:30upx; +.uni-loadmore { + height: 80upx; + line-height: 80upx; + text-align: center; + padding-bottom: 30upx; } + /*数字角标*/ .uni-badge, .uni-badge-default { @@ -197,55 +270,66 @@ radio-group label, checkbox-group label{ border-radius: 100px; background-color: rgba(0, 0, 0, .15); } + .uni-badge.uni-badge-inverted { padding: 0 5px 0 0; 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; @@ -258,6 +342,7 @@ radio-group label, checkbox-group label{ width: 100%; overflow: hidden; } + .uni-collapse-content.uni-active { height: auto; } @@ -266,21 +351,25 @@ radio-group label, checkbox-group label{ .uni-card { background: #fff; border-radius: 8upx; - margin:20upx 0; + margin: 20upx 0; position: relative; box-shadow: 0 2upx 4upx rgba(0, 0, 0, .3); } + .uni-card-content { font-size: 30upx; } -.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: 30upx; } + .uni-card-footer, .uni-card-header { position: relative; @@ -290,12 +379,15 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: center; } + .uni-card-header { font-size: 36upx; } + .uni-card-footer { color: #6d6d72; } + .uni-card-footer:before, .uni-card-header:after { position: absolute; @@ -308,18 +400,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: 84upx; width: 84upx; margin-right: 20upx; } + .uni-card-media-body { height: 84upx; display: flex; @@ -327,15 +423,18 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: flex-start; } + .uni-card-media-text-top { line-height: 36upx; font-size: 34upx; } + .uni-card-media-text-bottom { line-height: 30upx; font-size: 28upx; color: #8f8f94; } + .uni-card-link { color: #007AFF; } @@ -348,6 +447,7 @@ radio-group label, checkbox-group label{ display: flex; flex-direction: column; } + .uni-list:after { position: absolute; z-index: 10; @@ -360,6 +460,7 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list::before { position: absolute; z-index: 10; @@ -372,6 +473,7 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list-cell { position: relative; display: flex; @@ -379,23 +481,28 @@ 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: 22upx 30upx; } + .uni-list-cell-left { - font-size:28upx; + font-size: 28upx; padding: 0 30upx; } + .uni-list-cell-db, .uni-list-cell-right { flex: 1; } + .uni-list-cell::after { position: absolute; - z-index: 3; + z-index: 3; right: 0; bottom: 0; left: 30upx; @@ -405,19 +512,23 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list .uni-list-cell:last-child::after { height: 0upx; } + .uni-list-cell-last.uni-list-cell::after { height: 0upx; } + .uni-list-cell-divider { position: relative; display: flex; color: #999; background-color: #f7f7f7; - padding:15upx 20upx; + padding: 15upx 20upx; } + .uni-list-cell-divider::before { position: absolute; right: 0; @@ -429,6 +540,7 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list-cell-divider::after { position: absolute; right: 0; @@ -440,8 +552,9 @@ radio-group label, checkbox-group label{ transform: scaleY(.5); background-color: #c8c7cc; } + .uni-list-cell-navigate { - font-size:30upx; + font-size: 30upx; padding: 22upx 30upx; line-height: 48upx; position: relative; @@ -452,12 +565,15 @@ radio-group label, checkbox-group label{ justify-content: space-between; align-items: center; } + .uni-list-cell-navigate { padding-right: 36upx; } + .uni-navigate-badge { padding-right: 50upx; } + .uni-list-cell-navigate.uni-navigate-right:after { font-family: uniicons; content: '\e583'; @@ -468,6 +584,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'; @@ -478,6 +595,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'; @@ -488,23 +606,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: 20upx; } + .uni-collapse .uni-list-cell::after { left: 52upx; } + .uni-list.uni-active { height: auto; } @@ -518,18 +642,26 @@ radio-group label, checkbox-group label{ flex-direction: row; padding: 22upx 30upx; } + .uni-triplex-right, .uni-triplex-left { display: flex; flex-direction: column; } + .uni-triplex-left { width: 84%; } -.uni-triplex-left .uni-title{ - padding:8upx 0; + +.uni-triplex-left .uni-title { + padding: 8upx 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; @@ -543,25 +675,31 @@ radio-group label, checkbox-group label{ width: 100%; flex-direction: row; } + .uni-navigate-right.uni-media-list { padding-right: 74upx; } + .uni-pull-right { flex-direction: row-reverse; } + .uni-pull-right>.uni-media-list-logo { margin-right: 0upx; margin-left: 20upx; } + .uni-media-list-logo { height: 84upx; width: 84upx; margin-right: 20upx; } + .uni-media-list-logo image { height: 100%; width: 100%; } + .uni-media-list-body { height: 84upx; display: flex; @@ -571,11 +709,13 @@ radio-group label, checkbox-group label{ align-items: flex-start; overflow: hidden; } + .uni-media-list-text-top { width: 100%; line-height: 36upx; font-size: 30upx; } + .uni-media-list-text-bottom { width: 100%; line-height: 30upx; @@ -592,6 +732,7 @@ radio-group label, checkbox-group label{ flex-wrap: wrap; border-top: 2upx solid #eee; } + .uni-grid-9-item { width: 250upx; height: 200upx; @@ -604,13 +745,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: 100upx; height: 100upx; } + .uni-grid-9-text { width: 250upx; line-height: 4upx; @@ -618,6 +762,7 @@ radio-group label, checkbox-group label{ text-align: center; font-size: 30upx; } + .uni-grid-9-item-hover { background: rgba(0, 0, 0, 0.1); } @@ -627,39 +772,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: 16upx; } + .uni-uploader__files { display: flex; flex-direction: row; flex-wrap: wrap; } + .uni-uploader__file { margin: 10upx; width: 210upx; height: 210upx; } + .uni-uploader__img { display: block; width: 210upx; height: 210upx; } + .uni-uploader__input-box { position: relative; - margin:10upx; + margin: 10upx; width: 208upx; height: 208upx; border: 2upx solid #D9D9D9; } + .uni-uploader__input-box:before, .uni-uploader__input-box:after { content: " "; @@ -670,21 +823,26 @@ radio-group label, checkbox-group label{ transform: translate(-50%, -50%); background-color: #D9D9D9; } + .uni-uploader__input-box:before { width: 4upx; height: 79upx; } + .uni-uploader__input-box:after { width: 79upx; height: 4upx; } + .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; @@ -705,14 +863,17 @@ radio-group label, checkbox-group label{ color: #8f8f94; font-size: 28upx; } + .feedback-star-view.feedback-title { justify-content: flex-start; margin: 0; } + .feedback-quick { position: relative; padding-right: 40upx; } + .feedback-quick:after { font-family: uniicons; font-size: 40upx; @@ -724,9 +885,11 @@ radio-group label, checkbox-group label{ -webkit-transform: translateY(-50%); transform: translateY(-50%); } + .feedback-body { background: #fff; } + .feedback-textare { height: 200upx; font-size: 34upx; @@ -735,6 +898,7 @@ radio-group label, checkbox-group label{ box-sizing: border-box; padding: 20upx 30upx 0; } + .feedback-input { font-size: 34upx; height: 50upx; @@ -742,26 +906,33 @@ radio-group label, checkbox-group label{ padding: 15upx 20upx; line-height: 50upx; } + .feedback-uploader { padding: 22upx 20upx; } + .feedback-star { font-family: uniicons; font-size: 40upx; margin-left: 6upx; } + .feedback-star-view { margin-left: 20upx; } + .feedback-star:after { content: '\e408'; } + .feedback-star.active { color: #FFB400; } + .feedback-star.active:after { content: '\e438'; } + .feedback-submit { background: #007AFF; color: #FFFFFF; @@ -802,7 +973,7 @@ radio-group label, checkbox-group label{ position: relative; display: flex; flex-direction: row; - font-size:28upx; + font-size: 28upx; padding: 22upx 30upx; justify-content: space-between; } @@ -823,16 +994,17 @@ radio-group label, checkbox-group label{ } /* textarea */ -.uni-textarea{ - width:100%; - background:#FFF; +.uni-textarea { + width: 100%; + background: #FFF; } -.uni-textarea textarea{ - width:96%; - padding:18upx 2%; - line-height:1.6; - font-size:28upx; - height:150upx; + +.uni-textarea textarea { + width: 96%; + padding: 18upx 2%; + line-height: 1.6; + font-size: 28upx; + height: 150upx; } /* tab bar */ @@ -875,177 +1047,258 @@ radio-group label, checkbox-group label{ height: calc(100% - 100upx); } -.uni-tab-bar-loading{ - padding:20upx 0; +.uni-tab-bar-loading { + padding: 20upx 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:70upx; height:70upx; border-radius:100%; margin-right:20upx; 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:24upx;} -.uni-comment-date{line-height:38upx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;} -.uni-comment-date view{color:#666666; font-size:24upx; line-height:38upx;} -.uni-comment-content{line-height:1.6em; font-size:28upx; padding:8rpx 0;} -.uni-comment-replay-btn{background:#FFF; font-size:24upx; line-height:28upx; padding:5rpx 20upx; border-radius:30upx; color:#333 !important; margin:0 10upx;} +.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: 70upx; + height: 70upx; + border-radius: 100%; + margin-right: 20upx; + 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: 24upx; +} + +.uni-comment-date { + line-height: 38upx; + flex-direction: row; + justify-content: space-between; + display: flex !important; + flex-grow: 1; +} + +.uni-comment-date view { + color: #666666; + font-size: 24upx; + line-height: 38upx; +} + +.uni-comment-content { + line-height: 1.6em; + font-size: 28upx; + padding: 8rpx 0; +} + +.uni-comment-replay-btn { + background: #FFF; + font-size: 24upx; + line-height: 28upx; + padding: 5rpx 20upx; + border-radius: 30upx; + color: #333 !important; + margin: 0 10upx; +} /* swiper msg */ -.uni-swiper-msg{width:100%; padding:12rpx 0; flex-wrap:nowrap; display:flex;} -.uni-swiper-msg-icon{width:50upx; margin-right:20upx;} -.uni-swiper-msg-icon image{width:100%; flex-shrink:0;} -.uni-swiper-msg swiper{width:100%; height:50upx;} -.uni-swiper-msg swiper-item{line-height:50upx;} +.uni-swiper-msg { + width: 100%; + padding: 12rpx 0; + flex-wrap: nowrap; + display: flex; +} + +.uni-swiper-msg-icon { + width: 50upx; + margin-right: 20upx; +} + +.uni-swiper-msg-icon image { + width: 100%; + flex-shrink: 0; +} + +.uni-swiper-msg swiper { + width: 100%; + height: 50upx; +} + +.uni-swiper-msg swiper-item { + line-height: 50upx; +} /* 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: 20upx; - display: flex; - flex-direction: column; + padding: 20upx; + display: flex; + flex-direction: column; } .image-view { - height: 330upx; - width: 330upx; - margin:12upx 0; + height: 330upx; + width: 330upx; + margin: 12upx 0; } .uni-product-image { - height: 330upx; - width: 330upx; + height: 330upx; + width: 330upx; } .uni-product-title { - width: 300upx; - 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: 300upx; + 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:10upx; - font-size: 28upx; - line-height:1.5; - position: relative; + margin-top: 10upx; + font-size: 28upx; + 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: 10upx; + color: #888888; + text-decoration: line-through; + margin-left: 10upx; } .uni-product-tip { - position: absolute; - right: 10upx; - background-color: #ff3333; - color: #ffffff; - padding: 0 10upx; - border-radius: 5upx; + position: absolute; + right: 10upx; + background-color: #ff3333; + color: #ffffff; + padding: 0 10upx; + border-radius: 5upx; } /* timeline */ .uni-timeline { - margin: 35upx 0; - display: flex; - flex-direction: column; - position: relative; - } - - - .uni-timeline-item { - display: flex; - flex-direction: row; - position: relative; - padding-bottom: 20upx; - box-sizing: border-box; - overflow: hidden; - - } - - .uni-timeline-item .uni-timeline-item-keynode { - width: 160upx; - flex-shrink: 0; - box-sizing: border-box; - padding-right: 20upx; - text-align: right; - line-height: 65upx; - } - - .uni-timeline-item .uni-timeline-item-divider { - flex-shrink: 0; - position: relative; - width: 30upx; - height: 30upx; - top: 15upx; - border-radius: 50%; - background-color: #bbb; - } - - - - .uni-timeline-item-divider::before, - .uni-timeline-item-divider::after { - position: absolute; - left: 15upx; - width: 1upx; - 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: 20upx; - } - - .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: 35upx 0; + display: flex; + flex-direction: column; + position: relative; +} + + +.uni-timeline-item { + display: flex; + flex-direction: row; + position: relative; + padding-bottom: 20upx; + box-sizing: border-box; + overflow: hidden; + +} + +.uni-timeline-item .uni-timeline-item-keynode { + width: 160upx; + flex-shrink: 0; + box-sizing: border-box; + padding-right: 20upx; + text-align: right; + line-height: 65upx; +} + +.uni-timeline-item .uni-timeline-item-divider { + flex-shrink: 0; + position: relative; + width: 30upx; + height: 30upx; + top: 15upx; + border-radius: 50%; + background-color: #bbb; +} + + + +.uni-timeline-item-divider::before, +.uni-timeline-item-divider::after { + position: absolute; + left: 15upx; + width: 1upx; + 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: 20upx; +} + +.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 */ .uni-icon { @@ -1416,43 +1669,46 @@ radio-group label, checkbox-group label{ } .uni-icon-scan:before { - content: "\e612"; + content: "\e612"; } /* 分界线 */ -.uni-divider{ - height: 110upx; - display: flex; - align-items:center; - justify-content: center; - position: relative; -} -.uni-divider__content{ - font-size: 28upx; - color: #999; - padding: 0 20upx; - 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%); -} - .goodsNameTwoLine { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - -image{ +.uni-divider { + height: 110upx; + display: flex; + align-items: center; + justify-content: center; + position: relative; +} + +.uni-divider__content { + font-size: 28upx; + color: #999; + padding: 0 20upx; + 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%); +} + +.goodsNameTwoLine { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; +} + +image { will-change: transform } \ No newline at end of file diff --git a/pages/car-info/car-info.vue b/pages/car-info/car-info.vue index f11890f..097b453 100644 --- a/pages/car-info/car-info.vue +++ b/pages/car-info/car-info.vue @@ -2,7 +2,6 @@ 车辆型号 - @@ -115,14 +114,14 @@ data.startTime = this.startTime data.vehicleMileage = this.vehicleMileage // data.vehicleBrandId = this.vehicleBrandId - - if(!this.plateNo) { + + if (!this.plateNo) { uni.showToast({ title: "请输入车牌号" }) return } - + let api = '' api = (this.id || this.app.vehicleDetailsId) ? '/api/client/vehicle/edit' : '/api/client/vehicle/add' diff --git a/pages/car-type-select/car-type-select.vue b/pages/car-type-select/car-type-select.vue index 4867271..3c0d641 100644 --- a/pages/car-type-select/car-type-select.vue +++ b/pages/car-type-select/car-type-select.vue @@ -4,7 +4,7 @@ - + {{carData.name}} - + @@ -16,13 +16,14 @@ - - - - - + + + + + + @@ -95,6 +96,7 @@ }, data() { return { + ishide: false, value1: 1, value2: 1, options: [{ @@ -170,9 +172,17 @@ getList(flag) { console.log(uni.getStorageSync('curcity')); var location = uni.getStorageSync('curcity') + // 获取当前时间的时间戳 + let currentTime = new Date().getTime(); + //monthIndex 是从 0 开始计数的 + let time = new Date(2025, 7, 7, 23, 59, 59, 999).getTime(); + console.log(currentTime); + console.log(time); + console.log(currentTime < time); + this.ishide = currentTime < time ? true : false this.$http.post("/api/client/store/list", { pageNum: this.pageNum, - pageSize: '20', + pageSize: this.ishide ? '1' : '20', field: this.searchText, storeTypeId: this.activeOperateMenu, sortType: this.activeShopGood, diff --git a/pagesA/check-car/check-car.vue b/pagesA/check-car/check-car.vue index 8109362..e63561c 100644 --- a/pagesA/check-car/check-car.vue +++ b/pagesA/check-car/check-car.vue @@ -143,7 +143,6 @@ title: '正在创建订单...', mask: true }) - // 创建订单 let res = await this.$http.post('/api/client/order/createOrder', data, { token: true, diff --git a/pagesA/insurance-rescue/insurance-rescue.vue b/pagesA/insurance-rescue/insurance-rescue.vue index 7217fc4..3ca5903 100644 --- a/pagesA/insurance-rescue/insurance-rescue.vue +++ b/pagesA/insurance-rescue/insurance-rescue.vue @@ -94,8 +94,8 @@ - + {{FormData.vehicleInformation||'请输入车辆型号'}} - @@ -290,7 +289,7 @@ this.cusServicePhonePhone = data this.cusServicePhoneType = type this.iscontentInfo = true - this.contentInfo =`我们已获取您的定位信息，会根据当前地址联系您【${this.formattedAddresses.recommend}】` + this.contentInfo = `我们已获取您的定位信息，会根据当前地址联系您【${this.formattedAddresses.recommend}】` }, confirmOpen() { @@ -460,17 +459,17 @@ storeTypeId: this.FormData.carID || 4 }).then((res) => { this.shopGood = res.data.data - console.log(this.activeShopGood,'this.activeShopGood'); + console.log(this.activeShopGood, 'this.activeShopGood'); // if (this.activeShopGood == 1) { - console.log('this.actList', this.actList); - console.log('this.shopGood', this.shopGood); - if(this.shopGood.length){ - this.actList = this.shopGood[1].children - this.serviceTypeId = this.actList && this.actList[0].id - this.serviceTypeName = this.actList && this.actList[0].name - this.estimatedPrice = this.shopGood[1].estimatedPrice - } - + console.log('this.actList', this.actList); + console.log('this.shopGood', this.shopGood); + if (this.shopGood.length) { + this.actList = this.shopGood[1].children + this.serviceTypeId = this.actList && this.actList[0].id + this.serviceTypeName = this.actList && this.actList[0].name + this.estimatedPrice = this.shopGood[1].estimatedPrice + } + // } }) }, @@ -669,6 +668,7 @@ .requeyCheck { display: flex; align-items: flex-start; + width: 140rpx; image { margin-left: -15rpx; diff --git a/pagesB/good-product-detail/good-product-detail.vue b/pagesB/good-product-detail/good-product-detail.vue index 14d32e7..2a4004f 100644 --- a/pagesB/good-product-detail/good-product-detail.vue +++ b/pagesB/good-product-detail/good-product-detail.vue @@ -509,7 +509,7 @@ this.storeId = option.storeId this.getLocation() const token = uni.getStorageSync('token') - if (!token) { + if (!token && option.share != null) { //沒有登录 先登录 uni.navigateTo({ url: '/pages/login/login?share=1' diff --git a/pagesB/home-shouhou-result/home-shouhou-result.vue b/pagesB/home-shouhou-result/home-shouhou-result.vue index f34eb83..f55bac1 100644 --- a/pagesB/home-shouhou-result/home-shouhou-result.vue +++ b/pagesB/home-shouhou-result/home-shouhou-result.vue @@ -4,21 +4,22 @@ - + 正在退款中... 我们会已最快的速度完成退款，请等待 - + + style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"> - {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsSpecification}} @@ -34,7 +35,7 @@ - + 微信支付 @@ -44,12 +45,12 @@ 退款总额 ￥ - {{shopSureBillInfo.goodsPrice}} + {{shopSureBillInfo.actualAmount}} - + @@ -64,16 +65,16 @@ 取消申请 - + + style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"> - {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsSpecification}} @@ -90,7 +91,7 @@ - + @@ -102,16 +103,16 @@ - + + style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"> - {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsSpecification}} @@ -127,12 +128,12 @@ - + 联系客服 - + @@ -141,16 +142,16 @@ 退款已完成 - + + style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"> - {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsName}} + {{shopSureBillInfo.goodsSpecification}} @@ -166,7 +167,7 @@ - + 微信支付 @@ -200,7 +201,7 @@ }, onNavigationBarButtonTap(e) { console.log(e); - if (e.index===0) { + if (e.index === 0) { this.goToOrderCenter() } // e的返回格式为json对象：{"text":"测试","index":0} @@ -231,63 +232,74 @@ border-radius: 41rpx 41rpx 41rpx 41rpx; border: 1rpx solid #707070; } - + .main-linegrident-btn { width: calc(50% - 16rpx); font-size: 28rpx; color: #ffffff; text-align: center; padding: 22rpx 0; - background: linear-gradient( 90deg, #FF4502 0%, #FF8903 100%); + background: linear-gradient(90deg, #FF4502 0%, #FF8903 100%); border-radius: 41rpx 41rpx 41rpx 41rpx; } - + .operte-btn { margin-top: 72rpx; } - + .good-recomend { margin-top: 70rpx; + .gr-title { margin-bottom: 26rpx; + .left-line { width: 165rpx; height: 4rpx; // background: url(../.././static/left-line.png) no-repeat center center; } + .center-title { color: #FF4502; margin-right: 16rpx; } + .right-line { width: 165rpx; height: 4rpx; // background: url(../.././static/common/right-line.png) no-repeat center center; margin-left: 16rpx; } - + } + .product-list { margin: 0 24rpx; + .product-wrap { width: calc(50% - 22rpx); margin-bottom: 20rpx; margin-right: 22rpx; + &:nth-child(2n) { margin-right: 0; } + .product-card { flex: 1; border-radius: 18rpx; background-color: #ffffff; + .pc-image { width: 100%; height: 340rpx; } + .pc-desc { color: #333333; height: 74rpx; } + .pc-price { margin-top: 10rpx; color: #FF4502; @@ -296,11 +308,11 @@ } } } - + .line-btn { padding: 18rpx 84rpx; background: #FFFFFF; border-radius: 41rpx 41rpx 41rpx 41rpx; border: 1rpx solid #707070; } - + \ No newline at end of file diff --git a/pagesB/request-refund/request-refund.vue b/pagesB/request-refund/request-refund.vue index 2ce8133..c42bc29 100644 --- a/pagesB/request-refund/request-refund.vue +++ b/pagesB/request-refund/request-refund.vue @@ -56,8 +56,8 @@ v-model="applyContent" /> - + @@ -146,11 +146,12 @@ }) for (let i = 0; i < lists.length; i++) { const result = await this.uploadFilePromise(lists[i].url) + console.log('LMG', result) let item = this[`fileList`][fileListLen] this[`fileList`].splice(fileListLen, 1, Object.assign(item, { status: 'success', message: '', - url: result.url + url: result })) fileListLen++ } @@ -184,8 +185,8 @@ try { // 解析返回的数据 const data = JSON.parse(res.data); - if (data && data.data && data.data.url && data.data.url[0]) { - resolve(data.data.url[0]); + if (data.data.url != null) { + resolve(data.data.url); } else { reject(new Error('Invalid response format')); } @@ -204,7 +205,7 @@ submitFeedback() { let feedbackImage = [] this.fileList.map(item => { - feedbackImage.push(item.thumb) + feedbackImage.push(item.url) }) // if (this.refundType=='请选择') { @@ -245,9 +246,8 @@ requestRefundType: this.refundType }) } - uni.showLoading() - + console.log('LMG', data) this.$http.post('/api/client/order/requestRefund', data).then(res => { uni.showToast({ icon: 'none', diff --git a/pagesB/shop-goods-detail/shop-goods-detail.vue b/pagesB/shop-goods-detail/shop-goods-detail.vue index b75417f..457a37a 100644 --- a/pagesB/shop-goods-detail/shop-goods-detail.vue +++ b/pagesB/shop-goods-detail/shop-goods-detail.vue @@ -383,7 +383,7 @@ // 扫码进入的情况下调用下方函数 // option.share && this.goToSelfQuickBuy() const token = uni.getStorageSync('token') - if (!token) { + if (!token && option.share != null) { //沒有登录 先登录 uni.navigateTo({ url: '/pages/login/login?share=1' diff --git a/pagesD/self-quick-buy/self-quick-buy.vue b/pagesD/self-quick-buy/self-quick-buy.vue index 5e28da4..b4ef0d8 100644 --- a/pagesD/self-quick-buy/self-quick-buy.vue +++ b/pagesD/self-quick-buy/self-quick-buy.vue @@ -164,7 +164,7 @@ this.key = opt.key this.handleScanCodeCarWash() const token = uni.getStorageSync('token') - if (!token) { + if (!token && option.share != null) { //沒有登录 先登录 uni.navigateTo({ url: '/pages/login/login?share=1' diff --git a/pagesF/maintenance-detail/maintenance-detail.vue b/pagesF/maintenance-detail/maintenance-detail.vue index 98e394e..98e51b9 100644 --- a/pagesF/maintenance-detail/maintenance-detail.vue +++ b/pagesF/maintenance-detail/maintenance-detail.vue @@ -566,7 +566,7 @@ this.getStoreGoodDetail() this.getReviewsList() const token = uni.getStorageSync('token') - if (!token) { + if (!token && option.share != null) { //沒有登录 先登录 uni.navigateTo({ url: '/pages/login/login?share=1' diff --git a/pagesF/oil-quan-detail/oil-quan-detail.vue b/pagesF/oil-quan-detail/oil-quan-detail.vue index d9292c9..5336bf7 100644 --- a/pagesF/oil-quan-detail/oil-quan-detail.vue +++ b/pagesF/oil-quan-detail/oil-quan-detail.vue @@ -25,7 +25,8 @@ --> - {{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}} + {{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}} + @@ -41,7 +42,7 @@ ￥{{goodsDetail.goodsOriginalPrice}} -