Merge branch 'develop' into uat

src/pages/IcbcModule/Recharge/Recharge.vue

@@ -226,7 +226,7 @@
 								: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>
+								<!-- <image class="BankListImg" src="../../../static/img/choiceBank.png"></image> -->
 							</view>
 						</view>
 						<view class="changeCard" @click="ChangeBankPay">我要换卡支付</view>
@@ -655,6 +655,7 @@
 			// 复制我卡号
 			async CopyCardNumber() {
 				let value = this.bankInfo_.accountNo;
+				console.log(value, 'valuevaluevaluevaluevalue')
 				Dialog({
 					title: "系统提示",
 					message: "复制成功！",
@@ -1035,7 +1036,7 @@
 			display: flex;
 			width: 100%;
 			justify-content: space-between;
-
+			margin-top: 20rpx;
 			view:first-child {
 				height: 60rpx;
 				font-size: 40rpx;
@@ -1258,10 +1259,10 @@
 			border-radius: 12rpx;
 			display: flex;
 			justify-content: center;
-			margin-right: 14rpx;
+			margin-right: 8rpx;
 			font-family: PingFangSC-Medium, PingFang SC;
 			margin-bottom: 24rpx;
-
+			border: 3rpx solid transparent;
 			view {
 				align-self: center;
 				color: #333333;
@@ -1296,7 +1297,7 @@
 			text-align: center;
 			background: #f8f8f8;
 			border-radius: 12rpx;
-
+			border: 3rpx solid transparent;
 			/deep/.uni-input-wrapper {
 				position: absolute;
 				width: 444rpx;

src/pages/SchoolReport/SchoolReport.vue

@@ -570,7 +570,7 @@
 				:style="{height:[915,845,891][tabIndex-1]+'rpx',top:[1425,1099,1260][tabIndex-1]+'rpx'}">
 				<view class="no-open-solution" @tap="equityPay">
 					<view class="no-open-solution-txt">
-						<text>最低{{memberInfo.leastAmount||''}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
+						<text>最低{{memberInfo.leastAmount}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
 					</view>
 					<view class="no-open-solution-item">
 					</view>
@@ -1139,7 +1139,9 @@
 								const lunchTxt = item.lunchStatus ? '' : '中';
 								const supperTxt = item.supperStatus ? '' : '晚';
 								day.topInfo = breakfastTxt + lunchTxt + supperTxt;
-								day.className = 'notice-day'
+								if(day.topInfo){
+									day.className = 'notice-day'
+								}
 							}
 						})
 					}
@@ -2094,7 +2096,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 						})
 						return
 					}
-					this.memberInfo.leastAmount = data.obj.leastAmount || '';
+					this.memberInfo.leastAmount = data.obj.leastAmount;
 				} catch (e) {
 					//TODO handle the exception
 					console.log(e);