换位置

src/pages/login/index.vue

@@ -923,6 +923,24 @@ export default {
         .then(res => {
           wx.hideLoading();
           if (res.data.code == 200) {
+            let login = () => {
+              _this.sessionId = res.data.data.sessionId || '';
+              _this.backParams += `&sessionid=${
+                res.data.data.sessionId
+              }&needCertified=${res.data.data.NEED_CERTIFIED}`;
+              _this.NEED_CERTIFIED = res.data.data.NEED_CERTIFIED;
+              console.log(_this.mpApp.globalData.shopInfo,"------------------_this.mpApp.globalData.shopInfo")
+              if(_this.whetherOpenEnterprisesWantGoods == 1 && res.data.data.masterAccount && res.data.data.masterAccount.length>0){
+                _this.selectEnterpriseAccountOpenType = 0;
+                _this.$refs.SelectEnterpriseAccount.open(res.data.data.masterAccount);
+              } else {
+                wx.setStorage({
+                  key: "sessionid",
+                  data: res.data.data.sessionId
+                });
+                _this.pushPageType();
+              }
+            }
             if (res.data.data.isCommonlyUsedLocationLogin == 'false') {
               wx.showModal({
                 content: `当前账号处于非常用地`,
@@ -944,24 +962,6 @@ export default {
             } else {
               login();
             }
-            let login = () => {
-              _this.sessionId = res.data.data.sessionId || '';
-              _this.backParams += `&sessionid=${
-                res.data.data.sessionId
-              }&needCertified=${res.data.data.NEED_CERTIFIED}`;
-              _this.NEED_CERTIFIED = res.data.data.NEED_CERTIFIED;
-              console.log(_this.mpApp.globalData.shopInfo,"------------------_this.mpApp.globalData.shopInfo")
-              if(_this.whetherOpenEnterprisesWantGoods == 1 && res.data.data.masterAccount && res.data.data.masterAccount.length>0){
-                _this.selectEnterpriseAccountOpenType = 0;
-                _this.$refs.SelectEnterpriseAccount.open(res.data.data.masterAccount);
-              } else {
-                wx.setStorage({
-                  key: "sessionid",
-                  data: res.data.data.sessionId
-                });
-                _this.pushPageType();
-              }
-            }
           } else {
             wx.showToast({title: res.data.msg, icon: "none"})
           }