|
|
@ -43,8 +43,10 @@ const user = { |
|
|
|
const uuid = userInfo.uuid |
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
login(username, password, code, uuid).then(res => { |
|
|
|
setToken(res.token) |
|
|
|
commit('SET_TOKEN', res.token) |
|
|
|
console.log('res.data',res.data); |
|
|
|
|
|
|
|
setToken(res.data.token) |
|
|
|
commit('SET_TOKEN', res.data.token) |
|
|
|
resolve() |
|
|
|
}).catch(error => { |
|
|
|
reject(error) |
|
|
@ -56,14 +58,15 @@ const user = { |
|
|
|
GetInfo({ commit, state }) { |
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
getInfo().then(res => { |
|
|
|
const user = res.user |
|
|
|
console.log('获取用户信息',res); |
|
|
|
const user = res.data.user |
|
|
|
let avatar = user.avatar || "" |
|
|
|
if (!isHttp(avatar)) { |
|
|
|
avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar |
|
|
|
} |
|
|
|
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
|
|
|
commit('SET_ROLES', res.roles) |
|
|
|
commit('SET_PERMISSIONS', res.permissions) |
|
|
|
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
|
|
|
commit('SET_ROLES', res.data.roles) |
|
|
|
commit('SET_PERMISSIONS', res.data.permissions) |
|
|
|
} else { |
|
|
|
commit('SET_ROLES', ['ROLE_DEFAULT']) |
|
|
|
} |
|
|
|