1.提交更新;

src/pages/BankModule/Recharge/Recharge.vue

@@ -11,18 +11,15 @@
 				<view class="cardNum">
 					<view class="cardNumleft"><span>账户：</span> **** **** ****
 						{{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}
-						<span>({{accountEnum[bankInfo_.accountType+'']}})</span>
+						<span>({{accountEnum[bankInfo_.accountType+'']}}III类户)</span>
 					</view>
 					<view class="cardNumright" id="cardNumright" @click="CopyCardNumber">复制</view>
 				</view>
 				<view class="HidenText">
-					<view class="userName" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;">
-						姓名：<span>{{PersonalInfo.name}}</span></view>
-					<view class="StudentCls" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;"
-						v-if="PersonalInfo.usertype=='1'">
+					<view class="userName" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;">姓名：<span>{{PersonalInfo.name}}</span></view>
+					<view class="StudentCls" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;" v-if="PersonalInfo.usertype=='1'">
 						班级：{{PersonalInfo.gradename}}({{PersonalInfo.classname}})</view>
-					<view class='TeacherCls' style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;"
-						v-else>教职工</view>
+					<view class='TeacherCls' style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;" v-else>教职工</view>
 				</view>
 				<view class="Balance">
 					<view class="cardBalanceTx">余额：￥<span>{{cardBalanceTx}}</span></view>
@@ -116,18 +113,11 @@
 						验证校园卡开卡手机号
 					</view>
 					<van-field label-class="openCardPhonTxt" label="手机号:" maxlength="11" v-model="openCardPhon"
-						placeholder="校园卡开卡手机号" center :border="false">
-						<view slot="right-icon" v-if="bankInfo_.accountType==4">
-							<view class="changPhone" style="display: flex;justify-content: center;"
-								@click="changePhone">变更手机号
-								<van-icon name="arrow" />
-							</view>
-						</view>
-					</van-field>
+						placeholder="校园卡开卡手机号" center :border="false" />
 					<view style="width: 520rpx;height: 1rpx;background: #EEEEEE;"></view>
 					<van-field v-model="openCardPhonSms" label-class="openCardPhonSmsTxt" maxlength="6" label="验证码:"
 						placeholder="输入短信验证码" center clearable :border="false">
-						<van-button slot="button" size="small" type="primary" @click="SendSms">
+						<van-button slot="button" size="small" type="primary" @click="SendSms"  >
 							<div style="font-size:28rpx;">{{CodeMsg}}</div>
 						</van-button>
 					</van-field>
@@ -269,10 +259,9 @@
 				accountType: '2',
 				// 银行账户类型名称枚举
 				accountEnum: {
-					'1': "平安银行III类户",
-					'2': "工商银行III类户",
-					'3': "交通银行III类户",
-					'4': "渤海银行II类户",
+					'1': "平安银行",
+					'2': "工商银行",
+					'3': "交通银行",
 				},
 				/**
 				 * 20211129新增
@@ -316,13 +305,6 @@
 					mask: true,
 					title: "请稍后...."
 				});
-				if (bankInfo.accountType == 4) {
-					jWeixin.miniProgram.redirectTo({
-						url: `/pages_subpack/pages/changeBindCard/main`,
-					});
-					uni.hideLoading()
-					return
-				}
 				this.BackToMini('AssignAddCard')
 				uni.hideLoading()
 			},
@@ -358,7 +340,6 @@
 					MyTimer = null
 					this.CodeMsg = "获取验证码"
 					this.msCount = 60;
-					this.openCardPhonSms = '';
 				}
 				this.$refs.popup.open('top')
 			},
@@ -442,25 +423,8 @@
 					loadingType: 'spinner',
 					duration: 0
 				});
-				// 20211230
-				let exchangeUrl = gHost;
-				switch (bankInfo.accountType) {
-					case 3:
-						exchangeUrl = exchangeUrl + '/bank-wechat/bocom/exchange/rechargeSms';
-						break;
-					case 4:
-						exchangeUrl = exchangeUrl + '/bank-wechat/bohai/comprehensive/otpSms';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				$.ajax({
-					url: exchangeUrl,
+					url: gHost + '/bank-wechat/bocom/exchange/rechargeSms',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -469,9 +433,6 @@
 						userId: userID, //用户id
 						sessionid: sessionID,
 						wechattype: 1,
-						// 20211230渤海
-						mobilePhone: this.openCardPhon,
-						msg: "充值"
 					},
 					headers: {
 						'sessionid': sessionID,
@@ -528,14 +489,12 @@
 					});
 					return
 				}
-				if (bankInfo.accountType != 4) {
-					if (!this.RechargeSmsorderNoInfo.orderNo) {
-						Dialog({
-							title: '系统提示',
-							message: '请获取验证码！'
-						});
-						return
-					}
+				if (!this.RechargeSmsorderNoInfo.orderNo) {
+					Dialog({
+						title: '系统提示',
+						message: '请获取验证码！'
+					});
+					return
 				}
 				if (!this.openCardPhonSms) {
 					Dialog({
@@ -548,25 +507,8 @@
 					mask: true,
 					title: "处理中......"
 				})
-				// 20211230
-				let exchangeUrl = gHost;
-				switch (bankInfo.accountType) {
-					case 3:
-						exchangeUrl = exchangeUrl + '/bank-wechat/bocom/exchange/recharge';
-						break;
-					case 4:
-						exchangeUrl = exchangeUrl + '/bank-wechat/bohai/exchange/recharge';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				$.ajax({
-					url: exchangeUrl,
+					url: gHost + '/bank-wechat/bocom/exchange/recharge',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -577,9 +519,6 @@
 						userId: userID, //用户id
 						sessionid: sessionID,
 						wechattype: 1,
-						// 21211230渤海银行
-						transAmount: (amount * 1).toFixed(2),
-						verifyNo: this.openCardPhonSms
 					},
 					headers: {
 						'sessionid': sessionID,
@@ -721,12 +660,6 @@
 					}
 				})
 			},
-			// 更换手机号码
-			changePhone() {
-				jWeixin.miniProgram.redirectTo({
-					url: `/pages_subpack/pages/changePhone/main`,
-				});
-			},
 			//返回小程序 跳转指定页面
 			BackToMini(page) {
 				if (page == 'UserMain' || page == 'personalCenter') {
@@ -805,26 +738,9 @@
 			//获取银行余额
 			queryBankInfo() {
 				let this_ = this;
-				let queryBankInfoUrl = gHost;
-				// 20211230
-				switch (bankInfo.accountType) {
-					case 3:
-						queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal';
-						break;
-					case 4:
-						queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bohai/exchange/balanceQuery';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				// let loading = weui.loading('请稍后');
 				$.ajax({
-					url: queryBankInfoUrl,
+					url: gHost + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal',
 					type: "POST",
 					timeout: 8000,
 					contentType: "application/x-www-form-urlencoded",
@@ -838,20 +754,6 @@
 					success: function(res3) {
 						// loading.hide();
 						if (res3.code == "10000") {
-							if (bankInfo.accountType == 4) {
-								if (res3.results.eacTotalAmt == null) {
-									weui.topTips("账户信息为空，余额查询失败");
-								} else {
-									this_.cardBalanceTx = (res3.results.eacTotalAmt * 1).toFixed(2);
-									$('.TxClsTx').attr('placeholder',
-										`可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
-									)
-									this_.RechargeMax = ((2000 - ((res3.results.eacTotalAmt * 1).toFixed(
-											2) *
-										1)).toFixed(2));
-								}
-								return
-							}
 							if (res3.results.accountBalance == null) {
 								weui.topTips("账户信息为空，余额查询失败");
 							} else {
@@ -862,7 +764,6 @@
 								this_.RechargeMax = ((2000 - ((res3.results.accountBalance * 1).toFixed(2) *
 									1)).toFixed(2));
 							}
-
 						} else {
 							weui.topTips(res3.message)
 						}
@@ -971,13 +872,6 @@
 	}
 
 
-	.changPhone {
-		font-size: 14px;
-		color: #39F;
-		text-align: right;
-	}
-
-
 	.showBindCardList {
 		.choiceBox {
 			text-align: center;

src/pages/BankModule/Reflect/Reflect.vue

 <template>
 	<view class="container">
-		<view class="ReflectBox" v-if="bankInfo_.accountType==3">
+		<view class="ReflectBox">
 			<view class="left_">提现金额 </view>
 			<view class="right_">每日可提现一次</view>
 		</view>
-		<!-- 20211230渤海银行 -->
-		<view class="BankBohai" v-if="bankInfo_.accountType==4">
-			<view class="BankBHL">提现至</view>
-			<view class="BankBHR">
-				<view class="">{{bankInfo_.accountName}}
-					({{'**** '+bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}})</view>
-				<view class="">预计2小时内到账</view>
-			</view>
-		</view>
 		<view class="OtherMoney" v-if="true">
 			<span>￥</span>
 			<input class="TxClsTx" v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop"
 				:placeholder="placeholder" placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
-			<span class="ALL" @click="TxAllFun" v-if="bankInfo_.accountType==3">全部</span>
-		</view>
-		<!-- 20211230渤海银行 -->
-		<view class="BankBHBalance">
-			<span>当前卡包余额{{cardBalanceTx}}元,</span>
 			<span class="ALL" @click="TxAllFun">全部</span>
 		</view>
 		<!-- 提现账户 -->
-		<view class="payType" @click="queryBindCardList" v-if="bankInfo_.accountType==3">
+		<view class="payType" @click="queryBindCardList">
 			<view>提现账户</view>
 			<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
 					class="arrow"></span></view>
 		</view>
 		<view class="OtherMoney" v-if="false" style="color: #BFBFBF;font-weight: 500;">
-			小提示：每天仅可提现一次
+			每日仅可提现一次，请明日再来。
 		</view>
 		<view class="bottomdiv">
-			<view v-if="bankInfo_.accountType==4"
-				style="font-weight: 500;text-align: center;height: 27px;line-height: 27px;">
-				小提示：每天仅可提现一次
-			</view>
 			<view class="DepositID" @click="toDeposit(0)" v-bind:style="inputOtherM>0?'':'opacity: 0.5 !important;'">
 				<span>提现</span>
 			</view>
@@ -55,14 +37,7 @@
 						验证校园卡开卡手机号
 					</view>
 					<van-field label-class="openCardPhonTxt" label="手机号:" maxlength="11" v-model="openCardPhon"
-						placeholder="校园卡开卡手机号" center :border="false">
-						<view slot="right-icon" v-if="bankInfo_.accountType==4">
-							<view class="changPhone" style="display: flex;justify-content: center;"
-								@click="changePhone">变更手机号
-								<van-icon name="arrow" />
-							</view>
-						</view>
-					</van-field>
+						placeholder="校园卡开卡手机号" center :border="false" />
 					<view style="width: 520rpx;height: 1rpx;background: #EEEEEE;"></view>
 					<van-field v-model="openCardPhonSms" label-class="openCardPhonSmsTxt" maxlength="6" label="验证码:"
 						placeholder="输入短信验证码" center clearable :border="false">
@@ -127,7 +102,7 @@
 				inputOtherM: '',
 				ImgUrl: this.$ImgUrl,
 				ReflectMoney: 3,
-				cardBalanceTx: '0',
+				cardBalanceTx: '',
 				placeholder: "可提现金额0.00元",
 				bankInfo_: {
 					accountNo: '**** **** **** 1234'
@@ -140,8 +115,7 @@
 				openCardPhonSms: "",
 				msCount: 60, //定时器
 				CodeMsg: "获取验证码",
-				RechargeSmsorderNoInfo: {}, //第三方合作交易标识
-				WithdrawInfo: null
+				RechargeSmsorderNoInfo: {} //第三方合作交易标识
 			}
 		},
 		onLoad: function(options) {
@@ -180,25 +154,8 @@
 					loadingType: 'spinner',
 					duration: 0
 				});
-				// 20211230
-				let withdrawSmsUrl = gHost;
-				switch (bankInfo.accountType) {
-					case 3:
-						withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/bocom/exchange/withdrawSms';
-						break;
-					case 4:
-						withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/bohai/comprehensive/otpSms';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				$.ajax({
-					url: withdrawSmsUrl,
+					url: gHost + '/bank-wechat/bocom/exchange/withdrawSms',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -207,9 +164,6 @@
 						userId: userID, //用户id
 						sessionid: sessionID,
 						wechattype: 1,
-						// 21211230渤海银行
-						mobilePhone: this.openCardPhon,
-						msg: "提现"
 					},
 					headers: {
 						'sessionid': sessionID,
@@ -307,48 +261,14 @@
 					weui.topTips(`提现金额不可大于账户余额`);
 					return
 				}
-				this.openCardPhonSms = '';
 				this.$refs.popup.open('top')
 			},
 			// 提现
 			async ExchangeWithdraw() {
 				let this_ = this;
-				if (bankInfo.accountType != 4) {
-					if (!this.RechargeSmsorderNoInfo.orderNo) {
-						Dialog({
-							title: '系统提示',
-							message: '请获取验证码！'
-						});
-						return
-					}
-				}
-				if (!this.openCardPhonSms) {
-					Dialog({
-						title: '系统提示',
-						message: '请收入验证码！'
-					});
-					return
-				}
 				let loading = weui.loading('请稍后');
-				// 20211230
-				let withdrawUrl = gHost;
-				switch (bankInfo.accountType) {
-					case 3:
-						withdrawUrl = withdrawUrl + '/bank-wechat/bocom/exchange/withdraw';
-						break;
-					case 4:
-						withdrawUrl = withdrawUrl + '/bank-wechat/bohai/exchange/withdraw';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				$.ajax({
-					url: withdrawUrl,
+					url: gHost + '/bank-wechat/bocom/exchange/withdraw',
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -360,9 +280,6 @@
 						userId: userID,
 						sessionid: sessionID,
 						wechattype: 1,
-						// 21211230渤海银行
-						transAmount: (this.inputOtherM * 1).toFixed(2),
-						verifyNo: this_.openCardPhonSms,
 					},
 					headers: {
 						'sessionid': sessionID,
@@ -370,21 +287,14 @@
 					success: function(res5) {
 						loading.hide();
 						if (res5.code == "10000") {
-							this.WithdrawInfo = res5.results || null
 							wx.showModal({
 								title: '提现申请已提交',
 								content: '银行处理需要1-5分钟时间，充值结果以余额查询为准。',
 								showCancel: false,
 								success: function() {
-									if (bankInfo.accountType != 4) {
-										this_.ExchangeWithdrawQuery();
-									}
-									if (bankInfo.accountType == 4) {
-										window.location.reload()
-									}
+									this_.ExchangeWithdrawQuery();
 								}
 							})
-
 						} else {
 							weui.topTips(res5.message)
 						}
@@ -507,12 +417,6 @@
 					$('.' + dom).css('display', 'block');
 				}
 			},
-			// 更换手机号码
-			changePhone() {
-				jWeixin.miniProgram.redirectTo({
-					url: `/pages_subpack/pages/changePhone/main`,
-				});
-			},
 			//返回小程序 跳转指定页面
 			BackToMini(page) {
 				if (page == 'UserMain' || page == 'personalCenter') {
@@ -562,25 +466,8 @@
 			queryBankInfo() {
 				let this_ = this;
 				let loading = weui.loading('请稍后');
-				let queryBankInfoUrl = gHost;
-				// 20211230
-				switch (bankInfo.accountType) {
-					case 3:
-						queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal';
-						break;
-					case 4:
-						queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bohai/exchange/balanceQuery';
-						break;
-					default:
-						Dialog({
-							title: '系统提示',
-							message: '银行账号类型错误！'
-						});
-						throw ("银行账号类型错误!")
-						break;
-				}
 				$.ajax({
-					url: queryBankInfoUrl,
+					url: gHost + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal',
 					type: "POST",
 					timeout: 8000,
 					contentType: "application/x-www-form-urlencoded",
@@ -594,21 +481,6 @@
 					success: function(res3) {
 						loading.hide();
 						if (res3.code == "10000") {
-							if (bankInfo.accountType == 4) {
-								if (res3.results.eacTotalAmt == null) {
-									weui.topTips("账户信息为空，余额查询失败");
-								} else {
-									this_.ReflectMoney = res3.results.eacTotalAmt * 1
-									this_.cardBalanceTx = (res3.results.eacTotalAmt * 1).toFixed(2);
-									$('.TxClsTx').attr('placeholder',
-										`可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
-									)
-									this_.RechargeMax = ((2000 - ((res3.results.eacTotalAmt * 1).toFixed(2) *
-										1)).toFixed(2));
-									this_.placeholder = `可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
-								}
-								return
-							}
 							if (res3.results.accountBalance == null) {
 								weui.topTips("账户信息为空，余额查询失败");
 							} else {
@@ -718,43 +590,6 @@
 		background: linear-gradient(180deg, #FFFFFF 0%, #FAFAFA 100%);
 	}
 
-	.changPhone {
-		font-size: 14px;
-		color: #39F;
-		text-align: right;
-	}
-
-	.BankBohai {
-		display: flex;
-		justify-content: space-between;
-		width: 680rpx;
-		margin: 0 auto;
-		padding-top: 30rpx;
-
-		.BankBHR view:nth-child(2) {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #888888;
-		}
-	}
-
-	.BankBHBalance {
-		display: flex;
-		width: 680rpx;
-		margin: 0 auto;
-		padding-top: 30rpx;
-		align-items: center;
-
-		.ALL {
-			font-size: 14px;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #129A5E;
-			margin-left: 20rpx;
-		}
-	}
-
 	.OtherMoney {
 		display: flex;
 		justify-content: flex-start;
@@ -804,7 +639,6 @@
 		height: 100rpx;
 		line-height: 100rpx;
 
-
 		.left_ {
 			font-size: 36rpx;
 			font-family: PingFang SC;