From 3771e83c28bac33d882883872be07313b4fcbbfa Mon Sep 17 00:00:00 2001 From: longjieli <1060695654@qq.com> Date: Tue, 6 Aug 2024 09:50:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/review/reviewList/reviewList.vue | 26 ++---- service-uniapp-client/mixins/order.js | 56 +++++++++++ service-uniapp-client/pages/index/order.vue | 103 +++++++-------------- service-uniapp-client/pages/mine/collect.vue | 2 +- service-uniapp-client/pages/order/orderDetail.vue | 40 +++++++- service-uniapp-client/pages/order/payOrder.vue | 6 +- .../pages/technician/selectTechnician.vue | 6 ++ 7 files changed, 146 insertions(+), 93 deletions(-) create mode 100644 service-uniapp-client/mixins/order.js diff --git a/service-uniapp-client/components/review/reviewList/reviewList.vue b/service-uniapp-client/components/review/reviewList/reviewList.vue index 9ac8152..a133414 100644 --- a/service-uniapp-client/components/review/reviewList/reviewList.vue +++ b/service-uniapp-client/components/review/reviewList/reviewList.vue @@ -21,7 +21,7 @@ - {{ item.labelText }} + {{ getSatisfaction(item.serviceNum) }} @@ -53,26 +53,18 @@ list: { type: Array, default: function() { - return [{ - userName: 'IYU466930948', - peviewTime: '2024.01.18', - tag: '皇家尊享spa', - agrenn: '非常满意', - content: '经常久坐肩颈很不舒服，下单了#皇家尊享spa预约的技师是#李晓纯，下单还不到20分钟就过来了，等待时间比较快，手法力道真的很专业，服务态度也不错，顺便还给我普及了穴位知识，真的很满意', - num: 450 - }, { - userName: 'IYU466930948', - peviewTime: '2024.01.18', - tag: '皇家尊享spa', - agrenn: '非常满意', - content: '经常久坐肩颈很不舒服，下单了#皇家尊享spa预约的技师是#李晓纯，下单还不到20分钟就过来了，等待时间比较快，手法力道真的很专业，服务态度也不错，顺便还给我普及了穴位知识，真的很满意', - num: 450 - }, ] + return [] } } }, methods: { - + //获取满意度 + getSatisfaction(num){ + console.log(num); + let satisfaction = ['不满意','不满意','较满意','满意','非常满意'] + + return satisfaction[num - 1] + } } } diff --git a/service-uniapp-client/mixins/order.js b/service-uniapp-client/mixins/order.js new file mode 100644 index 0000000..bfc6790 --- /dev/null +++ b/service-uniapp-client/mixins/order.js @@ -0,0 +1,56 @@ +import { showConfirmDialog } from 'vant'; + + +export default { + methods : { + //再来一单 + moreOrder(projectId,successCallback) { + this.$api('getProjectDetail', { + id: projectId + }, res => { + if (res.code == 200) { + successCallback && successCallback(res,projectId) + } + }) + }, + + //立即评价 + toEvaluate(id,projectId) { + uni.navigateTo({ + url: '/pages/order/evaluate?id=' + id + '&projectId=' + projectId + }) + }, + + //取消订单 + calcelOrder(orderId,successCallback) { + showConfirmDialog({ + title: '取消订单', + message: '确认取消订单?', + }).then(() => { + this.$api('cancelVipOrder', { + orderId + }, res => { + if (res.code == 200) { + successCallback && successCallback() + } + }) + }).catch(() => {}); + }, + + //立即支付 + toPayOrder(item) { + this.$api('immediatelyPay', { + addressId: item.addressId, + couponId: item.couponId, + orderId: item.id, + payType: item.payType, + remark: item.remark, + serviceTime: item.serviceTime + }, res => { + if (res.code == 200) { + this.$wxPay(res, this.getOrderList, this.getOrderList) + } + }) + }, + } +} \ No newline at end of file diff --git a/service-uniapp-client/pages/index/order.vue b/service-uniapp-client/pages/index/order.vue index 8cbf4c4..02e9303 100644 --- a/service-uniapp-client/pages/index/order.vue +++ b/service-uniapp-client/pages/index/order.vue @@ -54,24 +54,24 @@ - - 立即付款 - - + 取消订单 - - 微信支付 - - - 余额支付 + + 立即付款 - + + 再来一单 - + 立即评价 + + 再来一单 + @@ -88,11 +88,13 @@ showConfirmDialog } from 'vant'; import Position from '@/utils/position.js' + import order from '@/mixins/order.js' export default { components: { mNavbar, }, + mixins: [order], data() { return { tabs: [{ @@ -114,7 +116,7 @@ name: '已取消' } ], - active: this.$route.query.active || 0, + active: this.$route.query.active ? parseInt(this.$route.query.active) : 0, queryParams: { state: -1, pageNo: 1, @@ -126,22 +128,21 @@ } }, onShow() { - this.getOrderList(-1) + this.getOrderList() }, methods: { //获取订单列表 getOrderList() { + this.queryParams.state = this.active - 1 > -2 ? this.active - 1 : -1 this.$api('getOrderList', this.queryParams, res => { if (res.code == 200) { - if (res.code == 200) { - this.orderList = res.result.records; - } else { - this.finished = true - } + this.orderList = res.result.records; if (this.queryParams.pageSize > res.result.total) { this.finished = true } this.loading = false + }else{ + this.finished = true } //用户不存在，删除token和用户信息并且需要用户重新登录 @@ -165,13 +166,6 @@ this.getOrderList() }, - //跳转评论页面 - toEvaluate(item) { - uni.navigateTo({ - url: '/pages/order/evaluate?id=' + item.id + '&projectId=' + item.projectId - }) - }, - //跳转订单详情页面 toOrderDetail(id) { uni.navigateTo({ @@ -179,54 +173,21 @@ }) }, - //再来一单 - moreOrder(item) { - this.$api('getProjectDetail', { - id: item.projectId - }, res => { - if (res.code == 200) { - uni.navigateTo({ - url: `/pages/technician/selectTechnician?serviceId=${item.projectId}` - }) - sessionStorage.setItem('technicianList', JSON.stringify(res.result.tenPageList)) - } + //跳转再来一单 + toPlaceorder(res, projectId) { + uni.navigateTo({ + url: `/pages/technician/selectTechnician?serviceId=${projectId}¤t=order&active=${this.active}` }) + sessionStorage.setItem('technicianList', JSON.stringify(res.result.tenPageList)) }, - - //取消订单 - calcelOrder(orderId) { - showConfirmDialog({ - title: '取消订单', - message: '确认取消订单?取消后，请留意退款或后续通知。', - }).then(() => { - this.$api('cancelVipOrder', { - orderId - }, res => { - if (res.code == 200) { - uni.showToast({ - title: '取消成功', - icon: 'none' - }) - this.getOrderList() - } - }) - }).catch(() => {}); - }, - - //立即支付 - toPayOrder(item) { - this.$api('immediatelyPay', { - addressId: item.addressId, - couponId: item.couponId, - orderId: item.id, - payType: item.payType, - remark: item.remark, - serviceTime: item.serviceTime - }, res => { - if (res.code == 200) { - this.$wxPay(res,this.getOrderList,this.getOrderList) - } + + //取消成功 + cancelSuccess() { + uni.showToast({ + title: '取消成功', + icon: 'none' }) + this.getOrderList() }, //list列表滑动到底部自动新增数据列表 @@ -275,12 +236,12 @@ .left { width: 150rpx; height: 150rpx; - overflow: hidden; border-radius: 10rpx; image { width: 150rpx; height: 150rpx; + border-radius: 10rpx; } .tag { diff --git a/service-uniapp-client/pages/mine/collect.vue b/service-uniapp-client/pages/mine/collect.vue index d229ea2..e81e774 100644 --- a/service-uniapp-client/pages/mine/collect.vue +++ b/service-uniapp-client/pages/mine/collect.vue @@ -26,7 +26,7 @@ {{ item.technician.level }} - + 取消收藏 diff --git a/service-uniapp-client/pages/order/orderDetail.vue b/service-uniapp-client/pages/order/orderDetail.vue index db0b5c1..503a159 100644 --- a/service-uniapp-client/pages/order/orderDetail.vue +++ b/service-uniapp-client/pages/order/orderDetail.vue @@ -39,8 +39,20 @@ + + 取消订单 + - 去付款 + 立即付款 + + + 再来一单 + + + 立即评价 + + + 再来一单 @@ -222,10 +234,12 @@