From b9f7df8d743e0f33226789dda29b9d31399a2def Mon Sep 17 00:00:00 2001 From: Riollee <530377286@qq.com> Date: Sun, 1 Aug 2021 21:38:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=89=8D=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 31 ++++++++++--------- src/utils/http.js | 43 +++++++++++++++++---------- src/views/Content/Achievements.vue | 2 +- src/views/Content/News.vue | 6 ++-- src/views/Content/Patents.vue | 14 ++++----- src/views/Content/StudentHonors.vue | 6 ++-- src/views/Content/StudentProjects.vue | 6 ++-- src/views/login.vue | 24 +++++++-------- 8 files changed, 71 insertions(+), 61 deletions(-) diff --git a/src/main.js b/src/main.js index a4959d9..ec87541 100644 --- a/src/main.js +++ b/src/main.js @@ -42,22 +42,21 @@ router.beforeEach((to, from, next) => { }) } } else { - if (Boolean(localStorage.getItem('userInfo'))) { // 判断是否登录 - if (to.path != '/' && to.path != '/login') { //判断是否要跳到登录界面 - next() - } else { - /** - * 防刷新，如果登录，修改路由跳转到登录页面，修改路由为登录后的首页 - */ - console.log('to', to) - console.log('next', next); - next({ - path: '/user/users', - }) - } - } else { - next() - } + // if (Boolean(localStorage.getItem('userInfo'))) { // 判断是否登录 + // if (to.path != '/' && to.path != '/login') { //判断是否要跳到登录界面 + // next() + // } else { + // /** + // * 防刷新，如果登录，修改路由跳转到登录页面，修改路由为登录后的首页 + // */ + // next({ + // path: '/user/users', + // }) + // } + // } else { + // next() + // } + next() } } else { next({ diff --git a/src/utils/http.js b/src/utils/http.js index 98d76b2..e975af1 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,12 +1,18 @@ import axios from 'axios' -import { Message } from 'element-ui'; -import qs from 'qs' +import { Message } from 'element-ui' +import Router from '@/router/index' + +const OK = 0 +const FAIL = 100 +const PARAM_ERROR = 101 +const AUTH_ERROR = 102 +const DATABASE_ERROR = 103 export const error = async msg => { await Message({ type: 'error', message: msg, - showClose: true + showClose: true, }) } @@ -14,7 +20,7 @@ export const warning = async msg => { await Message({ type: 'warning', message: msg, - showClose: true + showClose: true, }) } @@ -50,10 +56,17 @@ axios.interceptors.request.use( */ axios.interceptors.response.use( response => { - // if (response.data.code !== 1) { - // error(response.data.msg) - // } - console.log("httpBack",response) + switch (response.data.code) { + case AUTH_ERROR: { + warning('权限不足，请先登录') + Router.push({ + path: '/login', + // query: { redirect: }, + }) + return Promise.reject() + } + } + console.log('httpBack', response) return response.data }, // 请求失败 @@ -76,7 +89,7 @@ export function get (url, params = {}, headers = {}) { params: params, headers: headers, }).then(response => { - console.log("response",response) + console.log('response', response) // if(response.code !== 1) { // reject(response.msg) // } @@ -99,12 +112,12 @@ export function post (url, data = {}, params = {}, headers = {}) { params: params, headers: headers, }).then(response => { - console.log("response",response) + console.log('response', response) // if(response.code !== 1) { // reject(response.msg) // } resolve(response) - }).catch(err => { + }, reason => {}).catch(err => { reject(err) }) }) @@ -123,12 +136,12 @@ export function Delete (url, params = {}, headers = {}) { params: params, headers: headers, }).then(response => { - console.log("response",response) + console.log('response', response) // if(response.code !== 1) { // reject(response.msg) // } resolve(response) - }).catch(err => { + }, reason => {}).catch(err => { reject(err) }) }) @@ -148,12 +161,12 @@ export function put (url, data = {}, params = {}, headers = {}) { params: params, headers: headers, }).then(response => { - console.log("response",response) + console.log('response', response) // if(response.code !== 1) { // reject(response.msg) // } resolve(response) - }).catch(err => { + }, reason => {}).catch(err => { reject(err) }) }) diff --git a/src/views/Content/Achievements.vue b/src/views/Content/Achievements.vue index 432bd14..65cc3b4 100644 --- a/src/views/Content/Achievements.vue +++ b/src/views/Content/Achievements.vue @@ -31,7 +31,7 @@ - + diff --git a/src/views/Content/News.vue b/src/views/Content/News.vue index 16c2af4..731b8e9 100644 --- a/src/views/Content/News.vue +++ b/src/views/Content/News.vue @@ -14,8 +14,8 @@ - 刷新 - 添加 + 搜索 + 添加 @@ -25,7 +25,7 @@ - + diff --git a/src/views/Content/Patents.vue b/src/views/Content/Patents.vue index 3302a41..c470375 100644 --- a/src/views/Content/Patents.vue +++ b/src/views/Content/Patents.vue @@ -11,24 +11,24 @@ - + - 搜索 - 添加 + 搜索 + 添加 - - - + + + - +