Merge branch 'develop' into uat

src/pages/BankModule/Recharge/Recharge.vue

@@ -6,9 +6,8 @@
 					<image :src="ImgUrl + 'user/personAva.png'" alt=""></image>
 				</view>
 				<view class="name">{{ PersonalInfo.name }}</view>
-        <view v-if="PersonalInfo.usertype == '1'"
-          >{{ 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>
@@ -21,30 +20,20 @@
 						<view>{{ cardBalanceTx }}</view>
 					</view>
 					<view class="right">
-            <van-popover
-              v-model="showPopover"
-              trigger="click"
-              :actions="actions"
-              placement="bottom-end"
-              @select="onSelect"
-            >
+						<van-popover v-model="showPopover" trigger="click" :actions="actions" placement="bottom-end"
+							@select="onSelect">
 							<template #reference>
-                <image
-                  class="icon"
-                  :src="ImgUrl + 'user/more.png'"
-                  alt=""
-                ></image>
+								<image class="icon" :src="ImgUrl + 'user/more.png'" alt=""></image>
 							</template>
 						</van-popover>
 					</view>
 				</view>
 				<view class="lastLine">
-          <view
-            >**** **** ****
+					<view>**** **** ****
 						{{
               bankInfo_.accountNo.slice(bankInfo_.accountNo.length - 4)
-            }}</view
-          >
+            }}
+					</view>
 					<view class="right" @click="ToWalletTx">
 						<!-- <image class="btn" :src="ImgUrl + 'user/cashBtn.png'" alt=""></image> -->
 						提现
@@ -61,65 +50,39 @@
 				</view>
 				<!-- 卡号显示 -->
 				<view class="cardNum">
-          <view class="cardNumleft"
-            ><span>账户：</span> **** **** ****
+					<view class="cardNumleft"><span>账户：</span> **** **** ****
 						{{ bankInfo_.accountNo.slice(bankInfo_.accountNo.length - 4) }}
 						<span>({{ accountEnum[bankInfo_.accountType + ""] }})</span>
 					</view>
-          <view class="cardNumright" id="cardNumright" @click="CopyCardNumber"
-            >复制</view
-          >
+					<view class="cardNumright" id="cardNumright" @click="CopyCardNumber">复制</view>
 				</view>
 				<view class="HidenText">
-          <view
-            class="userName"
-            style="
+					<view class="userName" style="
               text-overflow: ellipsis;
               overflow: hidden;
               white-space: nowrap;
-            "
-          >
-            姓名：<span>{{ PersonalInfo.name }}</span></view
-          >
-          <view
-            class="StudentCls"
-            style="
+            ">
+						姓名：<span>{{ PersonalInfo.name }}</span></view>
+					<view class="StudentCls" style="
               text-overflow: ellipsis;
               overflow: hidden;
               white-space: nowrap;
-            "
-            v-if="PersonalInfo.usertype == '1'"
-          >
+            " v-if="PersonalInfo.usertype == '1'">
 						班级：{{ PersonalInfo.gradename }}({{
               PersonalInfo.classname
-            }})</view
-          >
-          <view
-            class="TeacherCls"
-            style="
+            }})</view>
+					<view class="TeacherCls" style="
               text-overflow: ellipsis;
               overflow: hidden;
               white-space: nowrap;
-            "
-            v-else
-            >教职工</view
-          >
+            " v-else>教职工</view>
 				</view>
 				<view class="Balance">
-          <view class="cardBalanceTx"
-            >余额：￥<span>{{ cardBalanceTx }}</span></view
-          >
+					<view class="cardBalanceTx">余额：￥<span>{{ cardBalanceTx }}</span></view>
 					<view @click="ToWalletTx">
-            <span style="display: inline-block; padding-right: 10rpx"
-              >余额提现</span
-            >
-            <image
-              style="position: relative; width: 13rpx; height: 20rpx"
-              class="ImgIcon1"
-              mode="widthFix"
-              :src="ImgUrl + 'images/xiaopaycard (17).png'"
-              alt=""
-            ></image>
+						<span style="display: inline-block; padding-right: 10rpx">余额提现</span>
+						<image style="position: relative; width: 13rpx; height: 20rpx" class="ImgIcon1" mode="widthFix"
+							:src="ImgUrl + 'images/xiaopaycard (17).png'" alt=""></image>
 					</view>
 				</view>
 			</view>
@@ -129,43 +92,25 @@
 			</view> -->
 			<!-- 充值账户 -->
 			<view class="Recharge">
-        <span></span>
-        <span>账户充值</span>
+				<span>充值金额</span>
 			</view>
 			<view class="moneyWrapper">
-        <view
-          class="moneyItem"
-          @click="depotMoney(item.value, index)"
-          v-bind:class="MoneyIndex == index ? 'active' : ''"
-          :data-money="item.value || 0"
-          v-for="(item, index) in MoneyList"
-          :key="index"
-        >
+				<view class="moneyItem" @click="depotMoney(item.value, index)"
+					v-bind:class="MoneyIndex == index ? 'active' : ''" :data-money="item.value || 0"
+					v-for="(item, index) in MoneyList" :key="index">
 					<view> {{ item.value }}</view>
 					<view> {{ item.lable }}</view>
 				</view>
 				<view class="other">
