From feaad049a18ef4484281b1f1acb76c57e893bf50 Mon Sep 17 00:00:00 2001 From: longjieli <1060695654@qq.com> Date: Sat, 10 Aug 2024 20:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=81=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/payOrder/selectTime.vue | 2 +- .../components/review/reviewList/reviewList.vue | 1 - .../components/selectTechnicianCompoents.vue | 401 ++++++++++++--------- .../components/technicianList.vue | 2 +- service-uniapp-client/mixins/order.js | 4 +- service-uniapp-client/pages/index/index.vue | 1 + service-uniapp-client/pages/index/order.vue | 2 +- service-uniapp-client/pages/order/evaluate.vue | 3 +- service-uniapp-client/pages/order/orderDetail.vue | 6 +- .../pages/technician/subscribeService.vue | 103 +----- .../pages/technician/technicianDetail.vue | 285 ++++++++++----- service-uniapp-client/utils/Share.js | 2 +- service-uniapp-technician/mixins/order.js | 13 +- service-uniapp-technician/pages.json | 6 + service-uniapp-technician/pages/index/index.vue | 7 +- service-uniapp-technician/pages/index/order.vue | 103 ++++-- service-uniapp-technician/pages/login/login.vue | 1 - .../pages/mine/authentication.vue | 12 +- service-uniapp-technician/pages/mine/countdown.vue | 145 ++++++++ .../pages/mine/serverTime.vue | 181 +++++----- service-uniapp-technician/pages/mine/settled.vue | 2 + service-uniapp-technician/pages/mine/upload.vue | 2 + service-uniapp-technician/pages/order/evaluate.vue | 3 +- .../pages/order/orderDetail.vue | 47 ++- service-uniapp-technician/plugins/confirm.js | 2 + .../static/music/server-time.mp3 | Bin 0 -> 274320 bytes service-uniapp-technician/static/work.js | 9 + 27 files changed, 836 insertions(+), 509 deletions(-) create mode 100644 service-uniapp-technician/pages/mine/countdown.vue create mode 100644 service-uniapp-technician/static/music/server-time.mp3 create mode 100644 service-uniapp-technician/static/work.js diff --git a/service-uniapp-client/components/payOrder/selectTime.vue b/service-uniapp-client/components/payOrder/selectTime.vue index 2c01513..2ff815b 100644 --- a/service-uniapp-client/components/payOrder/selectTime.vue +++ b/service-uniapp-client/components/payOrder/selectTime.vue @@ -42,7 +42,7 @@ {{ item.timeName }} - {{ item.isDelete != 'Y' ? '约满' : + {{ item.isDelete != 'Y' ? '未开启' : isDelete({time : item, date : dateList[i]}) ? '过时' : '空闲'}} diff --git a/service-uniapp-client/components/review/reviewList/reviewList.vue b/service-uniapp-client/components/review/reviewList/reviewList.vue index a133414..3ac8982 100644 --- a/service-uniapp-client/components/review/reviewList/reviewList.vue +++ b/service-uniapp-client/components/review/reviewList/reviewList.vue @@ -60,7 +60,6 @@ methods: { //获取满意度 getSatisfaction(num){ - console.log(num); let satisfaction = ['不满意','不满意','较满意','满意','非常满意'] return satisfaction[num - 1] diff --git a/service-uniapp-client/components/selectTechnicianCompoents.vue b/service-uniapp-client/components/selectTechnicianCompoents.vue index a7a4c79..10f519b 100644 --- a/service-uniapp-client/components/selectTechnicianCompoents.vue +++ b/service-uniapp-client/components/selectTechnicianCompoents.vue @@ -1,242 +1,283 @@ \ No newline at end of file diff --git a/service-uniapp-client/components/technicianList.vue b/service-uniapp-client/components/technicianList.vue index 02c6847..5ff63a4 100644 --- a/service-uniapp-client/components/technicianList.vue +++ b/service-uniapp-client/components/technicianList.vue @@ -26,7 +26,7 @@ - {{ item.setKmOpen == 'Y' ? item.setKm : item.km || 0 }}km + {{ item.setKmOpen ? item.setKm || 0 : item.km || 0 }}km diff --git a/service-uniapp-client/mixins/order.js b/service-uniapp-client/mixins/order.js index bfc6790..5482577 100644 --- a/service-uniapp-client/mixins/order.js +++ b/service-uniapp-client/mixins/order.js @@ -15,9 +15,9 @@ export default { }, //立即评价 - toEvaluate(id,projectId) { + toEvaluate(id,projectId,terId) { uni.navigateTo({ - url: '/pages/order/evaluate?id=' + id + '&projectId=' + projectId + url: `/pages/order/evaluate?id=${id}&projectId=${projectId}&terId=${terId}` }) }, diff --git a/service-uniapp-client/pages/index/index.vue b/service-uniapp-client/pages/index/index.vue index cb4d3a5..90ee3f0 100644 --- a/service-uniapp-client/pages/index/index.vue +++ b/service-uniapp-client/pages/index/index.vue @@ -359,6 +359,7 @@ width: 100%; margin: 0px auto; border-radius: 20rpx; + height: 334rpx; overflow: hidden; .van-swipe-item { diff --git a/service-uniapp-client/pages/index/order.vue b/service-uniapp-client/pages/index/order.vue index 02e9303..2eca4cb 100644 --- a/service-uniapp-client/pages/index/order.vue +++ b/service-uniapp-client/pages/index/order.vue @@ -66,7 +66,7 @@ 再来一单 - + 立即评价 diff --git a/service-uniapp-client/pages/order/evaluate.vue b/service-uniapp-client/pages/order/evaluate.vue index ba9c9f8..fb6bbc9 100644 --- a/service-uniapp-client/pages/order/evaluate.vue +++ b/service-uniapp-client/pages/order/evaluate.vue @@ -146,7 +146,8 @@ import mNavbar from '@/components/base/m-navbar.vue' labelText : this.select.join(','), type : 0, orderId : this.$route.query.id, - shopId : this.$route.query.projectId + shopId : this.$route.query.projectId, + terId : this.$route.query.terId }, res => { if(res.code == 200){ uni.showToast({ diff --git a/service-uniapp-client/pages/order/orderDetail.vue b/service-uniapp-client/pages/order/orderDetail.vue index 503a159..9dfb96e 100644 --- a/service-uniapp-client/pages/order/orderDetail.vue +++ b/service-uniapp-client/pages/order/orderDetail.vue @@ -179,7 +179,7 @@ 优惠券 - -¥0.00 + -¥{{ coupon.money || 0 }} @@ -248,7 +248,8 @@ msgOrder: [], msgShop: [], msgTechnician: [], - phone: '' + phone: '', + coupon : {} } }, onShow() { @@ -266,6 +267,7 @@ this.msgOrder = res.result.msgOrder; this.msgShop = res.result.msgShop; this.msgTechnician = res.result.msgTechnician; + this.coupon = res.result.coupon this.changeSetup() } }) diff --git a/service-uniapp-client/pages/technician/subscribeService.vue b/service-uniapp-client/pages/technician/subscribeService.vue index c29207c..40af7b7 100644 --- a/service-uniapp-client/pages/technician/subscribeService.vue +++ b/service-uniapp-client/pages/technician/subscribeService.vue @@ -78,37 +78,6 @@ - - 用户评论({{ countReviewNum }}+条) - - - 好评 - {{ goodReputationNum }} - - - 中评 - {{ mediumReviewNum }} - - - 差评 - {{ negativeComment }} - - - - - - - - - - - 下单选择技师 @@ -119,12 +88,10 @@ @@ -420,34 +349,6 @@ } } - .review { - padding: 0rpx 20rpx 40rpx 20rpx; - - .review-title { - padding: 25rpx 20rpx; - font-size: 32rpx; - font-weight: 500; - } - - .review-classify { - display: flex; - padding: 0rpx 0rpx 30rpx 0rpx; - - .review-classify-item { - background: #EEEDED; - padding: 5rpx 15rpx; - border-radius: 5rpx; - margin-right: 15rpx; - color: #666; - } - - .select-classify { - background: #ECFCF1; - color: #55B16E; - } - } - } - .select-button { position: fixed; display: flex; diff --git a/service-uniapp-client/pages/technician/technicianDetail.vue b/service-uniapp-client/pages/technician/technicianDetail.vue index 19d1a78..45c11d8 100644 --- a/service-uniapp-client/pages/technician/technicianDetail.vue +++ b/service-uniapp-client/pages/technician/technicianDetail.vue @@ -4,12 +4,12 @@ - - - - + + + + 下单付款后商家会在10分钟内联系你哦~ @@ -17,7 +17,8 @@ - + + @@ -45,7 +46,7 @@ 实名 - + {{ technicianDetail.experience }}年经验 @@ -56,7 +57,7 @@ - +
@@ -87,10 +88,11 @@ - + - + @@ -117,41 +119,81 @@ - + {{ technicianDetail.bookable == 'Y' ? '立即预约' : '不可预约' }} - + - + - + - + - + - + + + + + + + + + + + 好评 + {{ goodReputationNum }} + + + 中评 + {{ mediumReviewNum }} + + + 差评 + {{ negativeComment }} + + + + + + + + - + + + \ No newline at end of file diff --git a/service-uniapp-technician/pages/mine/serverTime.vue b/service-uniapp-technician/pages/mine/serverTime.vue index 0a03125..13448fb 100644 --- a/service-uniapp-technician/pages/mine/serverTime.vue +++ b/service-uniapp-technician/pages/mine/serverTime.vue @@ -1,7 +1,7 @@