From b8602488e32c4c62287ba4913ea5285efab0c985 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 25 Oct 2022 00:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=9A=84=E5=9C=B0=E5=9D=80=EF=BC=9B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E5=8F=8Assl=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9B=E5=8A=A0=E4=BB=B7=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E5=BB=B6=E9=95=BF=E6=97=B6=E9=97=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                                |  2 +-
 manifest.json                                       |  6 ++----
 pages/order-manage/modal/new-serv-price-offline.vue | 11 ++++++-----
 pages/order-manage/modal/new-serv-price-online.vue  | 11 ++++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

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