From 8083b98dfa8d90a809d7f1efc797ce799016e674 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 28 May 2023 23:05:36 +0800 Subject: [PATCH 1/3] fix --- common/js/request.js | 2 +- pages/order-manage/modal/edit-time-arrange.vue | 2 +- pages/order-manage/modal/time-arrange.vue | 2 +- pages/order-manage/serv-detail.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/js/request.js b/common/js/request.js index fe35c53..786315d 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -15,7 +15,7 @@ export default { // request 触发前拼接 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.43:80' + args.url; + // args.url = 'http://192.168.2.41:80' + args.url; if (!args.data) { args.data = {} diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue index 2a95cd4..79391dc 100644 --- a/pages/order-manage/modal/edit-time-arrange.vue +++ b/pages/order-manage/modal/edit-time-arrange.vue @@ -10,7 +10,7 @@ - {{data.customerPhone}} + {{data.customerPhone.substring(0, 3) + "****" + data.customerPhone.substring(7)}} diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue index 2830c03..0fca04f 100644 --- a/pages/order-manage/modal/time-arrange.vue +++ b/pages/order-manage/modal/time-arrange.vue @@ -10,7 +10,7 @@ - {{data.customerPhone}} + {{data.customerPhone.substring(0, 3) + "****" + data.customerPhone.substring(7)}} diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue index 357619a..35129e7 100644 --- a/pages/order-manage/serv-detail.vue +++ b/pages/order-manage/serv-detail.vue @@ -49,7 +49,7 @@ 客户：{{servDetail.customerName}} - {{servDetail.customerPhone}} + {{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}} From 349a6069196941545d926da26cfa87d6b8de8a72 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 4 Jun 2023 01:51:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=A8=E6=89=93=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E4=B8=BA=E7=BA=A6=E4=B8=BA=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/request.js | 11 ++++++++++- pages/order-manage/modal/time-arrange.vue | 12 +++++++++--- pages/order-manage/order-manage.vue | 14 ++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/common/js/request.js b/common/js/request.js index 786315d..48a38b4 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -15,7 +15,7 @@ export default { // request 触发前拼接 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.41:80' + args.url; + // args.url = 'http://192.168.2.74:80' + args.url; if (!args.data) { args.data = {} @@ -756,5 +756,14 @@ export default { // res.latitude, res.longitude console.log(res) return res; + }, + + async callCustomer(params = {}) { + let res = await uni.request({ + url: '/order/master/callCustomer', + method: 'POST', + data: params + }) + return res[1].data; } } diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue index 0fca04f..f38f6eb 100644 --- a/pages/order-manage/modal/time-arrange.vue +++ b/pages/order-manage/modal/time-arrange.vue @@ -12,7 +12,7 @@ {{data.customerPhone.substring(0, 3) + "****" + data.customerPhone.substring(7)}} - + 拨打电话，按与客户约定的时间填入，完成排单，未完成排单将导致排单超时！ @@ -156,9 +156,15 @@ this.$emit('editServTime', this.data.orderMasterId, [this.expectTimeStart, this.expectTimeEnd], false, this.data); this.hideModal(e); }, - makePhoneCall(phoneNum) { + makePhoneCall(order) { + if (order.orderDetailId == null) { + this.$request.callCustomer({ + id: order.orderMasterId, + isCall: '02' + }); + } uni.makePhoneCall({ - phoneNumber: phoneNum + phoneNumber: order.customerPhone }) } } diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 124b480..7d392ff 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -221,7 +221,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -1059,9 +1059,15 @@ changePopupState(e) { this.ifShowPageMeta = e.show; }, - makePhoneCall(phoneNum) { + makePhoneCall(order) { + if (order.orderDetailId == null) { + this.$request.callCustomer({ + id: order.orderMasterId, + isCall: '02' + }); + } uni.makePhoneCall({ - phoneNumber: phoneNum + phoneNumber: order.customerPhone }) }, async makePayQrcode(e, orderInfo) { From 249961762fc60822f04e06a32bd8df058803ecc1 Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 5 Jun 2023 00:46:15 +0800 Subject: [PATCH 3/3] fix --- pages/demand-center/accept-demand-center.vue | 2 +- pages/demand-center/demand-detail.vue | 2 +- pages/order-manage/serv-detail.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue index 5afab52..938c262 100644 --- a/pages/demand-center/accept-demand-center.vue +++ b/pages/demand-center/accept-demand-center.vue @@ -61,7 +61,7 @@ {{task.goodsName}} - {{task.totalMoney}} + {{task.serverMoney}} 加急：{{task.expeditedPrice}} diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue index b22ce94..1f00048 100644 --- a/pages/demand-center/demand-detail.vue +++ b/pages/demand-center/demand-detail.vue @@ -9,7 +9,7 @@ {{order.goodsName}} - {{order.totalMoney}} + {{order.serverMoney}} 加急：{{order.expeditedPrice}} diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue index 35129e7..75423d8 100644 --- a/pages/order-manage/serv-detail.vue +++ b/pages/order-manage/serv-detail.vue @@ -71,7 +71,7 @@ 上门时间：{{servDetail.workBeginTime}} - + 订单金额： {{servDetail.totalMoney}}