diff --git a/src/mock/login.js b/src/mock/login.js index 00ce9bdee35fa011a3b415aafa349c746abbc0f5..5b00b5037fab5c2e7e22e742ccbb8d49a03579e1 100644 --- a/src/mock/login.js +++ b/src/mock/login.js @@ -34,7 +34,7 @@ export default { if (userMap[token]) { return userMap[token] } else { - return Promise.reject('error') + return false } }, logout: () => 'success' diff --git a/src/permission.js b/src/permission.js index b7ce9b6cdbc09a1f0a6b1608160cf883ddbb0971..2fcc4c9c9ad8c0462726c875f763c6b8fa5ebd7f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -3,6 +3,7 @@ import store from './store' import NProgress from 'nprogress' // Progress è¿›åº¦æ¡ import 'nprogress/nprogress.css'// Progress 进度æ¡æ ·å¼ import { getToken } from '@/utils/auth' // éªŒæƒ +import { Message } from 'element-ui' // permissiom judge function hasPermission(roles, permissionRoles) { @@ -29,6 +30,7 @@ router.beforeEach((to, from, next) => { }) }).catch(() => { store.dispatch('FedLogOut').then(() => { + Message.error('验è¯å¤±è´¥,请é‡æ–°ç™»å½•') next({ path: '/login' }) }) }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9c70697851eab8aed7d599954c2e6d2f51ff3d35..0ac425e148f07fb9d59cb92592f8de94463aa4c2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -63,6 +63,9 @@ const user = { GetUserInfo({ commit, state }) { return new Promise((resolve, reject) => { getUserInfo(state.token).then(response => { + if (!response.data) { // 由于mockjs ä¸æ”¯æŒè‡ªå®šä¹‰çŠ¶æ€ç åªèƒ½è¿™æ ·hack + reject('error') + } const data = response.data commit('SET_ROLES', data.role) commit('SET_NAME', data.name)