Merge branch 'dev' of https://git.xiaopay.net/lizhishu/az-uniapp-wechat-web into dev

pages/IcbcModule/Recharge/Recharge.vue

@@ -67,8 +67,9 @@
 			<!-- 支付方式 -->
 			<view class="payType" @click="queryBindCardList">
 				<view>付款方式</view>
-				<view> {{ bankInfo_.bindCardName}} {{ bankInfo_.bindCardNo.slice(bankInfo_.bindCardNo.length-4) }}<span class="arrow"></span></view>
-			<!-- 	<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
+				<view> {{ bankInfo_.bindCardName}} {{ bankInfo_.bindCardNo.slice(bankInfo_.bindCardNo.length-4) }}<span
+						class="arrow"></span></view>
+				<!-- 	<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
 						class="arrow"></span></view> -->
 			</view>
 			<!-- <view class="" style="height: 1rpx;background-color: #DFDFDF;"></view> -->
@@ -118,7 +119,7 @@
 						<view class="" v-else>
 							充值金额：{{Money}}元
 						</view>
-						<view class="" >
+						<view class="">
 							付款账户：{{bankInfo_.bindCardName}}({{bankInfo_.bindCardNo && bankInfo_.bindCardNo.slice(bankInfo_.accountNo.length-4)}})
 						</view>
 					</view>
@@ -143,10 +144,8 @@
 					<!-- 切换绑定的一类卡列表 -->
 					<view class="showBindCardList">
 						<view class="choiceBox">选择付款账户</view>
-						<view 
-						class="ListItem" 
-						@click="ChangeCardPay(item)"
-						v-for="(item,index) in bindcardList" :key="index">
+						<view class="ListItem" @click="ChangeCardPay(item)" v-for="(item,index) in bindcardList"
+							:key="index">
 							<span style="padding-right:10px;">{{item.bindCardName}} </span>
 							<span>尾号：{{item.bindCardNo.slice(item.bindCardNo.length-4)}}</span>
 							<!-- <image class='BankListImg' src='../../../static/img/choiceBank.png'></image> -->
@@ -237,8 +236,8 @@
 				},
 				bankInfo_: {
 					accountNo: '**** **** **** 1234',
-					bindCardName:'',
-					bindCardNo:''
+					bindCardName: '',
+					bindCardNo: ''
 				},
 				ImgUrl: this.$ImgUrl,
 				MoneyList: Array(6).fill(1).map((v, index) => {
@@ -445,13 +444,13 @@
 						loading.clear();
 						if (res5.code == "10000") {
 							let appStatus = res5.results.appStatus;
-							if(appStatus == '4'){
+							if (appStatus == '4') {
 								uni.showModal({
 									title: "系统提示",
 									content: "充值成功!"
 								})
 								this_.queryBankInfo();
-							}else{
+							} else {
 								uni.showModal({
 									title: "系统提示",
 									content: appStatus == '1' ? '申请已受理' : '申请失败'
@@ -540,8 +539,8 @@
 						userId: userID,
 						sessionid: sessionID,
 						wechattype: 1,
-						bindMedium:item.bindCardNo,
-						bindMediumName:item.bindCardName
+						bindMedium: item.bindCardNo,
+						bindMediumName: item.bindCardName
 					},
 					success: function(res5) {
 						loading.hide();
@@ -654,7 +653,7 @@
 							}
 							bankInfo = res2.results;
 							bankInfo.sessionid = sessionID;
-							this_.queryBankInfo();  //查余额
+							this_.queryBankInfo(); //查余额
 							this_.bankInfo_ = bankInfo;
 							// this_.getBindingList(bankInfo.accountNo,bankInfo.schoolId,bankInfo.id);
 						} else {
@@ -721,7 +720,8 @@
 		width: 750rpx;
 		background: linear-gradient(180deg, #FFFFFF 0%, #FAFAFA 100%);
 	}
-    .showBindCardList {
+
+	.showBindCardList {
 		.choiceBox {
 			text-align: center;
 			font-weight: bold;
@@ -730,7 +730,7 @@
 			padding: 0;
 			border-bottom: 0.5px solid #e6e6e6;
 		}
-		
+
 		.ListItem {
 			border-bottom: 1rpx solid #e6e6e6;
 			font-size: 30rpx;
@@ -740,7 +740,7 @@
 			text-align: center;
 		}
 	}
-	
+
 	.SubmittedSuccessfully {
 		width: 400rpx !important;
 		height: 200rpx !important;
@@ -960,7 +960,7 @@
 		margin: 0 auto;
 		line-height: 100rpx;
 		margin-top: 32rpx;
-		padding-left: 26rpx;
+
 
 		span {
 			display: inline-block;
@@ -968,6 +968,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #000000;
+			padding-left: 26rpx;
 		}
 
 		input {
@@ -1026,12 +1027,13 @@
 
 	}
 
-
-	.bottomdiv {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 30rpx;
+	@media (min-height: 500px) {
+		.bottomdiv {
+			position: fixed;
+			left: 0;
+			right: 0;
+			bottom: 30rpx;
+		}
 	}
 
 	.DepositID {

template.h5.html

@@ -22,6 +22,10 @@
 		</script>
 		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
 		<script src="//cdn.bootcdn.net/ajax/libs/clipboard.js/2.0.6/clipboard.min.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/eruda" type="text/javascript" charset="utf-8"></script>
+		<script type="text/javascript">
+			eruda.init();
+		</script>
 	</head>
 	<body>
 		<noscript>