diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue index 61a16d3..b1432bf 100644 --- a/src/components/page/Login.vue +++ b/src/components/page/Login.vue @@ -103,6 +103,7 @@ export default { sessionStorage.setItem('kd_server_username', this.activeName == '0' ? this.param.username : this.phoneParam.userphone); res.message.retvalue.userAvatars && this.$store.commit("userPhoto", { avatar : res.message.retvalue.userAvatars}) this.$store.commit("dataTime", { dataTime : res.message.retvalue.dataTime}); + this.$store.commit("tokenData", {loginToken: data.loginToken}) this.$store.commit("userLoginData", { userLogin_id : data.userId,userRole_id: data.roleId,schoolId: data.schoolId,token: data.token,userName: data.userName}); let redirect = decodeURIComponent(this.$route.query.redirect || '/dashboard') diff --git a/src/store/index.js b/src/store/index.js index 06147cd..4b45d1f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -22,6 +22,7 @@ const store = new Vuex.Store({ id: '', name: '' }, + loginToken: '', token: '', userName: '', routes: [], @@ -65,6 +66,9 @@ const store = new Vuex.Store({ state.token = payload.token state.userName = payload.userName }, + tokenData (state, payload) { + state.loginToken = payload.loginToken + }, addClassData (state, payload) { state.addClass = payload.addClass }, diff --git a/src/utils/http.js b/src/utils/http.js index 285a36f..074e736 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -23,7 +23,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'; // 请求拦截器 axios.interceptors.request.use(config => { - let token = store.state.token + let token = store.state.loginToken if(token){ config.headers.token = token } @@ -124,6 +124,10 @@ export function getToken(){ } } +let tokenStatus = { + 0: '用户未登录,请登录后操作!', + 1: 'token错误,请重新登录!' +} /** * get方法,对应get请求 */ @@ -134,6 +138,11 @@ export function get(url, params){ params: params }) .then(res => { + if(typeof res.data == 'number'){ + this.$message.error(tokenStatus[res.data]) + setTimeout(logouts,1500) + return false + } if(res.data.code == 99999){ this.$message.error( res.data.message @@ -228,6 +237,11 @@ export function post(url, params) { return new Promise((resolve, reject) => { axios.post(url,params) .then(res => { + if(typeof res.data == 'number'){ + this.$message.error(tokenStatus[res.data]) + setTimeout(logouts,1500) + return false + } if(res.data.code == 99999){ this.$message.error( res.data.message @@ -325,6 +339,11 @@ export function post(url, params) { return new Promise((resolve, reject) =>{ axios.delete(url, {params}) .then(res => { + if(typeof res.data == 'number'){ + this.$message.error(tokenStatus[res.data]) + setTimeout(logouts,1500) + return false + } if(res.data.code == 99999){ this.$message.error( res.data.message @@ -408,6 +427,11 @@ export function delbody(url, params){ return new Promise((resolve, reject) =>{ axios.delete(url, {data: params}) .then(res => { + if(typeof res.data == 'number'){ + this.$message.error(tokenStatus[res.data]) + setTimeout(logouts,1500) + return false + } if(res.data.code == 99999){ this.$message.error( res.data.message @@ -496,6 +520,11 @@ export function put(url, params){ return new Promise((resolve, reject) =>{ axios.put(url, params) .then(res => { + if(typeof res.data == 'number'){ + this.$message.error(tokenStatus[res.data]) + setTimeout(logouts,1500) + return false + } if(res.data.code == 99999){ this.$message.error( res.data.message