提交 b34ef52f authored 作者: pengxiaohui's avatar pengxiaohui

fix: 增加登录状态失效时判断,跳至登录页

上级 9c14f97f
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
await this.$store.dispatch('logout') await this.$store.dispatch('logout')
let path = this.$route.fullPath let path = this.$route.fullPath
if (path.includes('error-page')) { if (path.includes('error-page')) {
path = '/content-manage/ads' path = '/student'
} }
this.$router.push(path) this.$router.push(path)
} }
......
...@@ -255,7 +255,7 @@ export default { ...@@ -255,7 +255,7 @@ export default {
} else { } else {
this.fileLoading = target this.fileLoading = target
const fileName = file.name const fileName = file.name
const key = 'upload/cms-admin/' + md5(fileName + new Date().getTime()) + fileName.substr(fileName.lastIndexOf('.')) const key = 'upload/cert-admin/' + md5(fileName + new Date().getTime()) + fileName.substr(fileName.lastIndexOf('.'))
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getSignature() getSignature()
.then(response => { .then(response => {
......
...@@ -5,8 +5,7 @@ const user = { ...@@ -5,8 +5,7 @@ const user = {
user: {}, user: {},
isLogin: false, isLogin: false,
roles: null, roles: null,
permissions: null, permissions: null
projects: []
}, },
mutations: { mutations: {
...@@ -21,9 +20,6 @@ const user = { ...@@ -21,9 +20,6 @@ const user = {
}, },
setPermissions(state, permissions) { setPermissions(state, permissions) {
state.permissions = permissions state.permissions = permissions
},
setProjects(state, projects) {
state.projects = projects
} }
}, },
...@@ -33,21 +29,13 @@ const user = { ...@@ -33,21 +29,13 @@ const user = {
return logout().then(response => { return logout().then(response => {
commit('setUser', {}) commit('setUser', {})
commit('setIsLogin', false) commit('setIsLogin', false)
commit('setRoles', null)
commit('setPermissions', null) commit('setPermissions', null)
commit('projects', [])
resetRouter() resetRouter()
return response return response
}) })
}, },
// 检测登录状态 // 检测登录状态
async checkLogin({ commit }) { async checkLogin({ commit }) {
// await getUserGrade()
// .then(response => {
// commit('setUserGrade', response.data.level)
// })
// .catch(() => {
// })
const isLogin = await getUser() const isLogin = await getUser()
.then(response => { .then(response => {
commit('setUser', response.data) commit('setUser', response.data)
......
...@@ -44,26 +44,17 @@ httpRequest.interceptors.request.use( ...@@ -44,26 +44,17 @@ httpRequest.interceptors.request.use(
httpRequest.interceptors.response.use( httpRequest.interceptors.response.use(
function(response) { function(response) {
const { data } = response const { data } = response
if (data.code === 1 && data.msg === '请先登录') { if (data.status === 403) {
// Message.error(data.msg || data.message) window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
// window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
return Promise.reject(data)
}
if (data.code === 403) {
// window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
} }
return data return data
}, },
function(error) { function(error) {
if (error.response) { if (error.response) {
const { status, message, code } = error.response.data const { status } = error.response.data
// 未登录 // 未登录
if (status === 403) { if (status === 403) {
// window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}` window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
} else if (status === 400 && code === 401) {
// router.push('/role')
} else {
Message.error(message || error.response.data)
} }
return Promise.reject(error.response) return Promise.reject(error.response)
} else if (typeof error === 'string') { } else if (typeof error === 'string') {
......
...@@ -17,7 +17,6 @@ export default class BeforeEnter { ...@@ -17,7 +17,6 @@ export default class BeforeEnter {
if (to.path.includes('error-page')) { if (to.path.includes('error-page')) {
next() next()
} else { } else {
console.log(to)
if (!permissions.includes(to.meta.permission)) { if (!permissions.includes(to.meta.permission)) {
router.push('/error-page/401') router.push('/error-page/401')
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论