登录逻辑修改

src/pages/login/index.vue

@@ -10,7 +10,7 @@
       <!-- <div>{{testd}}</div>
       <div>{{test_sessionId}}</div>--sessionId
       <div>{{unionId}}</div>--unionId
-      <div>{{test_isHaveUnion}}</div>--isHaveUnion -->
+      <div>{{test_isHaveUnion}}</div>--isHaveUnion-->
       <!-- <div class="enterpriseLogin" @click="eLogin">账号登录</div> -->
     </div>
     <div class="toCLogin1" v-if="isShowPhone">
@@ -74,39 +74,70 @@ export default {
       this.backParams = serialize(options.params);
     }
     this.getshop();
-    this.init();
   },
   methods: {
     getshop() {
+      this.shopName = wx.getStorageSync("shopName");
+      this.logoUrl = wx.getStorageSync("logoUrl");
+      if (!(this.shopName && this.logoUrl)) {
         shop.getShopInfo().then(res => {
           if (res.data.code == 200) {
             this.shopName = res.data.data.shopName;
             this.logoUrl = process.env.IMG_DOMAIN + res.data.data.logoUrl;
-        } else {
+
+            wx.setStorage({
+              key: "shopName",
+              data: res.data.data.shopName
+            });
+            wx.setStorage({
+              key: "logoUrl",
+              data: process.env.IMG_DOMAIN + res.data.data.logoUrl
+            });
           }
         });
+      }
     },
     init() {
+      return new Promise((resolve, reject) => {
         wx.login({
           success: res => {
             if (res.code) {
               login
                 .miniLogin({ code: res.code })
                 .then(res => {
-                // wx.showToast({ title: res.data.code, icon: "none" });
                   if (res.data.code == 200) {
-                  this.testd = JSON.stringify(res.data);
-                  this.test_isHaveUnion = res.data.data.isHaveUnion;
-                  console.log("login---", res.data);
-
+                    resolve(res);
+                  } else {
+                    reject(res.data.msg);
+                  }
+                })
+                .catch(err => {
+                  reject(err);
+                });
+            }
+          },
+          fail: err => {
+            reject(err);
+          }
+        });
+      });
+    },
+    getUserInfo: function(e) {
+      wx.showLoading({
+        title: "加载中"
+      });
+      if (e.target.errMsg == "getUserInfo:ok") {
+        this.init()
+          .then(res => {
+            console.log("promise", res);
+            wx.hideLoading();
+            //存入openid
             wx.setStorage({
               key: "openid",
               data: res.data.data.openid
             });
-
             if (res.data.data.isHaveUnion == "true") {
               //有账号
-
               this.backParams += `&sessionid=${
                 res.data.data.sessionId
               }&needCertified=${res.data.data.NEED_CERTIFIED}`;
@@ -126,24 +157,20 @@ export default {
             this.openid = res.data.data.openid;
             this.isShow = true;
 
-                  this.test_sessionId = wx.getStorageSync("sessionid");
-                } else {
-                  wx.showToast({ title: res.data.msg, icon: "none" });
-                }
+            //checkLogin
+            this.checkLogin();
           })
           .catch(err => {
+            console.log("err", err);
+            wx.hideLoading();
             wx.showToast({ title: err, icon: "none" });
           });
+      } else {
+        wx.hideLoading();
+        wx.showToast({ title: "获取用户信息失败", icon: "none" });
       }
-        }
-      });
     },
-    getUserInfo: function(e) {
-      wx.showLoading({
-        title: "加载中"
-      });
-      if (e.target.errMsg == "getUserInfo:ok" && this.isShow) {
-        wx.hideLoading();
+    checkLogin() {
       if (this.isHaveUnion) {
         //是会员 直接登录
         wx.reLaunch({
@@ -162,7 +189,6 @@ export default {
         this.userInfo = JSON.parse(e.target.rawData);
         console.log(this.userInfo, "this.userInfo");
 
-          // return
         if (this.unionId) {
           login
             .checkUnionid({ unionId: this.unionId, openId: this.openid })
@@ -196,9 +222,6 @@ export default {
           this.isShowPhone = true;
         }
       }
-      } else {
-        wx.hideLoading();
-      }
     },
     getPhoneNumber(e) {
       wx.checkSession({