diff --git a/src/components/core/Markdown/index.vue b/src/components/core/Markdown/index.vue index e0fe13ea..810bf947 100644 --- a/src/components/core/Markdown/index.vue +++ b/src/components/core/Markdown/index.vue @@ -50,7 +50,7 @@ export default { }, // 从 url 加载原始数据 async getReadme (name) { - const { data } = await this.$http.get(name) + const data = await this.$http.get(name) return this.marked(data) }, marked (data) { diff --git a/src/pages/core/login/index.vue b/src/pages/core/login/index.vue index 756c8c7d..b27ba78b 100644 --- a/src/pages/core/login/index.vue +++ b/src/pages/core/login/index.vue @@ -82,6 +82,9 @@ export default { } Cookies.set('username', res.username, setting) Cookies.set('password', res.password, setting) + this.$router.push({ + name: 'index' + }) }) .catch(err => { this.$log('错误信息', err) diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js index 4800fabb..a5de929d 100644 --- a/src/plugin/axios/index.js +++ b/src/plugin/axios/index.js @@ -4,11 +4,15 @@ import axios from 'axios' axios.interceptors.response.use(res => { // 在这里对返回的数据进行处理 - if (res.data.code !== 0) { - Message.error(res.data.msg) - return Promise.reject(res.data.msg) + if (res.data.code) { + if (res.data.code !== 0) { + Message.error(res.data.msg) + return Promise.reject(res.data.msg) + } else { + return res.data.data + } } else { - return res.data.data + return res.data } }, err => { return Promise.reject(err)