login

src/router/permission.ts

@@ -8,17 +8,18 @@ export function setupPageGuard(router: Router) {
         const { isMobile } = useBasicLayout()
         const userStore = useUserStore()
         const userMemberStore = useUserMemberStore()
-        if (to.meta.public) {
-            next()
-            return
-        }
-        if (!userStore.userInfo.id && to.name !== 'login') {
+        if (!userStore.userInfo.id) {
             try {
                 await userStore.fetch()
-                next()
             } catch (error) {
-                next({ name: isMobile ? 'home' : 'login', query: { login: 'true' } })
+                /* empty */
             }
+        }
+        if (to.meta.public) {
+            next()
+            return
+        } else if (!userStore.userInfo.id && to.name !== 'login') {
+            next({ name: isMobile ? 'home' : 'login', query: { login: 'true' } })
         } else if (!userMemberStore.userMember.planId) {
             try {
                 await userMemberStore.fetchMember()