From 8d3a63380759e948cfcce9ac4c8c009e7b2d29c7 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 12 Sep 2023 15:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/694=E3=80=91404=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98=20---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/web/usePage.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hooks/web/usePage.ts b/src/hooks/web/usePage.ts index d6df000..80fbaba 100644 --- a/src/hooks/web/usePage.ts +++ b/src/hooks/web/usePage.ts @@ -6,6 +6,7 @@ import { unref } from 'vue'; import { useRouter } from 'vue-router'; import { REDIRECT_NAME } from '/@/router/constant'; +import { useUserStore } from '/@/store/modules/user'; export type RouteLocationRawEx = Omit & { path: PageEnum }; @@ -15,12 +16,16 @@ function handleError(e: Error) { // page switch export function useGo(_router?: Router) { + // update-begin--author:liaozhiyang---date:20230908---for：【issues/694】404返回首页问题 + const userStore = useUserStore(); + const homePath = userStore.getUserInfo.homePath || PageEnum.BASE_HOME; + // update-end--author:liaozhiyang---date:20230908---for：【issues/694】404返回首页问题 let router; if (!_router) { router = useRouter(); } const { push, replace } = _router || router; - function go(opt: PageEnum | RouteLocationRawEx | string = PageEnum.BASE_HOME, isReplace = false) { + function go(opt: PageEnum | RouteLocationRawEx | string = homePath, isReplace = false) { if (!opt) { return; }