-          <input
-            v-model="inputOtherM"
-            @input="inputControl"
-            @blur="ReturnToTop"
-            placeholder="其他金额，最低3元"
-            placeholder-class="placeholderinputOtherM"
-            type="text"
-            maxlength="6"
-          />
+					<input v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop" placeholder="其他金额，最低3元"
+						placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
 				</view>
 			</view>
 			<!--  充值的金额 -->
 			<view class="MoneyBox" style="display: none">
-        <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"
-        >
+				<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">
 					<span class="value">
 						{{ item.value }}
 					</span>
@@ -190,34 +135,18 @@
 			<!-- <view class="OtherMoney" v-if="isOtherMoney"> -->
 			<view class="OtherMoney" style="display: none">
 				<span>￥</span>
-        <input
-          v-model="inputOtherM"
-          @input="inputControl"
-          @blur="ReturnToTop"
-          placeholder="请输入其他金额，最低3元"
-          placeholder-class="placeholderinputOtherM"
-          type="text"
-          maxlength="6"
-        />
+				<input v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop" placeholder="请输入其他金额，最低3元"
+					placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
 			</view>
 			<!-- 充值限额提示 -->
 			<view class="depositbox">
-        <image
-          mode="widthFix"
-          class="depositImg"
-          src="../../../static/img/depositIcon.png"
-        ></image>
-        <span
-          style="
+				<image mode="widthFix" class="depositImg" src="../../../static/img/depositIcon.png"></image>
+				<span style="
             vertical-align: middle;
             font-size: 28rpx;
             color: #333333;
             font-weight: 500;
-          "
-          >最大可充值金额：<span style="color: red"
-            >￥<span class="canDepositTx">{{ RechargeMax }}</span></span
-          ></span
-        >
+          ">最大可充值金额：<span style="color: red">￥<span class="canDepositTx">{{ RechargeMax }}</span></span></span>
 			</view>
 			<!-- 支付方式 -->
 			<view class="paytype">
@@ -242,11 +171,8 @@
 			<!-- <view class="" style="height: 1rpx;background-color: #DFDFDF;"></view> -->
 			<!-- 充值生活费 -->
 			<view class="bottomdiv">
-        <view
-          class="DepositID"
-          @click="toDeposit"
-          v-bind:style="Money != '' ? '' : 'background: #e6e6e6 !important;'"
-        >
+				<view class="DepositID" @click="toDeposit"
+					v-bind:style="Money != '' ? '' : 'background: #e6e6e6 !important;'">
 					<span>充值生活费</span>
 				</view>
 				<view class="service">{{bankInfo_.accountName}}Ⅲ类户为您提供服务</view>
@@ -259,22 +185,15 @@
 			<view class="OtherTitle">充值金额</view>
 			<view class="inputOtherM">
 				<span>￥</span>
-        <input
-          v-model="inputOtherM"
-          @input="inputControl"
-          placeholder-class="placeholderinputOtherM"
-          type="text"
-          maxlength="6"
-        />
+				<input v-model="inputOtherM" @input="inputControl" placeholder-class="placeholderinputOtherM"
+					type="text" maxlength="6" />
 			</view>
 			<view class="OtherLine"></view>
 			<!-- 充值范围 -->
 			<view class="Recharge_">
 				<!-- <image mode="widthFix" class="depositImg" src="../../static/img/depositIcon.png"></image> -->
 				<span>最大可充值金额：</span>
-        <span
-          >￥<span>3.00 ~ {{ RechargeMax }}</span></span
-        >
+				<span>￥<span>3.00 ~ {{ RechargeMax }}</span></span>
 			</view>
 		</view>
 		<!-- 弹出层 -->
@@ -286,42 +205,19 @@
 						<image src="../../../static/img/close.png" mode="aspectFit"></image>
 					</view>
 					<view class="RechargeInfo1"> 验证校园卡开卡手机号 </view>
-          <van-field
-            label-class="openCardPhonTxt"
-            label="手机号:"
-            maxlength="11"
-            v-model="openCardPhon"
-            placeholder="校园卡开卡手机号"
-            center
-            :border="false"
-          >
+					<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"
-                >变更手机号
+							<view class="changPhone" style="display: flex; justify-content: center"
+								@click="changePhone">变更手机号
 								<van-icon name="arrow" />
 							</view>
 						</view>
 					</van-field>
 					<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-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">
 							<div style="font-size: 28rpx">{{ CodeMsg }}</div>
 						</van-button>
 					</van-field>
@@ -335,36 +231,21 @@
 		</uni-popup>
 		<!-- 选择银行卡 -->
 		<view class="selectCard">
-      <van-popup
-        v-model="popshow"
-        round
-        position="bottom"
-        :style="{ height: '30%' }"
-      >
+			<van-popup v-model="popshow" round position="bottom" :style="{ height: '30%' }">
 				<!-- 银行卡列表 -->
 				<view class="accountlist">
 					<!-- 切换绑定的一类卡列表 -->
 					<view class="showBindCardList">
 						<view class="choiceBox">选择付款账户</view>
 						<view class="cardsList">
