zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refine code

This commit is contained in:
Pan 2017-05-16 18:20:47 +08:00
parent d820ca95e1
commit 624af00ba3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.js
View File

@ -70,7 +70,6 @@ router.beforeEach((to, from, next) => {
}); });
} }
} else { // 页面不需要权限 直接进入 } else { // 页面不需要权限 直接进入
console.log(store.getters.roles)
if (store.getters.roles.length !== 0) { if (store.getters.roles.length !== 0) {
next(); next();
} else { } else {
@ -87,7 +86,7 @@ router.beforeEach((to, from, next) => {
} }
} }
} else { } else {
if (whiteList.indexOf(to.path) !== -1) { // 在免登入白名单，直接进入 if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入
next() next()
} else { } else {
next('/login'); // 否则全部重定向到登录页 next('/login'); // 否则全部重定向到登录页

7
src/store/permission.js
View File

@ -3,8 +3,7 @@ const permission = {
permissionRoutes: [] permissionRoutes: []
}, },
init(data) { init(data) {
const roles = data.roles; const { roles, router } = data;
const router = data.router;
const permissionRoutes = router.filter(v => { const permissionRoutes = router.filter(v => {
if (roles.indexOf('admin') >= 0) return true; if (roles.indexOf('admin') >= 0) return true;
if (this.hasPermission(roles, v)) { if (this.hasPermission(roles, v)) {
@ -22,10 +21,10 @@ const permission = {
} }
return false; return false;
}); });
this.permissionRoutes = permissionRoutes; this.state.permissionRoutes = permissionRoutes;
}, },
get() { get() {
return this.permissionRoutes return this.state.permissionRoutes
}, },
hasPermission(roles, route) { hasPermission(roles, route) {
if (route.meta && route.meta.role) { if (route.meta && route.meta.role) {