diff --git a/common/js/request.js b/common/js/request.js index 0351299..a8a9748 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.20: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 4ab2717..9e95a6c 100644 --- a/pages/order-manage/modal/agree-after-sale.vue +++ b/pages/order-manage/modal/agree-after-sale.vue @@ -90,7 +90,7 @@ let agreedRefund = this.agreedRefund; if (!agreedRefund && this.data.afterServiceRecordList[0].refund != null) { agreedRefund = this.data.afterServiceRecordList[0].refund; - } else { + } else if (!agreedRefund) { agreedRefund = this.data.payMoney; } let res = await this.$request.editAfterServiceRecord({ @@ -102,13 +102,13 @@ updateBy: 2 }); if (res && res.code === 0) { - this.hideModal(e); - this.$emit('confirmFeedback'); uni.showToast({ icon: 'success', title: '提交成功', duration: 1000 }) + this.hideModal(e); + this.$emit('confirmFeedback'); return; } uni.showToast({ diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue index 7b6e5e6..a425380 100644 --- a/pages/order-manage/modal/new-serv-price-offline.vue +++ b/pages/order-manage/modal/new-serv-price-offline.vue @@ -55,7 +55,7 @@ 退出/再次上门 - 请客户支付 去完单 diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue index cda464e..f4e47d4 100644 --- a/pages/order-manage/modal/new-serv-price-online.vue +++ b/pages/order-manage/modal/new-serv-price-online.vue @@ -55,7 +55,7 @@ 退出/再次上门 - 请客户支付 去完单 diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index cbf5bea..632d1f0 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -185,8 +185,8 @@ - - + +