diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c20f8fe..c6b0e30 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -10,7 +10,7 @@ const user = { welcome: '', avatar: '', roles: [], - buttons: [], // 按钮权限 + buttons: [], // 按钮权限 info: {} }, @@ -38,7 +38,7 @@ const user = { actions: { // 登录 - Login ({ commit }, userInfo) { + Login({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { storage.set(ACCESS_TOKEN, response.token, 24 * 60 * 60 * 1000) @@ -51,7 +51,7 @@ const user = { }, // 获取用户信息 - GetInfo ({ commit }) { + GetInfo({ commit }) { return new Promise((resolve, reject) => { getLoginUser().then(response => { if (response.code === 200) { @@ -59,7 +59,7 @@ const user = { commit('SET_ROLES', 1) commit('SET_BUTTONS', data.permissions) commit('SET_INFO', data) - commit('SET_NAME', { name: data.userName, welcome: welcome() }) + commit('SET_NAME', { name: data.user.userName, welcome: welcome() }) if (data.avatar != null) { commit('SET_AVATAR', process.env.VUE_APP_API_BASE_URL + '/sysFileInfo/preview?id=' + data.avatar) } @@ -72,9 +72,9 @@ const user = { }) }) }, - + // 登出 - Logout ({ commit, state }) { + Logout({ commit, state }) { return new Promise((resolve) => { logout().then(() => { resolve()