Merge branch 'develop' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into develop

src/pages/BankModule/Recharge/Recharge.vue

@@ -264,7 +264,7 @@
           <!-- <view class="switchbankCard" @click="ChangeBankPay">我要换银行卡支付</view> -->
         </view>
       </template>
-      <template v-else>
+      <template  v-else-if="paySwitch==1">
         <view class="rechageWallet" @click="turnRechargeWallet"
           >充值校园钱包 >></view
         >
@@ -458,12 +458,14 @@ var gHost = "https://" + window.location.host;
 if (window.location.protocol != "https:") {
   gHost = "https://fpdev.xiaopay.net";
   // gHost = "/api";
+  // gHost = ""
 }
 let times = 0;
 var limitClick = false; //禁止重复点击
 var sessionID = "",
   userID = "",
-  rechargeLimit = "";
+  rechargeLimit = "",
+  paySwitch = "";
 var payCardNumber = ""; //一类卡号
 var orderSerialNo = ""; //提现结果查询 指令号
 var businessNo = "",
@@ -550,6 +552,7 @@ export default {
         usertype: "1",
       },
       rechargeLimit: "",
+	  paySwitch: "",
       bankInfo_: {
         accountNo: "**** **** **** 1234",
         bindCardName: "",
@@ -1539,6 +1542,9 @@ export default {
           console.log(res);
           if (res.code == "10000" && res.results) {
             self.rechargeLimit = res.results.rechargeLimit || "";
+			if(self.rechargeLimit == 1){
+				self.queryWalletRechargeLimit()
+			}
           } else {
             self.rechargeLimit = "";
           }
@@ -1548,6 +1554,34 @@ export default {
         },
       });
     },
+	// 查询钱包充值限制开关
+	queryWalletRechargeLimit() {
+	  const self = this;
+	  $.ajax({
+	    url: gHost + `/wechat/svweapp/QuerySchoolBasicInfo`,
+	    type: "post",
+	    data: {
+	      schoolid: bankInfo.schoolId,
+	      sessionid: sessionID,
+	      wechattype: 1
+	    },
+	    headers: {
+	      sessionid: sessionID,
+	      contentType: "application/x-www-form-urlencoded",
+	    },
+	    success: function (res) {
+	      console.log(res);
+	      if (res.code == "10000" && res.results) {
+	        self.paySwitch = res.results.paySwitch || "";
+	      } else {
+	        self.paySwitch = "";
+	      }
+	    },
+	    error: function (err) {
+	      weui.topTips("查询钱包充值限制失败!");
+	    },
+	  });
+	},
     //获取用户已填写银行信息
     queryUserBankInfo() {
       let this_ = this;

src/pages/IcbcModule/Recharge/Recharge.vue

@@ -239,7 +239,7 @@
           >
         </view>
       </template>
-      <template v-else>
+      <template v-else-if="paySwitch==1">
         <view class="rechageWallet" @click="turnRechargeWallet"
           >充值校园钱包 >></view
         >
@@ -346,12 +346,14 @@ var gHost = "https://" + window.location.host;
 if (window.location.protocol != "https:") {
   gHost = "https://fpdev.xiaopay.net";
   // gHost = "/api";
+  // gHost=""
 }
 let times = 0;
 var limitClick = false; //禁止重复点击
 var sessionID = "",
   userID = "",
-  rechargeLimit = "";
+  rechargeLimit = "",
+  paySwitch = "";
 var payCardNumber = ""; //一类卡号
 var orderSerialNo = ""; //提现结果查询 指令号
 var businessNo = "",
@@ -428,6 +430,7 @@ export default {
         usertype: "1",
       },
       rechargeLimit: "",
+	  paySwitch: "",
       bankInfo_: {
         accountNo: "**** **** **** 1234",
         bindCardName: "",
@@ -954,6 +957,10 @@ export default {
           console.log(res);
           if (res.code == "10000" && res.results) {
             self.rechargeLimit = res.results.rechargeLimit || "";
+			console.log(self.rechargeLimit, 'rechargeLimit')
+			if(self.rechargeLimit == '1'){
+				self.queryWalletRechargeLimit(); // 查询钱包充值限制
+			}
           } else {
             self.rechargeLimit = "";
           }
@@ -963,6 +970,34 @@ export default {
         },
       });
     },
+	// 查询钱包充值限制开关
+	queryWalletRechargeLimit() {
+	  const self = this;
+	  $.ajax({
+	    url: gHost + `/wechat/svweapp/QuerySchoolBasicInfo`,
+	    type: "post",
+	    data: {
+	      schoolid: bankInfo.schoolId,
+	      sessionid: sessionID,
+	      wechattype: 1
+	    },
+	    headers: {
+	      sessionid: sessionID,
+	      contentType: "application/x-www-form-urlencoded",
+	    },
+	    success: function (res) {
+	      console.log(res);
+	      if (res.code == "10000" && res.results) {
+	        self.paySwitch = res.results.paySwitch || "";
+	      } else {
+	        self.paySwitch = "";
+	      }
+	    },
+	    error: function (err) {
+	      weui.topTips("查询钱包充值限制失败!");
+	    },
+	  });
+	},
     //获取用户已填写银行信息
     queryUserBankInfo() {
       let this_ = this;