diff --git a/README.md b/README.md index 54a79555..ebb5067a 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ vue+element+axios 的管理后台 [线上地址](http://panjiachen.github.io/vue ###功能 - [x] 登录/注销 - [x] 权限验证 +- [x] 侧边栏 +- [x] 面包屑 - [x] 富文本编辑器 - [x] Markdown编辑器 - [x] JSON编辑器 @@ -20,6 +22,10 @@ vue+element+axios 的管理后台 [线上地址](http://panjiachen.github.io/vue - [x] table example - [x] form example - [x] 多环境发布 +- [x] dashboard +- [x] 二次登录 +- [x] 动态侧边栏 + ###How to use? ```bash diff --git a/src/mock/login.js b/src/mock/login.js index e852929a..801ab6b1 100644 --- a/src/mock/login.js +++ b/src/mock/login.js @@ -26,23 +26,30 @@ const userMap = { export default { loginByEmail: config => { const { email } = config.params; - return new Promise(resolve => { - setTimeout(() => { - resolve([200, { - data: userMap[email.split('@')[0]] - }]); - }, 500); + return new Promise((resolve, reject) => { + if (userMap[email.split('@')[0]]) { + setTimeout(() => { + resolve([200, { + data: userMap[email.split('@')[0]] + }]); + }, 500); + } else { + reject('账号不正确') + } }) }, getInfo: config => { const { token } = config.params; - console.log(userMap[token]) - return new Promise(resolve => { - setTimeout(() => { - resolve([200, { - data: userMap[token] - }]); - }, 100); + return new Promise((resolve, reject) => { + if (userMap[token]) { + setTimeout(() => { + resolve([200, { + data: userMap[token] + }]); + }, 100); + } else { + reject('获取失败') + } }) }, logout: () => new Promise(resolve => { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b6130f19..5e1228c1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,6 +114,7 @@ const user = { return new Promise((resolve, reject) => { logout(state.token).then(() => { commit('SET_TOKEN', ''); + commit('SET_ROLES', []); Cookies.remove('X-Ivanka-Token'); resolve(); }).catch(error => { diff --git a/src/utils/fetch.js b/src/utils/fetch.js index 9110f774..71cfc2d2 100644 --- a/src/utils/fetch.js +++ b/src/utils/fetch.js @@ -61,7 +61,7 @@ export function fetch(options) { }) .catch(error => { Message({ - message: '发生异常错误,请刷新页面重试,或联系程序员', + message: error, type: 'error', duration: 5 * 1000 }); diff --git a/src/views/dashboard/default/index.vue b/src/views/dashboard/default/index.vue index 97b05fa6..c0625b51 100644 --- a/src/views/dashboard/default/index.vue +++ b/src/views/dashboard/default/index.vue @@ -6,13 +6,12 @@