Merge remote-tracking branch 'origin/V1.6.8_feature' into develop

src/pages/BankModule/Recharge/Recharge.vue

@@ -418,12 +418,7 @@ export default {
     sessionID = options["seesionID"] || "";
     fromType = options["fromType"] || "";
     bankInfo.sessionid = sessionID || "";
-    accountType = options["accountType"] || "";
-    if (accountType == "BOHAI") {
-      // 渤海银行要判断是否有代扣签约
-      this.signStatusQuery();
-    }
-    this.QueryUserInfo();
+    this.beforeQuerySignStatus();
   },
   created: function () {},
   mounted: function () {},
@@ -433,6 +428,13 @@ export default {
     }
   },
   methods: {
+    async beforeQuerySignStatus() {
+      await this.QueryUserInfo();
+      // 渤海银行要判断是否有代扣签约
+      if (bankInfo.accountType == "4") {
+        await this.signStatusQuery();
+      }
+    },
     // 更换银行卡
     async ChangeBankPay() {
       // uni.showModal({
@@ -1127,7 +1129,7 @@ export default {
       });
     },
     //查询用户信息
-    QueryUserInfo() {
+    async QueryUserInfo() {
       let this_ = this;
       let loading = Toast.loading({
         message: "加载中...",
@@ -1135,7 +1137,7 @@ export default {
         loadingType: "spinner",
         duration: 0,
       });
-      $.ajax({
+      await $.ajax({
         url: gHost + "/wechat/svweapp/QueryPersonalInfo",
         type: "POST",
         contentType: "application/x-www-form-urlencoded",
@@ -1146,9 +1148,11 @@ export default {
         },
         success: function (res1) {
           loading.clear();
+          console.log(sessionID);
           if (res1.code == "10000") {
             bankInfo.schoolId = res1.results.schoolid;
             bankInfo.userId = res1.results.id;
+            bankInfo.accountType = res.results.accounttype;
             this_.PersonalInfo = res1.results;
             if (res1.results.usertype == 1) {
               $(".StudentCls").css("display", "block");