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) {