diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 9e6435f..92195a2 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -136,14 +136,13 @@ export const useUserStore = defineStore({ const { token } = data; // save token this.setToken(token); - router.replace(params.targetURL || params.redirect || userInfo?.homePath || PageEnum.BASE_HOME) - return await this.afterLoginAction(false); + return await this.afterLoginAction(false, params.targetURL || params.redirect); } catch (error) { return Promise.reject(error); } }, - async afterLoginAction(goHome?: boolean): Promise { + async afterLoginAction(goHome?: boolean, redirect?): Promise { if (!this.getToken) return null; // get user info @@ -166,6 +165,7 @@ export const useUserStore = defineStore({ }); router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); } + redirect && (await router.replace(decodeURIComponent(redirect))); goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME)); }