diff --git a/src/App.vue b/src/App.vue index 3910c3d..4a1beca 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,18 +38,20 @@ onMounted(() => { if (state && state.indexOf('token') !== -1) { const token = state.split('token_')[1]; - ab98UserStore.setTokenLogin(token); + if (token) { + ab98UserStore.setTokenLogin(token); - tokenLogin(token).then(res => { - if (res && res.code == 0) { - if (res.data.success) { - ab98UserStore.setTel(res.data.tel) - ab98UserStore.setUserInfo(res.data) - ab98UserStore.setIsLogin(true) - router.push('/') - } - } - }) + tokenLogin(token).then(res => { + if (res && res.code == 0) { + if (res.data.success) { + ab98UserStore.setTel(res.data.tel) + ab98UserStore.setUserInfo(res.data) + ab98UserStore.setIsLogin(true) + router.push('/') + } + } + }) + } } if (isAdmin == '1') { diff --git a/src/router/guard.ts b/src/router/guard.ts index bc614da..e0891d5 100644 --- a/src/router/guard.ts +++ b/src/router/guard.ts @@ -7,7 +7,6 @@ import { getToken } from "@@/utils/cache/cookies" import NProgress from "nprogress" import { useAb98UserStore } from '@/pinia/stores/ab98-user' -const ab98UserStore = useAb98UserStore() NProgress.configure({ showSpinner: false }) @@ -27,6 +26,7 @@ export function registerNavigationGuard(router: Router) { return true; } + const ab98UserStore = useAb98UserStore(); if (!ab98UserStore.isLogin) { // 如果在免登录的白名单中,则直接进入 if (isWhiteList(to)) return true