|
|
@ -51,7 +51,7 @@ const user = {
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
getInfo().then(res => {
|
|
|
|
getInfo().then(res => {
|
|
|
|
const user = res.user
|
|
|
|
const user = res.user
|
|
|
|
const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
|
|
|
|
const avatar = ( user.avatar == "" || user.avatar == null ) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
|
|
|
|
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
|
|
|
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
|
|
|
commit('SET_ROLES', res.roles)
|
|
|
|
commit('SET_ROLES', res.roles)
|
|
|
|
commit('SET_PERMISSIONS', res.permissions)
|
|
|
|
commit('SET_PERMISSIONS', res.permissions)
|
|
|
|