页面路径完善
This commit is contained in:
@@ -26,14 +26,6 @@ const isWhiteList = (path: string) => {
|
||||
router.beforeEach(async (to, from) => {
|
||||
NProgress.start();
|
||||
|
||||
// ==============================================
|
||||
// 🚥 调试日志:每次跳转都打印(方便看你跳去了哪)
|
||||
// ==============================================
|
||||
console.log('==========================================================');
|
||||
console.log('🔀 路由跳转:', from.path, ' → ', to.path);
|
||||
console.log('🔐 是否有Token:', !!getToken());
|
||||
console.log('🚦 动态路由是否已加载:', isDynamicRoutesAdded);
|
||||
|
||||
const hasToken = getToken();
|
||||
const userStore = useUserStore();
|
||||
const permissionStore = usePermissionStore();
|
||||
@@ -44,29 +36,16 @@ router.beforeEach(async (to, from) => {
|
||||
|
||||
// 已登录 且 去登录页 → 跳首页
|
||||
if (to.path === '/login') {
|
||||
console.log('✅ 已登录,访问登录页,直接跳首页');
|
||||
NProgress.done();
|
||||
return '/';
|
||||
}
|
||||
|
||||
// 白名单页面直接放行
|
||||
if (isWhiteList(to.path)) {
|
||||
console.log('✅ 白名单页面,直接放行');
|
||||
return;
|
||||
}
|
||||
|
||||
// ==============================================
|
||||
// ✅ 【关键】只在【没有角色 + 没有加载过路由】时执行一次
|
||||
// ==============================================
|
||||
console.log('👤 当前用户角色:', userStore.roles);
|
||||
console.log('🧪 判断条件:roles.length === 0 && !isDynamicRoutesAdded');
|
||||
console.log('🧪 结果:', userStore.roles.length === 0 && !isDynamicRoutesAdded);
|
||||
|
||||
if (userStore.roles.length === 0 && !isDynamicRoutesAdded) {
|
||||
console.log('==========================================================');
|
||||
console.log('🚀 【首次初始化】获取用户信息 + 生成动态路由(只执行一次)');
|
||||
console.log('==========================================================');
|
||||
|
||||
isRelogin.show = true;
|
||||
|
||||
// 获取用户信息
|
||||
@@ -79,12 +58,10 @@ router.beforeEach(async (to, from) => {
|
||||
return '/';
|
||||
}
|
||||
|
||||
console.log('✅ 用户信息获取成功:', res);
|
||||
isRelogin.show = false;
|
||||
|
||||
// 生成动态路由
|
||||
const accessRoutes = await permissionStore.generateRoutes();
|
||||
console.log('✅ 动态路由生成成功,数量:', accessRoutes.length);
|
||||
|
||||
// 添加路由(避免重复添加)
|
||||
accessRoutes.forEach((route) => {
|
||||
@@ -95,7 +72,6 @@ router.beforeEach(async (to, from) => {
|
||||
|
||||
// ✅ 标记:路由已添加
|
||||
isDynamicRoutesAdded = true;
|
||||
console.log('✅ 动态路由添加完成,标记 isDynamicRoutesAdded = true');
|
||||
|
||||
// 管理员登录强制跳转
|
||||
if (res.user.userId === 1 && from.path === '/login') {
|
||||
|
||||
Reference in New Issue
Block a user