efats

src/router/index.js

@@ -37,20 +37,19 @@ router.beforeEach((to, from, next) => {
 
   // 未登录
   if (!person.personId) {
-    getUserInfo().then(userinfo => {
-      if (!userinfo || !userinfo.openid) {
-        redirect(true)
-        return
-      }
-
-      login(userinfo).then(res => {
-        const { user, token } = res;
-        setPerson(user)
-        setToken(token)
+    try {
+      getUserInfo().then(userinfo => {
+        login(userinfo).then(res => {
+          const { user, token } = res;
+          setPerson(user)
+          setToken(token)
+        })
+      }).catch(() => {
+        return redirect(true)
       })
-    }).catch(() => {
-      redirect(true)
-    })
+    } catch (error) {
+      return redirect(true)
+    }
   }
 
   // 未登录的正常进行页面加载, 不需要进行页面控制

src/utils/wx.js

@@ -73,7 +73,7 @@ export function redirect (force) {
   const queryCode = getCode();
   localStorage.setItem('wxcode', queryCode)
 
-  if (!queryCode || queryCode === originCode || force) {
+  if (force || !queryCode || queryCode === originCode) {
     const local = encodeURIComponent(location.origin + location.pathname)
     const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
     window.location.href = url