feats

src/router/index.js

@@ -32,28 +32,26 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
-
   const [person, setPerson] = useModel('person')
 
   // 未登录
   if (!person.personId) {
-    try {
-      getUserInfo().then(userinfo => {
-        login(userinfo).then(res => {
-          const { user, token } = res;
-          setPerson(user)
-          setToken(token)
-        })
+    getUserInfo().then(userinfo => {
+      login(userinfo).then(res => {
+        const { user, token } = res;
+        setPerson(user)
+        setToken(token)
+
+        next()
       }).catch(() => {
         return redirect(true)
       })
-    } catch (error) {
+    }).catch(() => {
       return redirect(true)
-    }
+    })
+  } else {
+    next()
   }
-
-  // 未登录的正常进行页面加载, 不需要进行页面控制
-  next()
 })
 
 export default router;