From dbb4dd13a3ad5d57f7cc1a078d442ce3685d2d72 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 30 Oct 2022 15:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9=E5=8F=8A=E6=96=87?= =?UTF-8?q?=E6=A1=88=E5=B1=95=E7=A4=BA=E4=B8=8E=E5=90=A6=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=9B=E4=B8=BB=E5=8D=95=E5=8C=BA=E5=88=86=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/globalData.js | 25 +++++++ common/js/request.js | 6 +- pages/order-manage/modal/agree-after-sale.vue | 6 +- .../order-manage/modal/edit-time-arrange.vue | 32 ++++----- .../order-manage/modal/time-arrange-fail.vue | 6 +- pages/order-manage/modal/time-arrange.vue | 24 +++---- pages/order-manage/order-manage.vue | 6 +- pages/order-manage/serv-detail.vue | 72 +++++++++++++------ 8 files changed, 113 insertions(+), 64 deletions(-) diff --git a/common/js/globalData.js b/common/js/globalData.js index 9f5e7dc..717b3ec 100644 --- a/common/js/globalData.js +++ b/common/js/globalData.js @@ -11,5 +11,30 @@ export default { '16:00-18:00', '18:00-19:00' ], + timeList: [ + '08:00-08:30', + '08:30-09:00', + '09:00-09:30', + '09:30-10:00', + '10:00-10:30', + '10:30-11:00', + '11:00-11:30', + '11:30-12:00', + '12:00-12:30', + '12:30-13:00', + '13:00-13:30', + '13:30-14:00', + '14:30-15:00', + '15:00-15:30', + '15:30-16:00', + '16:00-16:30', + '16:30-17:00', + '17:00-17:30', + '17:30-18:00', + '18:00-18:30', + '18:30-19:00', + '19:00-19:30', + '19:30-20:00' + ], timeRangeSplit: '-' } \ No newline at end of file diff --git a/common/js/request.js b/common/js/request.js index 97ddc33..5d444f0 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -1,7 +1,7 @@ import globalData from '@/common/js/globalData.js'; export default { - address: 'https://www.opsoul.com', + address: 'https://www.opsoul.com:8881', // 异步接口拦截 addInterceptor() { let _this = this; @@ -13,8 +13,8 @@ export default { }) let userInfo = _this.getCurUserInfo(); // request 触发前拼接 url - args.url = 'https://www.opsoul.com:8881' + args.url; - // args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'https://www.opsoul.com:8881' + args.url; + args.url = 'http://127.0.0.1:80' + args.url; // args.url = 'http://192.168.2.50:80' + args.url; if (!args.data) { diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue index 9e95a6c..5dc3963 100644 --- a/pages/order-manage/modal/agree-after-sale.vue +++ b/pages/order-manage/modal/agree-after-sale.vue @@ -12,7 +12,9 @@ 退款金额： {{data.afterServiceRecordList[0].refund ? data.afterServiceRecordList[0].refund : data.payMoney}} - 警报：该单关联其它订单，客户申请的退款金额有效，具体操作请沟通派单处。 + + 警报：该单关联其它订单，客户申请的退款金额有效，有疑问可先沟通派单公司（详情处电话），如确认同意，最大退款额以本单接单额原路退回，其余需退的或你仍有收益则由派单公司处理，如更改退单额，需先协商一致，余额部分完单后计入你账户。 + 更改退款金额： @@ -39,7 +41,7 @@ + placeholder="请输入同意原因或更改金额原因（更改退单金额需与客户协商一致，或请订单详情处“派单公司”介入，否则可能被拒绝或引起客诉升级）"> diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue index a49d99c..2a95cd4 100644 --- a/pages/order-manage/modal/edit-time-arrange.vue +++ b/pages/order-manage/modal/edit-time-arrange.vue @@ -30,7 +30,7 @@ 选择时间： - @@ -62,8 +62,8 @@ - @@ -100,10 +100,12 @@ }, data() { return { - date: '', - time: '', + date: null, + time: null, + timeList: [], + timeIndex: 0, timeRangeList: [], - timeRange: '', + timeRange: null, timeRangeIndex: 0, expectTimeStart: null, expectTimeEnd: null, @@ -115,7 +117,8 @@ }, methods: { async loadData() { - this.timeRangeList = this.$globalData.timeRangeList; + this.timeRangeList = this.$globalData.timeRangeList; + this.timeList = this.$globalData.timeList; }, resetData() { this.date = null; @@ -136,11 +139,8 @@ this.disableTime = true; }, timeChange(e) { - let time = e.detail.value; - if (time === '00:00') { - time = '08:00'; - } - this.time = time; + this.timeIndex = e.detail.value; + this.time = this.timeList[this.timeIndex]; this.timeRange = null; this.changeExpectTime(); }, @@ -151,12 +151,10 @@ this.changeExpectTime(); }, changeExpectTime() { - if (this.time) { - this.expectTimeStart = this.date + ' ' + this.time + ':00'; - this.expectTimeEnd = null; - } else if (this.timeRange) { + let time = this.time != null ? this.time : this.timeRange; + if (time != null) { let timeRangeSplit = this.$globalData.timeRangeSplit; - let timeArr = this.timeRange.split(timeRangeSplit); + let timeArr = time.split(timeRangeSplit); this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00'; this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00'; } diff --git a/pages/order-manage/modal/time-arrange-fail.vue b/pages/order-manage/modal/time-arrange-fail.vue index 1df2e31..09c7386 100644 --- a/pages/order-manage/modal/time-arrange-fail.vue +++ b/pages/order-manage/modal/time-arrange-fail.vue @@ -39,9 +39,9 @@ - - diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue index 5eeffb3..2830c03 100644 --- a/pages/order-manage/modal/time-arrange.vue +++ b/pages/order-manage/modal/time-arrange.vue @@ -30,7 +30,7 @@ 选择时间： - @@ -79,7 +79,9 @@ data() { return { date: null, - time: null, + time: null, + timeList: [], + timeIndex: 0, timeRangeList: [], timeRange: null, timeRangeIndex: 0, @@ -93,7 +95,8 @@ }, methods: { async loadData() { - this.timeRangeList = this.$globalData.timeRangeList; + this.timeRangeList = this.$globalData.timeRangeList; + this.timeList = this.$globalData.timeList; }, resetData() { this.date = null; @@ -114,11 +117,8 @@ this.disableTime = true; }, timeChange(e) { - let time = e.detail.value; - if (time === '00:00') { - time = '08:00'; - } - this.time = time; + this.timeIndex = e.detail.value; + this.time = this.timeList[this.timeIndex]; this.timeRange = null; this.changeExpectTime(); }, @@ -129,12 +129,10 @@ this.changeExpectTime(); }, changeExpectTime() { - if (this.time) { - this.expectTimeStart = this.date + ' ' + this.time + ':00'; - this.expectTimeEnd = null; - } else if (this.timeRange) { + let time = this.time != null ? this.time : this.timeRange; + if (time != null) { let timeRangeSplit = this.$globalData.timeRangeSplit; - let timeArr = this.timeRange.split(timeRangeSplit); + let timeArr = time.split(timeRangeSplit); this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00'; this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00'; } diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 7a36ef2..e35a3b6 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -321,11 +321,11 @@ - 本单退款，系统已发起原路退回 + 本单退款，系统已发起按客户支付的帐户原路退回 {{afterServiceRecord.originalRefund}} - 元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。 + 元，银行按工作日退款，节假日顺延到帐。遇客户问询，请其耐心等待，到账时会在客户端”客户最终确认“处有到账时间。 - 支付时间：{{afterServiceRecord.refundApplyTime}} + 退款支付到账：{{afterServiceRecord.refundApplyTime}} 本单未支付，实际退回0.00元 diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue index 714cd1c..60b19ee 100644 --- a/pages/order-manage/serv-detail.vue +++ b/pages/order-manage/serv-detail.vue @@ -54,7 +54,7 @@ - 派单师傅：{{servDetail.masterWorkerName}} + 派单公司：{{servDetail.masterCompanyName}} {{servDetail.masterWorkerPhone}} @@ -70,19 +70,26 @@ 上门时间：{{servDetail.workBeginTime}} + + + + 订单金额： + {{servDetail.totalMoney}} - 任务金额： - {{servDetail.payMoney}} + 服务金额： + {{servDetail.payMoney}} + 0 + {{servDetail.finalRecvMoney}} 备注：{{servDetail.customerRemark}} @@ -116,17 +123,33 @@ - 完成记录 + 服务记录 - {{item.workFinishTime}} + + 已完成 + 待确认 + 服务中 + 待上门 + 未约/未排 + + - - 售后发起中 - 售后已同意 - 售后已拒绝 - 售后纠纷中 - 售后已完成 + + + 售后发起中 + 售后已同意 + 售后已拒绝 + 售后纠纷中 + 售后已完成 + + + 超时未接单 + 超时未预约 + 超时未上门 + 超时未完单 + + 师傅：{{item.workerName}} 联系方式：{{item.workerPhone}} @@ -139,20 +162,20 @@ - + 加价记录 - + 加价金额： - {{item.financialChangeRecord.changeMoney}} + {{changeRecord.changeMoney}} 加价备注： - {{item.financialChangeRecord.remark}} + {{changeRecord.remark}} @@ -197,9 +220,6 @@ 退款金额： {{afterServiceRecord.refund}} - - 警告：退单金额大于该师傅接单金额，但客户发起的退款金额有效，您需介入处理，如让接单师傅系统上操作同意退款，系统最大按该单派单额退回客户，其余需人工处理！如属于师傅责任引起的退单，建议重做，重做后让客户撤消退单！ - 退款原因： {{afterServiceRecord.customerReason}} @@ -211,6 +231,9 @@ :data-url="imgObj.imgUrl" mode="aspectFill"> + + 警报：退单金额大于该师傅接单金额，但客户发起的退款金额有效，您需介入处理，如让接单师傅系统上操作同意退款，系统最大按该单派单额退回客户，其余需人工处理！如属于师傅责任引起的退单，建议重做，重做后让客户撤消退单！ + 售后已提交至商家，其最大时限24小时内需完成操作！ @@ -292,9 +315,12 @@ 订单交由平台协商处理 - 本单退款，系统已发起原路退回 - {{afterServiceRecord.originalRefund}} - 元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。 + + 本单退款，系统已发起按客户支付的帐户原路退回 + {{afterServiceRecord.originalRefund}} + 元，银行按工作日退款，节假日顺延到帐。遇客户问询，请其耐心等待，到账时会在客户端”客户最终确认“处有到账时间。 + + 退款支付到账：{{afterServiceRecord.refundApplyTime}} 本单未支付，实际退回0.00元