bug fixes

src/pages/login/login.vue

@@ -62,7 +62,7 @@ export default {
       return query.redirect_uri ? decodeURIComponent(query.redirect_uri) : ''
     },
     showPage() {
-      return this.isWechat ? this.checkWechatLogin() : true
+      return this.isWechat ? !!Cookies.get('wechat_login_no_phone_error') : true
     }
   },
   methods: {
@@ -134,6 +134,11 @@ export default {
       const wechatUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(
         redirectURI
       )}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+      // 移除cookie
+      Cookies.remove('wechat_login_error', { domain: '.ezijing.com' })
+      Cookies.remove('wechat_login_no_phone_error', {
+        domain: '.ezijing.com'
+      })
       // 打开地址
       window.location.href = wechatUrl
     },
@@ -144,14 +149,18 @@ export default {
       )
     }
   },
-  created() {
-    console.log(process.env, webConf)
+  beforeMount() {
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
         this.loginSuccess({ code: 0, data: { TGC: Cookies.get('TGC') } }, 1)
       } else {
-        if (this.isWechat && !this.checkWechatLogin()) {
-          this.wechatLogin()
+        if (this.isWechat) {
+          if (Cookies.get('wechat_login_error')) {
+            Cookies.remove('wechat_login_error', { domain: '.ezijing.com' })
+            wx.miniProgram.navigateBack({ delta: 2 })
+          } else {
+            this.wechatLogin()
+          }
         }
       }
     })