Merge branch 'develop' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into develop

src/pages.json

@@ -246,9 +246,9 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
-		
-		
+
+
+
 		{
 			"path": "pages/AgreementSZXY/agreement/main",
 			"style": {
@@ -286,19 +286,24 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
-			"path" : "pages/recharging/recharging",
-			"style" :                                                                                    
-			{
+		}, {
+			"path": "pages/recharging/recharging",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "充值申请成功",
+				"enablePullDownRefresh": false
+
+			}
+
+		}, {
+			"path": "pages/OpenAccountAgreement/OpenAccountAgreement",
+			"style": {
 				"navigationStyle": "custom",
-			    "navigationBarTitleText": "充值申请成功",
-			    "enablePullDownRefresh": false
-				
+				"navigationBarTitleText": "三类户开户协议",
+				"enablePullDownRefresh": false
 			}
-			
+
 		}
-		
-		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

src/pages/BankModule/Recharge/Recharge.vue

@@ -287,15 +287,26 @@
 		},
 		mounted: function() {
 
+		},
+		onShow: function() {
+			if (bankInfo.userId) {
+				this.queryBankInfo();
+			}
 		},
 		methods: {
 			// 更换银行卡
 			async ChangeBankPay() {
+				uni.showModal({
+					title: "系统提示",
+					content: "功能开发中!"
+				})
+				return
 				uni.showLoading({
 					mask: true,
 					title: "请稍后...."
 				});
 				this.BackToMini('AssignAddCard')
+				uni.hideLoading()
 			},
 			// 验证码弹出框开启
 			toDeposit() {
@@ -522,8 +533,26 @@
 							wx.showModal({
 								title: '充值申请已提交',
 								content: '银行处理需要1-5分钟时间，充值结果以余额查询为准。',
-								showCancel: false
+								showCancel: false,
+								success: function() {
+									let accountNo = this_.bankInfo_.accountNo
+									accountNo = accountNo.slice(accountNo.length - 4, accountNo
+										.length);
+									let thiTime = new Date();
+									let str = ''
+									if (thiTime.getMinutes() + 20 >= 60) {
+										str = thiTime.getHours() + 1 + ':' + (60 - thiTime
+											.getMinutes())
+									} else {
+										str = thiTime.getHours() + ':' + thiTime.getMinutes()
+									}
+
+									uni.navigateTo({
+										url: `../../recharging/recharging?bankName=${this_.accountEnum[this_.bankInfo_.accountType+'']}&bankNumber=${accountNo}&time=${str}&money=${(amount * 1).toFixed(2)}`
+									})
+								}
 							})
+
 							// 20211129
 							this_.RechargeSmsorderNoInfo = {}
 						} else {
@@ -682,11 +711,11 @@
 				let this_ = this;
 				let loading = weui.loading('请稍后');
 				$.ajax({
-					url: gHost + '/bank-wechat/icbc/account/bindcard/bindingList',
+					url: gHost + '/bank-wechat/user/bank/bindingList',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
-						mediumId: bankInfo.accountNo,
+						cardNo: bankInfo.accountNo,
 						schoolId: bankInfo.schoolId,
 						userId: userID,
 						sessionid: sessionID,