diff --git a/src/layouts/modules/global-header/components/user-avatar.vue b/src/layouts/modules/global-header/components/user-avatar.vue index a8900c6..04c5748 100644 --- a/src/layouts/modules/global-header/components/user-avatar.vue +++ b/src/layouts/modules/global-header/components/user-avatar.vue @@ -22,7 +22,7 @@ function logout() { okText: $t('common.confirm'), cancelText: $t('common.cancel'), onOk: () => { - authStore.resetStore(); + authStore.resetStore(true); } }); } diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 3a51f97..3d98a8b 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -41,7 +41,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { */ async function resetStore(isMe = false) { if (isMe) { - doDeleteLogout(); + await doDeleteLogout(); } const authStore = useAuthStore(); @@ -70,10 +70,10 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { startLoading(); const { data: loginToken, error } = await fetchLogin(loginForm); - if (!error) { const pass = await loginByToken(loginToken); onSuccess && onSuccess(); + if (pass) { await routeStore.initAuthRoute();