-              <view
-                class="ListItem"
-                @click="ChangeCardPay(item)"
-                v-for="(item, index) in bindcardList"
-                :key="index"
-              >
-                <span style="padding-right: 10px"
-                  >{{ item.bindCardName }}
+							<view class="ListItem" @click="ChangeCardPay(item)" v-for="(item, index) in bindcardList"
+								:key="index">
+								<span style="padding-right: 10px">{{ item.bindCardName }}
 								</span>
-                <span
-                  >尾号：{{
+								<span>尾号：{{
                     item.bindCardNo.slice(item.bindCardNo.length - 4)
-                  }}</span
-                >
-                <image
-                  class="BankListImg"
-                  src="../../../static/img/choiceBank.png"
-                ></image>
+                  }}</span>
+								<!-- <image class="BankListImg" src="../../../static/img/choiceBank.png"></image> -->
 							</view>
 						</view>
 						<view class="changeCard" @click="ChangeBankPay">我要换卡支付</view>
@@ -400,27 +281,30 @@
 </template>
 
 <script>
-import { Dialog, Toast } from "vant";
-import keyboardPackage from "@/components/keyboard-package/keyboard-package.vue";
-import cityData from "@/common/js/city.js";
-var gHost = "https://" + window.location.host;
-if (window.location.protocol != "https:") {
+	import {
+		Dialog,
+		Toast
+	} from "vant";
+	import keyboardPackage from "@/components/keyboard-package/keyboard-package.vue";
+	import cityData from "@/common/js/city.js";
+	var gHost = "https://" + window.location.host;
+	if (window.location.protocol != "https:") {
 		gHost = "https://fpdev.xiaopay.net";
 		// gHost = "/api";
-}
-let times = 0;
-var limitClick = false; //禁止重复点击
-var sessionID = "",
+	}
+	let times = 0;
+	var limitClick = false; //禁止重复点击
+	var sessionID = "",
 		userID = "";
-var payCardNumber = ""; //一类卡号
-var orderSerialNo = ""; //提现结果查询 指令号
-var businessNo = "",
+	var payCardNumber = ""; //一类卡号
+	var orderSerialNo = ""; //提现结果查询 指令号
+	var businessNo = "",
 		otpOrderNo = "",
 		mobileNo = "";
