diff --git a/src/assets/mp4/2.mp4 b/src/assets/mp4/2.mp4 new file mode 100644 index 0000000..0d9eb9e Binary files /dev/null and b/src/assets/mp4/2.mp4 differ diff --git a/src/assets/mp4/3.jpeg b/src/assets/mp4/3.jpeg new file mode 100644 index 0000000..ff021d5 Binary files /dev/null and b/src/assets/mp4/3.jpeg differ diff --git a/src/permission.js b/src/permission.js index e46e30e..6b5a341 100644 --- a/src/permission.js +++ b/src/permission.js @@ -30,6 +30,7 @@ router.beforeEach(async(to, from, next) => { // 路由添加进去了没有及时更新 需要重新进去一次拦截 if(!store.state.permission.routes.length){ + // 获取权限列表进行接口访问 因为这里页面要切换权限 // const roles = await store.dispatch('user/getInfo') const accessRoutes = await store.dispatch('permission/generateRoutes', store.getters.roles) diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index e02380b..c41b934 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -57,11 +57,12 @@ const actions = { return new Promise(resolve => { // 在这判断是否有权限,哪些角色拥有哪些权限 let accessedRoutes - if (roles.includes('admin')) { - accessedRoutes = asyncRoutes || [] - } else { + if (roles&&roles.length) { accessedRoutes = filterAsyncRoutes(asyncRoutes, roles) + } else { + accessedRoutes = asyncRoutes || [] } + commit('SET_ROUTES', accessedRoutes) resolve(accessedRoutes) }) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 84c08b6..171fd70 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,5 +1,13 @@