Merge branch 'V1.7.0_bank_feature' into develop

src/pages/IcbcModule/Recharge/Recharge.vue

@@ -6,7 +6,8 @@
 					<image :src="ImgUrl + 'user/personAva.png'" alt=""></image>
 				</view>
 				<view class="name">{{ PersonalInfo.name }}</view>
-				<view>{{ PersonalInfo.gradename }}{{ PersonalInfo.classname }}</view>
+				<view v-if="PersonalInfo.usertype == '1'">{{ PersonalInfo.gradename }}{{ PersonalInfo.classname }}</view>
+				<view v-else>教职工</view>
 			</view>
 			<view class="secondLine">{{ PersonalInfo.schoolname }}</view>
 		</view>
@@ -68,16 +69,16 @@
 				</view>
 			</view>
 			<!-- 充值明细 -->
-			<view style="display: none" class="RechargeDetailed" @click="BackToMini('purchaseDetail')">
+			<!-- <view style="display: none" class="RechargeDetailed" @click="BackToMini('purchaseDetail')">
 				账户明细
-			</view>
+			</view> -->
 			<!-- 充值账户 -->
 			<view class="Recharge">
 				<span></span>
 				<span>账户充值</span>
 			</view>
 			<!--  充值的金额 -->
-			<view class="MoneyBox">
+			<!-- <view class="MoneyBox">
 				<view class="depotMoney" @click="depotMoney(item.value, index)"
 					v-bind:class="MoneyIndex == index ? 'choiceClass' : ''" :data-money="item.value || 0"
 					v-for="(item, index) in MoneyList" :key="index">
@@ -88,7 +89,7 @@
 			  item.lable
 			}}</span>
 				</view>
-			</view>
+			</view> -->
 			<view class="moneyWrapper">
 				<view class="moneyItem" @click="depotMoney(item.value, index)"
 					v-bind:class="MoneyIndex == index ? 'active' : ''" :data-money="item.value || 0"
@@ -101,7 +102,7 @@
 						placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
 				</view>
 			</view>
-			<view class="MoneyBox" style="display: none">
+			<!-- <view class="MoneyBox" style="display: none !important;">
 				<view class="depotMoney" @click="depotMoney(item.value, index)"
 					v-bind:class="MoneyIndex == index ? 'choiceClass' : ''" :data-money="item.value || 0"
 					v-for="(item, index) in MoneyList" :key="index">
@@ -111,11 +112,11 @@
 					<span style="font-size: 28rpx; font-weight: 600; margin-left: 7rpx">
 						{{item.lable}}
 					</span>
+				</view>
+			</view> -->
 			<!-- <span class="tips" v-show="item.tips">
 						{{item.tips}}
 					</span> -->
-				</view>
-			</view>
 			<!-- 充值限额提示 -->
 			<view class="depositbox">
 				<image mode="widthFix" class="depositImg" src="../../../static/img/depositIcon.png"></image>
@@ -823,7 +824,7 @@
 				let this_ = this;
 				// let loading = weui.loading('请稍后');
 				$.ajax({
-					url: gHost + "/bank-wechat/user/bank/get",
+					url: gHost + "/bank-wechat/user/bank/get/v2",
 					type: "POST",
 					contentType: "application/x-www-form-urlencoded",
 					data: {
@@ -1257,7 +1258,7 @@
 			border-radius: 12rpx;
 			display: flex;
 			justify-content: center;
-			margin-right: 18rpx;
+			margin-right: 14rpx;
 			font-family: PingFangSC-Medium, PingFang SC;
 			margin-bottom: 24rpx;
 
@@ -1340,6 +1341,7 @@
 		margin-right: 2px;
 		float: left;
 	}
+
 	.depotMoney .value {
 		font-size: 45rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;

src/pages/assignDeposit/assignDeposit.vue

@@ -94,7 +94,7 @@
 
 			<!-- 充值限额提示 -->
 			<view class="depositbox">
-				<image mode="widthFix" class="depositImg" src="../../../static/img/depositIcon.png"></image>
+				<image mode="widthFix" class="depositImg" src="../../static/img/depositIcon.png"></image>
 				<span style="
 			  vertical-align: middle;
 			  font-size: 28rpx;