-var MyTimer = null;
-var fromType = 0; //0转账  1提现
-var opeType = 0; //0充值  1提现   手机号验证
-var bankInfo = {
+	var MyTimer = null;
+	var fromType = 0; //0转账  1提现
+	var opeType = 0; //0充值  1提现   手机号验证
+	var bankInfo = {
 		acctNoArray: "",
 		idNo: "",
 		schoolId: "",
@@ -428,14 +312,14 @@ var bankInfo = {
 		userId: "",
 		sessionid: "",
 		wechattype: 1,
-};
-var accountType = "";
-let orderApi = window.location.origin;
-/**
+	};
+	var accountType = "";
+	let orderApi = window.location.origin;
+	/**
 	 * 对象转拼接字符串
 	 * @param {*} res   Object    需要转换的数据对象
 	 */
-function OforS(res) {
+	function OforS(res) {
 		var resL = 0;
 		var outS = "";
 		for (var i in res) {
@@ -447,8 +331,8 @@ function OforS(res) {
 			resL++;
 		}
 		return outS;
-}
-export default {
+	}
+	export default {
 		components: {
 			keyboardPackage,
 		},
@@ -457,8 +341,7 @@ export default {
 			return {
 				showPopover: false,
 				// 通过 actions 属性来定义菜单选项
-      actions: [
-        {
+				actions: [{
 						text: "复制卡号",
 					},
 					{
@@ -493,8 +376,7 @@ export default {
 					bindCardNo: "",
 				},
 				ImgUrl: this.$ImgUrl,
-      MoneyList: [
-        {
+				MoneyList: [{
 						lable: "元",
 						value: 100,
 					},
@@ -539,7 +421,7 @@ export default {
 				RechargeSmsorderNoInfo: {}, //第三方合作交易标识
 			};
 		},
-  onLoad: function (options) {
+		onLoad: function(options) {
 			console.log(options);
 			// 初始化
 			userID = options["userID"] || "";
@@ -548,9 +430,9 @@ export default {
 			bankInfo.sessionid = sessionID || "";
 			this.beforeQuerySignStatus();
 		},
-  created: function () {},
-  mounted: function () {},
-  onShow: function () {
+		created: function() {},
+		mounted: function() {},
+		onShow: function() {
 			if (bankInfo.userId) {
 				this.queryBankInfo();
 			}
@@ -644,8 +526,7 @@ export default {
 				$(".doBtnTx").html("提现");
 				opeType = 1;
 				uni.navigateTo({
-        url:
-          "../Reflect/Reflect?" +
+					url: "../Reflect/Reflect?" +
 						OforS({
 							sessionID: sessionID,
 							userID: userID,
@@ -663,7 +544,7 @@ export default {
 				this_.MoneyIndex = -1;
 				this_.isOtherMoney = true;
 				let obj = e.detail;
-      this.$nextTick(function () {
+				this.$nextTick(function() {
 					obj.value = obj.value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
 					obj.value = obj.value.replace(/^\./g, ""); //验证第一个字符是数字而不是.
 					obj.value = obj.value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的.
@@ -692,7 +573,7 @@ export default {
 				if (str.lastIndexOf(".") == str.length - 1) {
 					this.inputOtherM = str.substring(0, str.length - 1);
 				}
-      this.$nextTick(function () {
+				this.$nextTick(function() {
 					document.scrollingElement.scrollTo(0, this.scrollTop);
 				});
 			},
@@ -729,7 +610,7 @@ export default {
 					headers: {
 						sessionid: sessionID,
 					},
-        success: function (respes) {
+					success: function(respes) {
 						loading.clear();
 						if (respes.code == "10000") {
 							console.log(respes, "respes");
@@ -737,8 +618,7 @@ export default {
 								// 1已签约
 								Dialog.alert({
 										title: "使用说明",
-                message:
-                  "您暂未进行银行代扣签约，将影响电子校园卡的正常使用，请尽快前往签约",
+										message: "您暂未进行银行代扣签约，将影响电子校园卡的正常使用，请尽快前往签约",
 										theme: "round-button",
 										confirmButtonText: "确认签约",
 										confirmButtonColor: "#2ddbb6",
@@ -759,7 +639,7 @@ export default {
 							throw new Error("代扣状态查询,请重试！");
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.clear();
 						Toast(err || "代扣状态查询,请重试！");
 						throw new Error("代扣状态查询,请重试！");
@@ -820,7 +700,7 @@ export default {
 					headers: {
 						sessionid: sessionID,
 					},
-        success: function (res5) {
+					success: function(res5) {
 						loading.clear();
 						if (res5.code == "10000") {
 							this_.IntervalFun();
@@ -834,7 +714,7 @@ export default {
 							});
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.clear();
 					},
 				});
@@ -925,7 +805,7 @@ export default {
 					headers: {
 						sessionid: sessionID,
 					},
-        success: function (res5) {
+					success: function(res5) {
 						uni.hideLoading();
 						if (res5.code == "10000") {
 							this_.close();
@@ -937,9 +817,9 @@ export default {
 							let accountNo = this_.bankInfo_.bindCardNo;
 							accountNo = accountNo.slice(accountNo.length - 4, accountNo.length);
 							let minutes_ =
-              thiTime.getMinutes().toString().length < 2
-                ? thiTime.getMinutes().toString().padStart(2, "0")
-                : thiTime.getMinutes().toString();
+								thiTime.getMinutes().toString().length < 2 ?
+								thiTime.getMinutes().toString().padStart(2, "0") :
+								thiTime.getMinutes().toString();
 							switch (bankInfo.accountType) {
 								case 3:
 									if (thiTime.getMinutes() + 20 >= 60) {
@@ -952,7 +832,7 @@ export default {
 										title: "充值申请已提交",
 										content: "银行处理需要1-20分钟时间，充值结果以余额查询为准。",
 										showCancel: false,
-                  success: function () {
+										success: function() {
 											uni.navigateTo({
 												url: `../../recharging/recharging?bankName=${
                         this_.bankInfo_.bindCardName
@@ -982,7 +862,7 @@ export default {
 							weui.topTips(res5.message);
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						uni.hideLoading();
 					},
 				});
@@ -1011,7 +891,7 @@ export default {
 					headers: {
 						sessionid: sessionID,
 					},
-        success: function (res5) {
+					success: function(res5) {
 						loading.clear();
 						if (res5.code == "10000") {
 							let appStatus = res5.results.appStatus;
@@ -1035,7 +915,7 @@ export default {
 							});
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.clear();
 					},
 				});
@@ -1047,9 +927,10 @@ export default {
 					title: "系统提示",
 					message: "复制成功！",
 				});
-      this.$nextTick(function () {
+				console.log(value, 'valuevaluevaluevaluevalue')
+				this.$nextTick(function() {
 					let clipboard = new ClipboardJS("#cardNumright", {
-          text: function () {
+						text: function() {
 							return value;
 						},
 					});
@@ -1072,7 +953,7 @@ export default {
 			},
 			//按钮操作
 			HideHTML(dom, type) {
-      this.$nextTick(function () {
+				this.$nextTick(function() {
 					if (type == 0) {
 						$("." + dom).css("display", "none");
 					} else {
@@ -1122,7 +1003,7 @@ export default {
 						bindMedium: item.bindCardNo,
 						bindMediumName: item.bindCardName,
 					},
-        success: function (res5) {
+					success: function(res5) {
 						loading.hide();
 						if (res5.code == "10000") {
 							this_.queryUserBankInfo();
@@ -1132,7 +1013,7 @@ export default {
 						}
 						this_.popshow = false;
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.hide();
 					},
 				});
@@ -1152,7 +1033,7 @@ export default {
 						sessionid: sessionID,
 						wechattype: 1,
 					},
-        success: function (res4) {
+					success: function(res4) {
 						loading.hide();
 						if (res4.code == "10000") {
 							this_.bindcardList = res4.results;
@@ -1161,7 +1042,7 @@ export default {
 							weui.topTips(res4.message);
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.hide();
 					},
 				});
@@ -1202,7 +1083,7 @@ export default {
 						sessionid: sessionID,
 						wechattype: 1,
 					},
-        success: function (res3) {
+					success: function(res3) {
 						// loading.hide();
 						if (res3.code == "10000") {
 							if (bankInfo.accountType == 4) {
@@ -1240,10 +1121,10 @@ export default {
 							weui.topTips(res3.message);
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						// loading.hide();
 					},
-        complete: function (XMLHttpRequest, status) {
+					complete: function(XMLHttpRequest, status) {
 						// loading.hide();
 						if (status == "timeout") {
 							weui.topTips("请求超时，余额查询失败");
@@ -1265,7 +1146,7 @@ export default {
 						sessionid: sessionID,
 						wechattype: 1,
 					},
-        success: function (res2) {
+					success: function(res2) {
 						if (res2.code == "10000") {
 							if (!res2.results) {
 								weui.topTips("获取用户银行信息失败!");
@@ -1282,7 +1163,7 @@ export default {
 							weui.topTips(res2.message);
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						// loading.hide();
 					},
 				});
@@ -1305,7 +1186,7 @@ export default {
 						sessionid: sessionID,
 						wechattype: 1,
 					},
-        success: function (res1) {
+					success: function(res1) {
 						loading.clear();
 						console.log(sessionID);
 						if (res1.code == "10000") {
@@ -1328,24 +1209,24 @@ export default {
 							}, 1500);
 						}
 					},
-        error: function (err) {
+					error: function(err) {
 						loading.clear();
 					},
 				});
 			},
 		},
-};
+	};
 </script>
 
 <style lang="scss">
-html,
-body,
-page {
+	html,
+	body,
+	page {
 		width: 750rpx;
 		background: linear-gradient(180deg, #ffffff 0%, #fafafa 100%);
-}
+	}
 
-.userInfoBox {
+	.userInfoBox {
 		display: flex;
 		flex-direction: column;
 		width: calc(100% - 64rpx);
@@ -1411,15 +1292,15 @@ page {
 			font-size: 26rpx;
 			color: rgba(0, 0, 0, 0.45);
 		}
-}
+	}
 
-.contentWrapper {
+	.contentWrapper {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
-}
+	}
 
-.balanceWrapper {
+	.balanceWrapper {
 		width: calc(100% - 144rpx);
 		margin: 0 32rpx;
 		margin-top: 24rpx;
@@ -1470,6 +1351,7 @@ page {
 			display: flex;
 			width: 100%;
 			justify-content: space-between;
+			margin-top: 20rpx;
 
 			view:first-child {
 				height: 60rpx;
@@ -1497,19 +1379,20 @@ page {
 				height: 60rpx;
 			}
 		}
-}
+	}
 
-.changPhone {
+	.changPhone {
 		font-size: 14px;
 		color: #39f;
 		text-align: right;
-}
-.accountlist {
+	}
+
+	.accountlist {
 		width: 100%;
 		height: 100%;
-}
+	}
 
-.showBindCardList {
+	.showBindCardList {
 		width: 100%;
 		height: 100%;
 
@@ -1519,7 +1402,7 @@ page {
 			height: 100rpx;
 			line-height: 100rpx;
 			padding: 0;
-    border-bottom: 1rpx solid #e6e6e6;
+			// border-bottom: 1rpx solid #e6e6e6;
 		}
 
 		.cardsList {
@@ -1547,18 +1430,18 @@ page {
 			line-height: 40rpx;
 			text-align: center;
 		}
-}
+	}
 
-.SubmittedSuccessfully {
+	.SubmittedSuccessfully {
 		width: 400rpx !important;
 		height: 200rpx !important;
 		margin: 0 auto !important;
 		background: #000000;
 		opacity: 0.8;
 		border-radius: 8rpx;
-}
+	}
 
-.cardNum {
+	.cardNum {
 		width: 574rpx;
 		margin: 0 auto;
 		display: flex;
@@ -1578,9 +1461,9 @@ page {
 			text-decoration: underline;
 			color: #ffffff;
 		}
-}
+	}
 
-.RechargeDetailed {
+	.RechargeDetailed {
 		text-align: center;
 		// width: 118rpx;
 		height: 32rpx;
@@ -1591,15 +1474,15 @@ page {
 		text-decoration: underline;
 		color: #36a8ff;
 		margin-top: 50rpx;
-}
+	}
 
-.contentBox {
+	.contentBox {
 		width: 670rpx;
 		height: 376rpx;
 		margin: 0 auto;
-}
+	}
 
-.contentDiv {
+	.contentDiv {
 		height: 100%;
 		// margin-top: 36rpx;
 		border-radius: 15rpx;
@@ -1609,16 +1492,16 @@ page {
 
 		position: relative;
 		top: 36rpx;
-}
+	}
 
-.HidenText {
+	.HidenText {
 		width: 574rpx;
 		margin: 0 auto;
 		padding-top: 88rpx;
-}
+	}
 
-.HidenText,
-.Balance {
+	.HidenText,
+	.Balance {
 		padding-left: 46rpx;
 		padding-right: 40rpx;
 		display: flex;
@@ -1626,9 +1509,9 @@ page {
 
 		font-size: 28rpx;
 		color: #ffffff;
-}
+	}
 
-.Balance {
+	.Balance {
 		width: 574rpx;
 		margin: 0 auto;
 		margin-top: 20rpx;
@@ -1637,33 +1520,20 @@ page {
 		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
-}
-
-.Recharge {
-  // height: 30rpx;
-  font-size: 32rpx;
-  font-family: PingFang SC;
-  font-weight: bold;
-  color: #333333;
-  margin-top: 58rpx;
-
-  span:nth-child(1) {
-    width: 4rpx;
-    height: 30rpx;
-    background: #23d6a3;
-    border-radius: 2rpx;
-    display: inline-block;
-    position: relative;
-    top: 5rpx;
 	}
 
-  span:nth-child(2) {
-    display: inline-block;
-    margin-left: 16rpx;
+	.Recharge {
+		width: 100%;
+		height: 40rpx;
+		margin-top: 40rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: rgba(0, 0, 0, 0.4);
+		line-height: 40rpx;
 	}
-}
 
-.headview {
+	.headview {
 		display: flex;
 		justify-content: space-between;
 		// padding-left: 40rpx;
@@ -1672,9 +1542,9 @@ page {
 		padding-top: 36rpx;
 		width: 574rpx;
 		margin: 0 auto;
-}
+	}
 
-.headview .schoolname {
+	.headview .schoolname {
 		// width: 252rpx;
 		height: 50rpx;
 		font-size: 36rpx;
@@ -1682,9 +1552,9 @@ page {
 		font-weight: 500;
 		color: #ffffff;
 		line-height: 50rpx;
-}
+	}
 
-.headview .IconCls {
+	.headview .IconCls {
 		width: 170rpx;
 		height: 48rpx;
 		background: #20946d;
@@ -1695,9 +1565,9 @@ page {
 		color: #ffffff;
 		line-height: 48rpx;
 		text-align: center;
-}
+	}
 
-.moneyWrapper {
+	.moneyWrapper {
 		margin-top: 10rpx;
 		width: 100%;
 		display: flex;
@@ -1710,10 +1580,10 @@ page {
 			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;
@@ -1748,7 +1618,7 @@ page {
 			text-align: center;
 			background: #f8f8f8;
 			border-radius: 12rpx;
-
+			border: 3rpx solid transparent;
 			/deep/.uni-input-wrapper {
 				position: absolute;
 				width: 444rpx;
@@ -1763,23 +1633,23 @@ page {
 				line-height: 120rpx;
 			}
 		}
-}
+	}
 
-.MoneyBox {
+	.MoneyBox {
 		flex-wrap: wrap;
 		height: auto;
 		color: #888888;
 		width: 686rpx;
 		margin: 0 auto;
 		overflow: hidden;
-}
+	}
 
-.choiceClass {
+	.choiceClass {
 		background: rgba(39, 266, 148, 0.1) !important;
 		color: #28d79c;
-}
+	}
 
-.MoneyBox view {
+	.MoneyBox view {
 		width: 220rpx;
 		height: 120rpx;
 		background: #ffffff;
@@ -1791,17 +1661,17 @@ page {
 		box-shadow: 0px 9rpx 23rpx 0rpx rgba(25, 26, 88, 0.07);
 		margin-right: 2px;
 		float: left;
-}
+	}
 
-.depotMoney .value {
+	.depotMoney .value {
 		font-size: 45rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;
 		font-weight: 600;
 		line-height: 120rpx;
 		text-align: center;
-}
+	}
 
-.depotMoney .tips {
+	.depotMoney .tips {
 		// width: 79rpx;
 		// height: 33rpx;
 		// background: linear-gradient(180deg, #FA6400 0%, #FD9D00 100%);
@@ -1814,9 +1684,9 @@ page {
 		// position: absolute;
 		// right: 0rpx;
 		// line-height: 33rpx;
-}
+	}
 
-.OtherMoney {
+	.OtherMoney {
 		display: flex;
 		justify-content: flex-start;
 		// color: #999999;
@@ -1845,9 +1715,9 @@ page {
 		input {
 			height: 100%;
 		}
-}
+	}
 
-.OtherMoney view:nth-child(2) {
+	.OtherMoney view:nth-child(2) {
 		// width: 30rpx;
 		// height: 30rpx;
 		// background: #F0F0F0;
@@ -1856,9 +1726,9 @@ page {
 		// line-height: 30rpx;
 		// margin-top: 7rpx;
 		// margin-left: 5rpx;
-}
+	}
 
-.paytype {
+	.paytype {
 		display: flex;
 		margin-top: 39rpx;
 		width: 100%;
@@ -1879,16 +1749,16 @@ page {
 				color: #161616;
 			}
 		}
-}
+	}
 
-.payType {
+	.payType {
 		height: 98rpx;
 		line-height: 98rpx;
 		display: flex;
 		justify-content: space-between;
-}
+	}
 
-.payType view:nth-child(1) {
+	.payType view:nth-child(1) {
 		// width: 120rpx;
 		height: 42rpx;
 		font-size: 32rpx;
@@ -1896,9 +1766,9 @@ page {
 		font-weight: 500;
 		color: #888888;
 		line-height: 98rpx;
-}
+	}
 
-.payType view::nth-child(2) {
+	.payType view::nth-child(2) {
 		width: 225rpx;
 		height: 45rpx;
 		font-size: 32rpx;
@@ -1906,9 +1776,9 @@ page {
 		font-weight: bold;
 		color: #333333;
 		line-height: 45rpx;
-}
+	}
 
-.arrow {
+	.arrow {
 		transform: rotate(-45deg);
 		top: -3rpx;
 		border: solid #999999;
@@ -1916,19 +1786,19 @@ page {
 		display: inline-block;
 		padding: 8rpx;
 		position: relative;
-}
+	}
 
-// @media (min-height: 650px) {
-@media (min-height: 1040px) {
+	// @media (min-height: 650px) {
+	@media (min-height: 1040px) {
 		.bottomdiv {
 			position: fixed;
 			left: 0;
 			right: 0;
 			bottom: 30rpx;
 		}
-}
+	}
 
-.DepositID {
+	.DepositID {
 		width: 100%;
 		height: 90rpx;
 		background: #04b871;
@@ -1941,18 +1811,18 @@ page {
 		margin: 0 auto;
 		margin-top: 29rpx;
 		text-align: center;
-}
+	}
 
-.DepositID span {
+	.DepositID span {
 		height: 50rpx;
 		font-size: 36rpx;
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
 		line-height: 92rpx;
-}
+	}
 
-.service {
+	.service {
 		margin-top: 118rpx;
 		width: 100%;
 		height: 40rpx;
@@ -1961,9 +1831,9 @@ page {
 		color: rgba(0, 0, 0, 0.5);
 		line-height: 40rpx;
 		text-align: center;
-}
+	}
 
-.switchbankCard {
+	.switchbankCard {
 		text-align: center;
 		/* width: 205px; */
 		// height: 28rpx;
@@ -1973,9 +1843,9 @@ page {
 		text-decoration: underline;
 		color: #268ef8;
 		margin-top: 23rpx;
-}
+	}
 
-.RechargeConfirmationBox {
+	.RechargeConfirmationBox {
 		position: fixed;
 		left: 0;
 		right: 0;
@@ -2070,9 +1940,9 @@ page {
 				}
 			}
 		}
-}
+	}
 
-.closePhoneBox {
+	.closePhoneBox {
 		// width: 35rpx;
 		height: 35rpx;
 		position: relative;
@@ -2086,9 +1956,9 @@ page {
 			position: relative;
 			right: 10rpx;
 		}
-}
+	}
 
-.doBtnTx {
+	.doBtnTx {
 		width: 506rpx;
 		height: 92rpx;
 		background: #04ba73;
@@ -2100,46 +1970,46 @@ page {
 		right: 0;
 		margin: 0 auto;
 		bottom: 38rpx;
-}
+	}
 
-.PhoneNum,
-.VerifyCode {
+	.PhoneNum,
+	.VerifyCode {
 		width: 506rpx;
 		height: 80rpx;
 		line-height: 60rpx;
 		background: #f7f6fb;
 		margin: 0 auto;
 		margin-top: 20rpx;
-}
+	}
 
-.VerifyCode {
+	.VerifyCode {
 		display: flex;
 		justify-content: space-between;
-}
+	}
 
-.VerifyCode input {
+	.VerifyCode input {
 		width: 200rpx;
-}
+	}
 
-.CodeMsg {
+	.CodeMsg {
 		color: #01bc73;
 		background: #f7f6fb;
 		font-size: 32rpx;
 		font-weight: 600;
 		line-height: 80rpx;
 		letter-spacing: 3rpx;
-}
+	}
 
-.placeholderInput {
+	.placeholderInput {
 		color: #aaaaaa;
 		font-size: 42rpx;
 		font-weight: 500;
 		letter-spacing: 3rpx;
 		// padding-left: 50rpx;
 		height: 80rpx;
-}
+	}
 
-.OtherTitle {
+	.OtherTitle {
 		height: 67rpx;
 		font-size: 48rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;
@@ -2148,55 +2018,55 @@ page {
 		line-height: 67rpx;
 
 		padding-top: 60rpx;
-}
+	}
 
-.inputOtherM {
+	.inputOtherM {
 		display: flex;
 		height: 100rpx;
 		margin-top: 40rpx;
-}
+	}
 
-.inputOtherM input {
+	.inputOtherM input {
 		border: none;
 		outline: none;
 		height: 50rpx;
 		padding-left: 16rpx;
 		font-size: 72rpx;
 		font-weight: 600;
-}
+	}
 
-.inputOtherM span:nth-child(1) {
+	.inputOtherM span:nth-child(1) {
 		width: 72rpx;
 		font-size: 80rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;
 		font-weight: 600;
 		color: #010101;
 		line-height: 100rpx;
-}
+	}
 
-.OtherLine {
+	.OtherLine {
 		width: 631rpx;
 		height: 1rpx;
 		background-color: #cccccc;
 		margin-top: 19rpx;
-}
+	}
 
-.depositbox {
+	.depositbox {
 		margin-top: 31rpx;
 		height: 30rpx;
 		line-height: 30rpx;
-}
+	}
 
-.depositImg {
+	.depositImg {
 		width: 24rpx;
 		height: 24rpx;
 		vertical-align: middle;
 		margin-right: 8rpx;
 		position: relative;
 		top: -2rpx;
-}
+	}
 
-.Recharge_ {
+	.Recharge_ {
 		height: 40rpx;
 		font-size: 28rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
@@ -2204,16 +2074,16 @@ page {
 		color: #333333;
 		line-height: 40rpx;
 		margin-top: 40rpx;
-}
+	}
 
-.Recharge_ span:nth-child(2) {
+	.Recharge_ span:nth-child(2) {
 		font-size: 28rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;
 		font-weight: 600;
 		color: #fa6400;
-}
+	}
 
-.placeholderinputOtherM {
+	.placeholderinputOtherM {
 		height: 50rpx;
 		// font-family: PingFangSC-Semibold, PingFang SC;
 		// font-weight: 600;
@@ -2224,14 +2094,14 @@ page {
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #888888;
-}
+	}
 
-// 异常处理
-.RechargeException {
+	// 异常处理
+	.RechargeException {
 		padding-top: 20rpx;
-}
+	}
 
-.weui-label {
+	.weui-label {
 		// width: 118rpx;
 		height: 42rpx;
 		font-size: 30rpx;
@@ -2241,9 +2111,9 @@ page {
 		line-height: 42rpx;
 		font-weight: bold;
 		margin-left: 30rpx;
-}
+	}
 
-.tiptext {
+	.tiptext {
 		height: 1.06rem;
 		font-size: 0.75rem;
 		font-family: PingFangSC-Regular, PingFang SC;
@@ -2252,9 +2122,9 @@ page {
 		line-height: 1.06rem;
 		margin-bottom: 0.625rem;
 		text-align: center;
-}
+	}
 
-.bottomDetail {
+	.bottomDetail {
 		width: 628rpx;
 		height: 88rpx;
 		color: white;
@@ -2267,37 +2137,37 @@ page {
 		line-height: 88rpx;
 
 		margin-top: 84rpx;
-}
+	}
 
-.RechargeException input::placeholder {
+	.RechargeException input::placeholder {
 		color: #a1a4a8;
-}
+	}
 
-.RechargeException .weui-cell {
+	.RechargeException .weui-cell {
 		height: 4rem;
 		padding: 0 !important;
-}
+	}
 
-.idCardPhoto1,
-.idCardPhoto2 {
+	.idCardPhoto1,
+	.idCardPhoto2 {
 		width: 388rpx;
 		height: 224rpx;
 		margin: 0 auto;
 		margin-top: 20rpx;
-}
+	}
 
-.idCardPhoto1 image,
-.idCardPhoto2 image {
+	.idCardPhoto1 image,
+	.idCardPhoto2 image {
 		width: 100%;
 		height: 100%;
 		position: relative;
-}
+	}
 
-.weui-toptips_success {
+	.weui-toptips_success {
 		background-color: #03bc73 !important;
-}
+	}
 
-.positionCam {
+	.positionCam {
 		height: 32rpx;
 		font-size: 22rpx;
 		font-family: PingFang-SC-Medium, PingFang-SC;
@@ -2307,9 +2177,9 @@ page {
 		text-align: center;
 		position: relative;
 		top: -29px;
-}
+	}
 
-.BgCoverBox {
+	.BgCoverBox {
 		width: 100vw;
 		height: 100vh;
 		position: fixed;
@@ -2318,22 +2188,22 @@ page {
 		z-index: 10;
 		background: #000000;
 		opacity: 0.5;
-}
+	}
 
-.hideListCover {
+	.hideListCover {
 		max-height: 50vh;
 		overflow-y: auto;
 		padding: 0;
-}
+	}
 
-.bottomDiv {
+	.bottomDiv {
 		font-weight: bold;
 		height: 50px;
 		line-height: 50px;
 		border-bottom: 1px solid #e6e6e6;
-}
+	}
 
-/deep/ .signAlert {
+	/deep/ .signAlert {
 		/deep/ .van-dialog__message {
 			line-height: 60rpx;
 		}
@@ -2343,11 +2213,11 @@ page {
 			flex: none !important;
 			margin: 0 auto;
 		}
-}
+	}
 
-/deep/ uni-input.otherMoneyInput {
+	/deep/ uni-input.otherMoneyInput {
 		height: 120rpx;
 		line-height: 120rpx;
 		font-weight: 600;
-}
+	}
 </style>

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,8 +1139,10 @@
 								const lunchTxt = item.lunchStatus ? '' : '中';
 								const supperTxt = item.supperStatus ? '' : '晚';
 								day.topInfo = breakfastTxt + lunchTxt + supperTxt;
+								if(day.topInfo){
 									day.className = 'notice-day'
 								}
+							}
 						})
 					}
 				} else if (this.tabIndex == 2) { // 出入校报告
@@ -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);