lilei 4 months ago
parent
commit
30145d11cd
2 changed files with 5 additions and 3 deletions
  1. 2 2
      App.vue
  2. 3 1
      pagesB/procureOrder/creatOrder.vue

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 	export default {
 		globalData: {
-			baseUrl: 'http://192.168.2.10:9110/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.2.10:9110/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		onLaunch: function() {

+ 3 - 1
pagesB/procureOrder/creatOrder.vue

@@ -343,7 +343,6 @@
 					useSubsidyFlag: this.hasKdk? '1' : '0',
 					payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
 				}).then(res => {
-					this.loading = false
 					uni.hideLoading()
 					if(res.status == 200){	
 						// 删除已提交产品		
@@ -375,10 +374,12 @@
 								uni.$emit("refashPayBalance")
 							})
 						}else{
+							this.loading = false
 							uni.$emit("refashPayBalance")
 							this.payComplete(null,true)
 						}
 					}else{
+						this.loading = false
 						uni.$emit("refashPayBalance")
 						uni.showToast({
 							title: res.message,
@@ -405,6 +406,7 @@
 					// 充值余额支付成功
 					this.payComplete(null,true)
 				}
+				this.loading = false
 			},
 			// 订单详情页
 			payComplete(data){