diff --git a/README.md b/README.md index e79fb3b6602e661bac441ea0ddb7349ccade7781..2d755830ce022ecc2adeffc523db43b73bb442c2 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ **注æ„:该项目目å‰ä½¿ç”¨element-ui@1.4.2版本,所以最低兼容 Vue 2.3.0** +楼主这里有一份调查[é—®å·](https://www.wjx.cn/m/16866569.aspx) 有空请填写一下,以表对本项目的支æŒ~ps:ä¸æ˜¯ç»™è¿™ä¸ªè°ƒæŸ¥é—®å·ç½‘ç«™åšå¹¿å‘Šï¼Œæ‰€ä»¥å¡«å®Œé—®å·ä¸ç”¨ç‚¹ä¸Šé¢æŠ½å¥–有的没的那些东西 + ## å‰è¨€ > è¿™åŠå¹´æ¥ä¸€ç›´åœ¨ç”¨vue写管ç†åŽå°ï¼Œç›®å‰åŽå°å·²ç»æœ‰ç™¾æ¥ä¸ªé¡µé¢ï¼Œåå‡ ç§æƒé™ï¼Œä½†ç»´æŠ¤æˆæœ¬ä¾ç„¶å¾ˆä½Žï¼Œæ‰€ä»¥å‡†å¤‡å¼€æºåˆ†äº«ä¸€ä¸‹åŽå°å¼€å‘çš„ç»éªŒå’Œæˆæžœã€‚ç›®å‰çš„æŠ€æœ¯æ ˆä¸»è¦çš„采用vue+element+axiosç”±webpack2打包。由于是个人项目,所以数æ®è¯·æ±‚都是用了mockjs模拟。注æ„:在æ¤é¡¹ç›®åŸºç¡€ä¸Šæ”¹é€ å¼€å‘时请移除mock文件。 diff --git a/package.json b/package.json index 033872fa1c311730bbd0e3b45277fc692626818e..3444aca907b48308c0c610cb459702c14fcd909f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "juicy", - "version": "2.2.0", + "version": "2.2.1", "description": "A Vue.js admin", "author": "Pan <panfree23@gmail.com>", "license": "MIT", diff --git a/src/mock/login.js b/src/mock/login.js index f1fa8384ca096f18965d80be323823e663ef4e27..8693ef98f78d72f661a9029d9b575dfc619c575f 100644 --- a/src/mock/login.js +++ b/src/mock/login.js @@ -27,7 +27,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 b588f26d7329218a680d9ea56b097bdeb7b60029..77c88e1158b698948a3d043301ab6e83665b1605 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 1b23d1db5366b2e4db1483023e759477becd799c..8cf6d18a9e7898061a92c358eda4da552a511828 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)