From 0fe264054cff4cd19854c28cca949e22e03970c3 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Thu, 15 Aug 2024 14:10:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8A=E4=BC=A0=E5=AD=98=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E4=B9=8B=E5=89=8D=E5=8F=96=E7=9A=84?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=8E=A5=E5=8F=A3getUserProfile=EF=BC=88?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8E=BB=E6=8E=89=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80dev-api=E4=BF=9D=E8=AF=81=E5=9B=BE=E7=89=87=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/system/user.js           | 6 ++++++
 src/renderer/src/store/modules/user.js        | 2 +-
 src/renderer/src/views/profile/index.vue      | 6 +++---
 src/renderer/src/views/profile/userAvatar.vue | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

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 = () => {