diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 79550b8..401d675 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ import { permissionListToPermissions } from '@/utils/permissions' import defaultAvatar from '@/assets/logo.png' import { logout as ssoLogout } from '@/utils/sso' import { baseURL } from '@/utils/request' +import avatar from 'element-ui/packages/avatar' const state = { token: getToken(), @@ -86,8 +87,9 @@ const actions = { commit('SET_NAME', name) commit('SET_INFO', info) - const isExternal = /^(https?:|mailto:|tel:|\/\/)/.test(info.avatarUrl) - commit('SET_AVATAR', isExternal ? info.avatarUrl : info.avatarUrl ? baseURL + info.avatarUrl : null) + const avatarUrl = info && info.avatarUrl ? info.avatarUrl : null + const isExternal = /^(https?:|mailto:|tel:|\/\/)/.test(avatarUrl) + commit('SET_AVATAR', isExternal ? avatarUrl : avatarUrl ? baseURL + avatarUrl : null) resolve(data) }).catch(error => { reject(error)