Merge branch 'develop' into V1.5.24_feature

src/pages/BankModule/Recharge/Recharge.vue

@@ -16,10 +16,10 @@
 					<view class="cardNumright" id="cardNumright" @click="CopyCardNumber">复制</view>
 				</view>
 				<view class="HidenText">
-					<view class="userName">姓名：<span>{{PersonalInfo.name}}</span></view>
-					<view class="StudentCls" 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' 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>
@@ -81,7 +81,7 @@
 					<span>充值生活费</span>
 				</view>
 				<!--  -->
-				<!-- <view class="switchbankCard" @click="ChangeBankPay">我要换银行卡支付</view> -->
+				<view class="switchbankCard" @click="ChangeBankPay">我要换银行卡支付</view>
 			</view>
 
 		</view>
@@ -296,11 +296,11 @@
 		methods: {
 			// 更换银行卡
 			async ChangeBankPay() {
-				uni.showModal({
-					title: "系统提示",
-					content: "功能开发中!"
-				})
-				return
+				// uni.showModal({
+				// 	title: "系统提示",
+				// 	content: "功能开发中!"
+				// })
+				// return
 				uni.showLoading({
 					mask: true,
 					title: "请稍后...."