diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 009a47d..f077af5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,10 +1,11 @@ -import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' +import { login, logout, getInfo } from '@/api/login'; +import { getToken, setToken, removeToken } from '@/utils/auth'; const user = { state: { token: getToken(), name: '', + userId: '', avatar: '', roles: [], permissions: [] @@ -12,84 +13,98 @@ const user = { mutations: { SET_TOKEN: (state, token) => { - state.token = token + state.token = token; }, SET_NAME: (state, name) => { - state.name = name + state.name = name; + }, + SET_USER_ID: (state, userId) => { + state.userId = userId; + localStorage.setItem('userId', userId); }, SET_AVATAR: (state, avatar) => { - state.avatar = avatar + state.avatar = avatar; }, SET_ROLES: (state, roles) => { - state.roles = roles + state.roles = roles; }, SET_PERMISSIONS: (state, permissions) => { - state.permissions = permissions + state.permissions = permissions; } }, actions: { // 登录 Login({ commit }, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code + const username = userInfo.username.trim(); + const password = userInfo.password; + const code = userInfo.code; return new Promise((resolve, reject) => { - login(username, password, code).then(res => { - setToken(res.data.token) - commit('SET_TOKEN', res.data.token) - resolve() - }).catch(error => { - reject(error) - }) - }) + login(username, password, code) + .then(res => { + setToken(res.data.token); + commit('SET_TOKEN', res.data.token); + resolve(); + }) + .catch(error => { + reject(error); + }); + }); }, // 获取用户信息 GetInfo({ commit, state }) { return new Promise((resolve, reject) => { - getInfo(state.token).then(res => { - const user = res.data - const avatar = !res.data.icon ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.icon; - if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLES', res.roles) - // commit('SET_PERMISSIONS', res.permissions) - } else { - commit('SET_ROLES', ['ROLE_DEFAULT']) - } - commit('SET_NAME', user.userName) - commit('SET_AVATAR', avatar) - resolve(res) - }).catch(error => { - reject(error) - }) - }) + getInfo(state.token) + .then(res => { + const user = res.data; + const avatar = !res.data.icon + ? require('@/assets/image/profile.jpg') + : process.env.VUE_APP_BASE_API + user.icon; + if (res.roles && res.roles.length > 0) { + // 验证返回的roles是否是一个非空数组 + commit('SET_ROLES', res.roles); + // commit('SET_PERMISSIONS', res.permissions) + } else { + commit('SET_ROLES', ['ROLE_DEFAULT']); + } + commit('SET_NAME', user.userName); + commit('SET_USER_ID', user.userId); + commit('SET_AVATAR', avatar); + resolve(res); + }) + .catch(error => { + reject(error); + }); + }); }, - + // 退出系统 LogOut({ commit, state }) { return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - commit('SET_PERMISSIONS', []) - removeToken() - resolve() - }).catch(error => { - reject(error) - }) - }) + logout(state.token) + .then(() => { + commit('SET_TOKEN', ''); + commit('SET_ROLES', []); + commit('SET_PERMISSIONS', []); + removeToken(); + resolve(); + }) + .catch(error => { + reject(error); + }); + }); }, // 前端 登出 FedLogOut({ commit }) { return new Promise(resolve => { - commit('SET_TOKEN', '') - removeToken() - resolve() - }) + commit('SET_TOKEN', ''); + removeToken(); + resolve(); + }); } } -} +}; -export default user +export default user; diff --git a/src/views/front/unscramble/add.vue b/src/views/front/unscramble/add.vue index de76fe6..b83e4ec 100644 --- a/src/views/front/unscramble/add.vue +++ b/src/views/front/unscramble/add.vue @@ -80,7 +80,7 @@ export default { label: '发改' }, { - value: 'qita', + value: 'OTHER', label: '其他' } ], diff --git a/src/views/front/unscramble/index.vue b/src/views/front/unscramble/index.vue index 40b9570..fa09bf9 100644 --- a/src/views/front/unscramble/index.vue +++ b/src/views/front/unscramble/index.vue @@ -108,7 +108,7 @@ export default { label: '发改' }, { - value: 'qita', + value: 'OTHER', label: '其他' } ] diff --git a/src/views/policy/library/add.vue b/src/views/policy/library/add.vue index 5553a7b..31f90a6 100644 --- a/src/views/policy/library/add.vue +++ b/src/views/policy/library/add.vue @@ -110,7 +110,7 @@ export default { label: '发改' }, { - value: 'qita', + value: 'OTHER', label: '其他' } ], diff --git a/src/views/policy/library/index.vue b/src/views/policy/library/index.vue index f4ec02e..7e98059 100644 --- a/src/views/policy/library/index.vue +++ b/src/views/policy/library/index.vue @@ -270,7 +270,7 @@ export default { label: '发改' }, { - value: 'qita', + value: 'OTHER', label: '其他' } ], diff --git a/src/views/service/index.vue b/src/views/service/index.vue index 61f43c9..99677c8 100644 --- a/src/views/service/index.vue +++ b/src/views/service/index.vue @@ -1,5 +1,58 @@ + + + + diff --git a/src/views/technology/achievement/index.vue b/src/views/technology/achievement/index.vue index 67ec0aa..f47d79a 100644 --- a/src/views/technology/achievement/index.vue +++ b/src/views/technology/achievement/index.vue @@ -114,7 +114,7 @@ export default { label: '发改' }, { - value: 'qita', + value: 'OTHER', label: '其他' } ]