diff --git a/src/renderer/src/api/system/user.js b/src/renderer/src/api/system/user.js index b7e9e23..f8b74f0 100644 --- a/src/renderer/src/api/system/user.js +++ b/src/renderer/src/api/system/user.js @@ -50,3 +50,9 @@ export function updateUserInfo(data) { data: data }) } +export function getUserInfo(userId) { + return request({ + url: '/system/user/' + userId, + method: 'get' + }) +} diff --git a/src/renderer/src/store/modules/user.js b/src/renderer/src/store/modules/user.js index 3878eb7..3a45327 100644 --- a/src/renderer/src/store/modules/user.js +++ b/src/renderer/src/store/modules/user.js @@ -37,7 +37,7 @@ const useUserStore = defineStore('user', { return new Promise((resolve, reject) => { getInfo() .then((res) => { - res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar + // res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar const user = res.user this.user = user const avatar = user.avatar == '' || user.avatar == null ? defAva : user.avatar diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue index db29e01..c3af7e2 100644 --- a/src/renderer/src/views/profile/index.vue +++ b/src/renderer/src/views/profile/index.vue @@ -97,10 +97,10 @@ const state = reactive({ postGroup: {} }) -function getUser() { +async function getUser() { getUserProfile().then((response) => { - response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar - state.user = response.data + // response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar + Object.assign(state.user,response.data) state.roleGroup = response.roleGroup state.postGroup = response.postGroup }) diff --git a/src/renderer/src/views/profile/userAvatar.vue b/src/renderer/src/views/profile/userAvatar.vue index 5e945c3..3ddf66f 100644 --- a/src/renderer/src/views/profile/userAvatar.vue +++ b/src/renderer/src/views/profile/userAvatar.vue @@ -68,7 +68,7 @@ function uploadImg(data) { /** 关闭窗口 */ function closeDialog() { - // options.img = userStore.avatar + options.img = userStore.user.avatar options.visible = false } const cancle = () => {