diff --git a/vite-demo/src/permission.js b/vite-demo/src/permission.js
index b6ee6119ada85b6bd48d03d205b4f69f5a7f85b1..95fa7f764361c8a44265a6feaa9084b3cef174d9 100644
--- a/vite-demo/src/permission.js
+++ b/vite-demo/src/permission.js
@@ -3,10 +3,11 @@ import store from "./store";
import {getToken} from '@/utils/auth'
import {message} from 'ant-design-vue'
import {accessControl} from './config'
+
const whiteList = ['/login']
router.beforeEach(async (to, from, next) => {
- console.log('11111111111111111111',to, from);
+ console.log('11111111111111111111', to, from);
const hasToken = getToken()
if (hasToken) {
if (to.path === 'login') {
@@ -15,11 +16,16 @@ router.beforeEach(async (to, from, next) => {
const hasRoles = store.getters.roles && store.getters.roles.length > 0
if (hasRoles) {
console.log('哟权限');
- try {
- next()
- }catch (e) {
- console.log('ddddds',e);
- }
+ try {
+ // if (to.matched.length === 0) { //如果未匹配到路由
+ // from.name ? next({name: from.name}) : next('/'); //如果上级也未匹配到路由则跳转登录页面,如果上级能匹配到则转上级路由
+ // } else {
+ // next(); //如果匹配到正确跳转
+ // }
+ next(); //如果匹配到正确跳转
+ } catch (e) {
+ console.log('ddddds', e);
+ }
} else {
try {
// 获取用信息
@@ -27,9 +33,9 @@ router.beforeEach(async (to, from, next) => {
console.log('getUserInfo', roles);
// 获取用户权限路由
let accessRoutes = []
- if(accessControl.source==='front'){
+ if (accessControl.source === 'front') {
accessRoutes = await store.dispatch('getFrontRoutes', roles)
- }else {
+ } else {
accessRoutes = await store.dispatch('getBackRouter', hasToken)
}
diff --git a/vite-demo/src/router/authRouter.js b/vite-demo/src/router/authRouter.js
index 5ac67f8907de5a38ebc08eb24cad9ff682e305e0..f3d474f981f4d5519a78288122a823061302ab7f 100644
--- a/vite-demo/src/router/authRouter.js
+++ b/vite-demo/src/router/authRouter.js
@@ -1,5 +1,6 @@
import Layout from "@/views/layout/index.vue";
+
export default [
{
path: '/auth',
diff --git a/vite-demo/src/router/baseRouter.js b/vite-demo/src/router/baseRouter.js
index 28831e130549382d975e11ea6672df242aa11615..b9c80973494941ed2cd0ceccfe82f103baa39246 100644
--- a/vite-demo/src/router/baseRouter.js
+++ b/vite-demo/src/router/baseRouter.js
@@ -28,5 +28,5 @@ export default [
}
]
},
- // {path: '/:pathToRegexp(.*)', hidden: true, redirect: '/'} //当用户输入页面链接错误或者没有该页面时,显示该路径页面
+ {path: '/:pathMatch(.*)', hidden: true, redirect: '/'} //当用户输入页面链接错误或者没有该页面时,显示该路径页面
]
\ No newline at end of file
diff --git a/vite-demo/src/store/modules/permission.js b/vite-demo/src/store/modules/permission.js
index c01a61251f4f61f0ff95ca4f460eacbd20cfd164..a6284b35927beda9f23b3cd68a4afd02ba5190fd 100644
--- a/vite-demo/src/store/modules/permission.js
+++ b/vite-demo/src/store/modules/permission.js
@@ -25,6 +25,7 @@ const comp = import.meta.glob(`/src/views/**/*/*.vue`);
// const comp = comp1.concat(comp2)
import Layout from "@/views/layout/index.vue";
+
console.log('component', comp);
export function filterAsyncRoutes(routes, roles) {
diff --git a/vite-demo/src/views/layout/index.vue b/vite-demo/src/views/layout/index.vue
index 1931aa9d7a774709e6b8a4dd87fea1dafbc9f28e..d04081b356dc2b03922f6bba7d082659b4c60f77 100644
--- a/vite-demo/src/views/layout/index.vue
+++ b/vite-demo/src/views/layout/index.vue
@@ -13,15 +13,16 @@
+
+
\ No newline at end of file