From d6e9967d1c581c10167c9da1267a83b701f51fce Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 20 Jun 2022 18:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=97=B6=E9=97=B4=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/globalData.js | 30 ++++++++++++++++- common/js/request.js | 4 +-- .../order-manage/modal/edit-time-arrange.vue | 32 +++++++++++++------ pages/order-manage/modal/time-arrange.vue | 32 +++++++++++++------ pages/order-manage/order-manage.vue | 26 ++++++++++----- pages/order-manage/serv-detail.vue | 2 +- 6 files changed, 94 insertions(+), 32 deletions(-) diff --git a/common/js/globalData.js b/common/js/globalData.js index 778253f..dba4bdc 100644 --- a/common/js/globalData.js +++ b/common/js/globalData.js @@ -2,5 +2,33 @@ export default { deptId: 101, from: 'server', initPageNum: 1, - initPageSize: 20 + initPageSize: 20, + timeRangeList: [ + '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:00-14:30', + '14:30-15: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 0d39363..e8fd7cf 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -13,8 +13,8 @@ export default { }) let userInfo = _this.getCurUserInfo(); // request 触发前拼接 url - args.url = 'https://www.opsoul.com' + args.url; - // args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'https://www.opsoul.com' + args.url; + args.url = 'http://127.0.0.1:80' + args.url; // args.url = 'http://192.168.2.42:80' + args.url; if (!args.data) { diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue index 532a799..4241a8e 100644 --- a/pages/order-manage/modal/edit-time-arrange.vue +++ b/pages/order-manage/modal/edit-time-arrange.vue @@ -27,15 +27,15 @@ 选择时间： - - + - --> + @@ -96,7 +96,9 @@ time: '', timeRangeList: [], timeRange: '', - timeRangeIndex: 0 + timeRangeIndex: 0, + expectTimeStart: null, + expectTimeEnd: null } }, onReady() { @@ -104,23 +106,33 @@ }, methods: { async loadData() { - this.timeRangeList = await this.$api.data('timeRangeList'); + this.timeRangeList = this.$globalData.timeRangeList; }, resetData() { this.date = null; this.time = null; this.timeRange = null; this.timeRangeIndex = 0; + this.expectTimeStart = null, + this.expectTimeEnd = null; }, dateChange(e) { - this.date = e.detail.value + this.date = e.detail.value; + this.changeExpectTime(); }, timeChange(e) { this.time = e.detail.value; }, timeRangeChange(e) { this.timeRangeIndex = e.detail.value; - this.timeRange = this.timeRangeList[this.timeRangeIndex]; + this.timeRange = this.timeRangeList[this.timeRangeIndex]; + this.changeExpectTime(); + }, + changeExpectTime() { + let timeRangeSplit = this.$globalData.timeRangeSplit; + let timeArr = this.timeRange.split(timeRangeSplit); + this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00'; + this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00'; }, hideModal(e) { this.resetData(); @@ -137,8 +149,8 @@ }) return; } - let datetime = this.date + ' ' + (this.time || this.timeRange) + ':00'; - this.$emit('editServTime', this.data.orderDetailId, datetime, this.ifRollback2WS); + // let datetime = this.date + ' ' + (this.time || this.timeRange) + ':00'; + this.$emit('editServTime', this.data.orderDetailId, [this.expectTimeStart, this.expectTimeEnd], this.ifRollback2WS); this.hideModal(e); }, changeReasonRadio(e) { diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue index 0900e3e..15e4441 100644 --- a/pages/order-manage/modal/time-arrange.vue +++ b/pages/order-manage/modal/time-arrange.vue @@ -27,15 +27,15 @@ 选择时间： - - + - --> + @@ -74,7 +74,9 @@ time: null, timeRangeList: [], timeRange: null, - timeRangeIndex: 0 + timeRangeIndex: 0, + expectTimeStart: null, + expectTimeEnd: null } }, onReady() { @@ -82,23 +84,33 @@ }, methods: { async loadData() { - this.timeRangeList = await this.$api.data('timeRangeList'); + this.timeRangeList = this.$globalData.timeRangeList; }, resetData() { this.date = null; this.time = null; this.timeRange = null; this.timeRangeIndex = 0; + this.expectTimeStart = null, + this.expectTimeEnd = null; }, dateChange(e) { - this.date = e.detail.value + this.date = e.detail.value; + this.changeExpectTime(); }, timeChange(e) { this.time = e.detail.value; }, timeRangeChange(e) { this.timeRangeIndex = e.detail.value; - this.timeRange = this.timeRangeList[this.timeRangeIndex]; + this.timeRange = this.timeRangeList[this.timeRangeIndex]; + this.changeExpectTime(); + }, + changeExpectTime() { + let timeRangeSplit = this.$globalData.timeRangeSplit; + let timeArr = this.timeRange.split(timeRangeSplit); + this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00'; + this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00'; }, hideModal(e) { this.resetData(); @@ -115,8 +127,8 @@ }) return; } - let datetime = this.date + ' ' + (this.time || this.timeRange) + ':00'; - this.$emit('editServTime', this.data.orderMasterId, datetime); + // let datetime = this.date + ' ' + this.time + ':00'; + this.$emit('editServTime', this.data.orderMasterId, [this.expectTimeStart, this.expectTimeEnd]); this.hideModal(e); }, makePhoneCall(phoneNum) { diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index a9c0ff1..1912222 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -93,7 +93,7 @@ - 服务时间：{{order.serverTime}} + 服务时间：{{order.expectTimeStart + '~' + order.expectTimeEnd}} @@ -103,10 +103,10 @@ 距上门： + :day="$dateUtil.countDownDiff(order.expectTimeEnd).day" + :hour="$dateUtil.countDownDiff(order.expectTimeEnd).hour" + :minute="$dateUtil.countDownDiff(order.expectTimeEnd).min" + :second="$dateUtil.countDownDiff(order.expectTimeEnd).seconds"> @@ -560,15 +560,23 @@ data: data }); }, - async editServTime(id, datetime, ifRollback2WS) { + async editServTime(id, datetimeArr, ifRollback2WS) { + // 确定方法名 let reqFunName = "updateDetailOrder"; if (this.tabCur === 0) { reqFunName = "updateOrder" } - let res = await this.$request[reqFunName]({ + // 确定参数 + let params = datetimeArr && datetimeArr.length > 1 ? { + id: id, + expectTimeStart: datetimeArr[0], + expectTimeEnd: datetimeArr[1] + } : { id: id, revTime: datetime - }); + } + + let res = await this.$request[reqFunName](params); if (res.code === 0) { let finishFlag = false; if (ifRollback2WS) { @@ -576,6 +584,8 @@ if (statusUpdateRes && statusUpdateRes.code === 0) { finishFlag = true; } + } else { + finishFlag = true; } if (finishFlag) { this.reloadMasterOrderPage(); diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue index df300fe..b5e9b68 100644 --- a/pages/order-manage/serv-detail.vue +++ b/pages/order-manage/serv-detail.vue @@ -50,7 +50,7 @@ - 预约时间：{{servDetail.serverTime}} + 预约时间：{{servDetail.expectTimeStart + '~' + servDetail.expectTimeEnd}}