diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts index f95a25a5..4a433420 100644 --- a/src/hooks/common/router.ts +++ b/src/hooks/common/router.ts @@ -93,11 +93,15 @@ export function useRouterPush(inSetup = true) { return routerPushByKey('login', { query, params: { module } }); } - /** Redirect from login */ - async function redirectFromLogin() { + /** + * Redirect from login + * + * @param [needRedirect=true] Whether to redirect after login. Default is `true` + */ + async function redirectFromLogin(needRedirect = true) { const redirect = route.value.query?.redirect as string; - if (redirect) { + if (needRedirect && redirect) { routerPush(redirect); } else { toHome(); diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 61308e22..8fcdebed 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -71,9 +71,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { if (pass) { await routeStore.initAuthRoute(); - if (redirect) { - await redirectFromLogin(); - } + await redirectFromLogin(redirect); if (routeStore.isInitAuthRoute) { window.$notification?.success({