fix登录可能会产生的错误

This commit is contained in:
不做码农 2022-04-26 08:18:19 +08:00
parent 74d871ee75
commit 62cdedb9df
3 changed files with 8 additions and 12 deletions

View File

@ -1,6 +1,6 @@
import { login, logout, getInfo } from '@/api/system/login' import { login, logout, getInfo } from '@/api/system/login'
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from '@/utils/auth'
// import defAva from '@/assets/images/profile.jpg' import defAva from '@/assets/images/profile.jpg'
const user = { const user = {
state: { state: {
@ -48,7 +48,7 @@ const user = {
commit('SET_TOKEN', res.data) commit('SET_TOKEN', res.data)
resolve() //then处理 resolve() //then处理
} else { } else {
console.log('login error ' + res); console.log('login error ', res)
reject(res) //catch处理 reject(res) //catch处理
} }
}).catch(error => { }).catch(error => {
@ -62,7 +62,7 @@ const user = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo().then(res => {
const data = res.data const data = res.data
const avatar = data.user.avatar == "" ? require("@/assets/image/profile.jpg") : data.user.avatar; const avatar = data.user.avatar == "" ? defAva : data.user.avatar;
if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', data.roles) commit('SET_ROLES', data.roles)
@ -76,7 +76,8 @@ const user = {
commit('SET_USERINFO', data.user) //新加 commit('SET_USERINFO', data.user) //新加
resolve(res) resolve(res)
}).catch(error => { }).catch(error => {
reject(error) console.error(error);
reject("获取用户信息失败")
}) })
}) })
}, },

View File

@ -2,9 +2,6 @@ import axios from 'axios'
import { ElMessageBox, ElMessage } from 'element-plus' import { ElMessageBox, ElMessage } from 'element-plus'
import store from '@/store' import store from '@/store'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
// import { blobValidate } from "@/utils/ruoyi";
// import errorCode from '@/utils/errorCode'
// import { saveAs } from 'file-saver'
// 解决后端跨域获取不到cookie问题 // 解决后端跨域获取不到cookie问题
// axios.defaults.withCredentials = true // axios.defaults.withCredentials = true
@ -24,8 +21,6 @@ service.interceptors.request.use(config => {
//将token放到请求头发送给服务器,将tokenkey放在请求头中 //将token放到请求头发送给服务器,将tokenkey放在请求头中
config.headers['Authorization'] = 'Bearer ' + getToken(); config.headers['Authorization'] = 'Bearer ' + getToken();
config.headers['userid'] = store.getters.userId; config.headers['userid'] = store.getters.userId;
} else {
// console.log(config)
} }
return config; return config;
}, error => { }, error => {
@ -52,7 +47,8 @@ service.interceptors.response.use(res => {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = import.meta.env.VITE_APP_ROUTER_PREFIX + 'index'; location.href =
import.meta.env.VITE_APP_ROUTER_PREFIX + 'index';
}) })
}) })

View File

@ -107,7 +107,7 @@ function handleLogin() {
router.push({ path: redirect.value || '/' }) router.push({ path: redirect.value || '/' })
}) })
.catch((error) => { .catch((error) => {
console.log(error) console.error(error)
proxy.$modal.msgError(error.msg) proxy.$modal.msgError(error.msg)
loading.value = false loading.value = false
// //
@ -138,7 +138,6 @@ function getCookie() {
} }
getCode() getCode()
getCookie() getCookie()
onMounted(() => {})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>