空白格 2 yıl önce
ebeveyn
işleme
ffbf51d8f7
2 değiştirilmiş dosya ile 28 ekleme ve 26 silme
  1. 2 2
      common/config.js
  2. 26 24
      pay.js

+ 2 - 2
common/config.js

@@ -1,7 +1,7 @@
 const config = {
 	wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
-	// baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
-	baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
+	baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
+	// baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
 }
 export {
 	config

+ 26 - 24
pay.js

@@ -34,32 +34,34 @@ export default {
 			title: '支付中'
 		});
 		return new Promise(r => {
-			$http.post("/client/wechat/pay", obj)
-			// 区分包月支付和普通支付
-			if (res.data.needPay && !res.data.monthId) {
-				//#ifdef H5
-				$wxApi.JSAPI(res.data.wx, jumpUrl).then(r);
-				//#endif
-			} else if (res.data.monthId) {
-				//#ifdef H5
-				$wxApi.JSAPI(res.data.wx, jumpUrl).then(r);
-				//#endif
-			} else {
-				uni.showToast({
-					title: "无需支付",
-					icon: "none",
-					duration: 2000
-				});
-				setTimeout(() => {
-					//#ifdef H5
-					if (jumpUrl) {
-						window.location.href = jumpUrl;
+			$http.post("/client/pay/wechat", obj)
+				then(res => {
+					// 区分包月支付和普通支付
+					if (res.data.needPay && !res.data.monthId) {
+						//#ifdef H5
+						$wxApi.JSAPI(res.data.wx, jumpUrl).then(r);
+						//#endif
+					} else if (res.data.monthId) {
+						//#ifdef H5
+						$wxApi.JSAPI(res.data.wx, jumpUrl).then(r);
+						//#endif
 					} else {
-						window.location.reload();
+						uni.showToast({
+							title: "无需支付",
+							icon: "none",
+							duration: 2000
+						});
+						setTimeout(() => {
+							//#ifdef H5
+							if (jumpUrl) {
+								window.location.href = jumpUrl;
+							} else {
+								window.location.reload();
+							}
+							//#endif
+						}, 1500)
 					}
-					//#endif
-				}, 1500)
-			}
+				})
 			// $http.post("/client/pay/wechat", obj)
 			// 	.then(res => {
 			// 		//#ifdef H5