|
@@ -1,6 +1,7 @@
|
|
|
import Vue from 'vue';
|
|
|
import VueRouter from 'vue-router';
|
|
|
import store from '@/store/index';
|
|
|
+import { Notification } from 'element-ui';
|
|
|
|
|
|
Vue.use(VueRouter);
|
|
|
|
|
@@ -49,6 +50,12 @@ const routes = [
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
+ {
|
|
|
+ path: '/login',
|
|
|
+ name: 'login',
|
|
|
+ meta: { title: '登录', sub: '管理' },
|
|
|
+ component: () => import('@/views/register/login.vue'),
|
|
|
+ },
|
|
|
];
|
|
|
|
|
|
const router = new VueRouter({
|
|
@@ -58,18 +65,27 @@ const router = new VueRouter({
|
|
|
});
|
|
|
router.beforeEach((to, form, next) => {
|
|
|
store.commit('setUser');
|
|
|
+ if (to.name === 'login') {
|
|
|
+ next();
|
|
|
+ return;
|
|
|
+ }
|
|
|
let user = store.state.user;
|
|
|
if (user) {
|
|
|
if (user.type == process.env.VUE_APP_USER_TYPE) {
|
|
|
- console.log('缓存登陆');
|
|
|
+ console.log('已登录');
|
|
|
next();
|
|
|
} else {
|
|
|
- console.error('非当前端用户,需要重新登陆');
|
|
|
- // next('/login'); //TODO 跳转至登陆页
|
|
|
+ Notification({
|
|
|
+ title: '请重新登陆',
|
|
|
+ message: `原因:非当前端用户,需要重新登陆`,
|
|
|
+ type: 'warning',
|
|
|
+ });
|
|
|
+ console.warn('非当前端用户,需要重新登陆');
|
|
|
+ next({ name: 'login' });
|
|
|
}
|
|
|
}
|
|
|
//下面是没登录的情况,需要跳转页面到用户未登录页
|
|
|
- else next();
|
|
|
+ else next({ name: 'login' });
|
|
|
});
|
|
|
|
|
|
export default router;
|