Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
fan 2019-10-31 14:38:54 +08:00
commit 4c524eb1a7

View File

@ -91,7 +91,6 @@ function handleRoute(to, from, next, routeInfo) {
} else { } else {
// 除没有动态改变权限的需求可直接next() 删下方权限判断 // 除没有动态改变权限的需求可直接next() 删下方权限判断
if (hasPermission(store.getters.roles, to.meta.roles)) { if (hasPermission(store.getters.roles, to.meta.roles)) {
debugger;
if (to.path === '/404' && to.redirectedFrom === '/') { if (to.path === '/404' && to.redirectedFrom === '/') {
next(localStore.get('trainingPlatformRoute' + store.getters.id) || '/trainingPlatform'); next(localStore.get('trainingPlatformRoute' + store.getters.id) || '/trainingPlatform');
} else { } else {