|
@@ -1,46 +1,59 @@
|
|
|
-import router from './router'
|
|
|
-import store from './store'
|
|
|
-import { Message } from 'element-ui'
|
|
|
-import NProgress from 'nprogress'
|
|
|
-import 'nprogress/nprogress.css'
|
|
|
-import { getToken } from '@/utils/auth'
|
|
|
-import getPageTitle from '@/utils/get-page-title'
|
|
|
+import router from './router';
|
|
|
+import store from './store';
|
|
|
+import { Message } from 'element-ui';
|
|
|
+import NProgress from 'nprogress';
|
|
|
+import 'nprogress/nprogress.css';
|
|
|
+import { getToken } from '@/utils/auth';
|
|
|
+import getPageTitle from '@/utils/get-page-title';
|
|
|
|
|
|
-NProgress.configure({ showSpinner: false })
|
|
|
+NProgress.configure({ showSpinner: false });
|
|
|
|
|
|
-const whiteList = ['/login']
|
|
|
+const whiteList = ['/login'];
|
|
|
|
|
|
-router.beforeEach(async(to, from, next) => {
|
|
|
+router.beforeEach(async (to, from, next) => {
|
|
|
|
|
|
- NProgress.start()
|
|
|
+ NProgress.start();
|
|
|
|
|
|
|
|
|
- document.title = getPageTitle(to.meta.title)
|
|
|
+ document.title = getPageTitle(to.meta.title);
|
|
|
|
|
|
|
|
|
- const hasToken = getToken()
|
|
|
+ const hasToken = getToken();
|
|
|
|
|
|
if (hasToken) {
|
|
|
if (to.path === '/login') {
|
|
|
|
|
|
- next({ path: '/' })
|
|
|
- NProgress.done()
|
|
|
+ next({ path: '/' });
|
|
|
+ NProgress.done();
|
|
|
} else {
|
|
|
- const hasGetUserInfo = store.getters.name
|
|
|
+ const hasGetUserInfo = store.getters.name;
|
|
|
if (hasGetUserInfo) {
|
|
|
- next()
|
|
|
+ next();
|
|
|
} else {
|
|
|
try {
|
|
|
|
|
|
- await store.dispatch('user/getInfo')
|
|
|
+ const { roles } = await store.dispatch('user/getInfo');
|
|
|
+
|
|
|
|
|
|
- next()
|
|
|
+
|
|
|
+ const accessRoutes = await store.dispatch(
|
|
|
+ 'permission/generateRoutes',
|
|
|
+ roles
|
|
|
+ );
|
|
|
+
|
|
|
+ console.error(accessRoutes);
|
|
|
+
|
|
|
+
|
|
|
+ router.addRoutes(accessRoutes);
|
|
|
+
|
|
|
+ next({ ...to, replace: true });
|
|
|
+
|
|
|
} catch (error) {
|
|
|
|
|
|
- await store.dispatch('user/resetToken')
|
|
|
- Message.error(error || 'Has Error')
|
|
|
- next(`/login?redirect=${to.path}`)
|
|
|
- NProgress.done()
|
|
|
+ await store.dispatch('user/resetToken');
|
|
|
+ Message.error(error || 'Has Error');
|
|
|
+ next(`/login?redirect=${to.path}`);
|
|
|
+ NProgress.done();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -49,16 +62,16 @@ router.beforeEach(async(to, from, next) => {
|
|
|
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
|
|
|
- next()
|
|
|
+ next();
|
|
|
} else {
|
|
|
|
|
|
- next(`/login?redirect=${to.path}`)
|
|
|
- NProgress.done()
|
|
|
+ next(`/login?redirect=${to.path}`);
|
|
|
+ NProgress.done();
|
|
|
}
|
|
|
}
|
|
|
-})
|
|
|
+});
|
|
|
|
|
|
router.afterEach(() => {
|
|
|
|
|
|
- NProgress.done()
|
|
|
-})
|
|
|
+ NProgress.done();
|
|
|
+});
|