Merge branch 'bohai_cert_update' into uat

src/pages/BankModule/Recharge/Recharge.vue

@@ -179,7 +179,7 @@
 					v-bind:style="Money != '' ? '' : 'background: #e6e6e6 !important;'">
 					<span>充值生活费</span>
 				</view>
-				<view class="service">{{bankInfo_.accountName}}Ⅲ类户为您提供服务</view>
+				<view class="service">{{bankInfo_.accountName}}{{typeCode != 'BOHAI' ? 'Ⅲ' :'Ⅱ'}}类户为您提供服务</view>
 				<!--  -->
 				<!-- <view class="switchbankCard" @click="ChangeBankPay">我要换银行卡支付</view> -->
 			</view>
@@ -367,7 +367,11 @@
 					text: "账户明细"
 				}, {
 					text: "常见问题"
-				}, {
+				}, 
+				 {
+					text: "证件更新"
+				},
+				{
 					text: "在线销户"
 				}],
 				popshow: false,
@@ -474,6 +478,10 @@
 					jWeixin.miniProgram.redirectTo({
 						url: `/pages/AssignCancelUserPhone/main`
 					});
+				} else if (action.text == "证件更新") {
+					jWeixin.miniProgram.redirectTo({
+						url: `/pages_subpackB/pages/certificateBohaiUpdate/main`
+					});
 				}
 			},
 			async beforeQuerySignStatus() {

src/pages/SchoolReport/SchoolReport.vue

@@ -1363,7 +1363,7 @@
 						}
 					});
 					this.queryConsumerSummaryAmount();
-					this.$nextTick(() => {
+					this.queryIsDredgeMember(1002).then(() => {
 						if (this.isOpen) {
 							this.queryConsumerSummaryAmount(1).then(e => this.piechart());
 							this.queryDayConsumerTrend(1).then(e => this.linechart(this

src/pages/StudentPayment/PayOrderDetails/PayOrderDetails.vue

@@ -107,6 +107,7 @@
 				</view>
 			</view>
 		</view>
+		<view class="masking" v-if="mask"></view>
 	</view>
 </template>
 
@@ -151,7 +152,8 @@
 				remarks: "",
 				remarksType: ["备注", "邮箱", "手机号码", "身份证"],
 				// 费用id
-				chargeItemIds: []
+				chargeItemIds: [],
+				mask: false
 			}
 		},
 		onLoad: function(options) {
@@ -335,6 +337,24 @@
 					})
 				}
 			},
+			// 倒计时5秒
+			culDown() {
+				const self = this;
+				let second = 5;
+				const timer = setInterval(() => {
+				  second--;
+				  if (second) {
+					self.mask = true;
+					uni.showLoading({
+						title: '加载中'
+					});
+				  } else {
+				    clearInterval(timer);
+				    uni.hideLoading();
+					self.mask = false;
+				  }
+				}, 1000);
+			},
 			// 点击缴费下单接口
 			async clickPay() {
 				try {
@@ -358,6 +378,7 @@
 							return
 						}
 					}
+					this.culDown();
 					let data = await this.$http.post({
 						url: orderApi + '/order-charge/app/charge/project/createOrder'
 					}, {
@@ -375,6 +396,7 @@
 						schoolId: this.allData.schoolId,
 						userId: this.allData.userId
 					})
+					
 					if (data.code != 200) {
 						uni.showToast({
 							icon: "none",
@@ -389,6 +411,8 @@
 				} catch (e) {
 					//TODO handle the exception
 					console.log(e);
+					this.mask = false;
+					uni.hideLoading()
 					uni.showToast({
 						icon: "none",
 						mask: true,
@@ -418,6 +442,8 @@
 					});
 				} catch (e) {
 					//TODO handle the exception
+					this.mask = false;
+					uni.hideLoading();
 					console.log(e);
 					uni.showToast({
 						icon: "none",
@@ -465,7 +491,15 @@
 	page {
 		background: #F3F5F6;
 	}
-
+	.masking {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0,0,0,0.4);
+		z-index: 10;
+	}
 	.PaymentRsults {
 		width: 580rpx;
 		height: 480rpx;

src/pages/assignDeposit/assignDeposit.vue

@@ -1066,7 +1066,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: {