diff --git a/common/js/request.js b/common/js/request.js index c9ea711..97ddc33 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -13,7 +13,7 @@ export default { }) let userInfo = _this.getCurUserInfo(); // request 触发前拼接 url - args.url = 'https://www.opsoul.com' + 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; diff --git a/manifest.json b/manifest.json index 5d2b972..edced26 100644 --- a/manifest.json +++ b/manifest.json @@ -51,7 +51,7 @@ /* 小程序特有相关 */ "appid" : "wx105ce607b514ff2a", "setting" : { - "urlCheck" : false, + "urlCheck" : true, "minified" : true }, "usingComponents" : true, @@ -60,8 +60,6 @@ "desc" : "因涉及上门家政服务,需获取地理位置" } }, - "requiredPrivateInfos": [ - "getLocation" - ] + "requiredPrivateInfos" : [ "getLocation" ] } } diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue index 70e0b5f..3b35e87 100644 --- a/pages/order-manage/modal/new-serv-price-offline.vue +++ b/pages/order-manage/modal/new-serv-price-offline.vue @@ -134,7 +134,7 @@ this.payAction = payAction; }, async changeOrderPrice(newPrice) { - if (this.payAction != this.priceObj.type) { + if (this.priceObj && this.payAction != this.priceObj.type) { uni.showToast({ icon: 'none', title: '你有加价未付款,请客户支付后再加或在原加价上增加金额!', @@ -150,12 +150,13 @@ remark: this.remark }); if (res && res.code === 0) { - this.resetPriceChangedInfo(); uni.showToast({ icon: 'success', - title: '修改成功', - duration: 1000 - }) + title: '修改成功' + }) + setTimeout(() => { + this.resetPriceChangedInfo(); + }, 1500); } }, async makePayQrcode(e) { diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue index 5d4ffda..0de3a41 100644 --- a/pages/order-manage/modal/new-serv-price-online.vue +++ b/pages/order-manage/modal/new-serv-price-online.vue @@ -134,7 +134,7 @@ this.payAction = payAction; }, async changeOrderPrice(newPrice) { - if (this.payAction != this.priceObj.type) { + if (this.priceObj && this.payAction != this.priceObj.type) { uni.showToast({ icon: 'none', title: '你有加价未付款,请客户支付后再加或在原加价上增加金额!', @@ -150,12 +150,13 @@ remark: this.remark }); if (res && res.code === 0) { - this.resetPriceChangedInfo(); uni.showToast({ icon: 'success', - title: '修改成功', - duration: 1000 - }) + title: '修改成功' + }) + setTimeout(() => { + this.resetPriceChangedInfo(); + }, 1500); } }, async makePayQrcode(e) {