jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(projects): 修复登录页刷新跳404

Browse Source
This commit is contained in:
Soybean
2021-10-20 16:38:43 +08:00
parent 3edf46eb52
commit 358d4e8a19
15 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hooks/common/useRouterChange.ts
View File

@ -1,7 +1,7 @@
import { useRouter, useRoute } from 'vue-router';
import type { RouteLocationRaw } from 'vue-router';
import { EnumRoutePath } from '@/enum';
import { router as globalRouter, RouteNameMap } from '@/router';
import { router as globalRouter } from '@/router';
import type { LoginModuleType } from '@/interface';
/**
@ -30,15 +30,15 @@ export default function useRouterChange(inSetup: boolean = true) {
*/
function toLogin(module: LoginModuleType = 'pwd-login', redirectUrl?: LoginRedirect) {
const routeLocation: RouteLocationRaw = {
name: RouteNameMap.get('login'),
params: { module }
path: EnumRoutePath.login,
query: { module }
};
if (redirectUrl) {
let url = redirectUrl;
if (redirectUrl === 'current') {
url = router.currentRoute.value.fullPath as EnumRoutePath;
}
routeLocation.query = { redirectUrl: url };
routeLocation.query!.redirectUrl = url;
}
router.push(routeLocation);
}
@ -51,7 +51,7 @@ export default function useRouterChange(inSetup: boolean = true) {
function toCurrentLogin(module: LoginModuleType) {
if (route) {
const { query } = route;
router.push({ name: RouteNameMap.get('login'), params: { module }, query });
router.push({ path: EnumRoutePath.login, query: { ...query, module } });
}
}