From 4e9c93da1585ea1db0d8ee97407664c348f357d1 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 24 Jul 2024 14:48:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron.vite.config.mjs                      | 7 +------
 src/renderer/src/layout/components/Header.vue | 3 ---
 src/renderer/src/store/modules/user.js        | 7 ++++---
 src/renderer/src/views/profile/index.vue      | 1 +
 src/renderer/src/views/profile/userAvatar.vue | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index af2f6ab..7add6c4 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -26,12 +26,7 @@ export default defineConfig({
           target: 'http://192.168.2.52:7863',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
-        },
-        '/profile': {
-          target: 'http://192.168.2.52:7863',
-          ws: true,
-          changeOrigin: true
-        },
+        }
       },
     },
     plugins: [vue(), WindiCSS()],
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 9bdb708..e4642b3 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -113,9 +113,6 @@ const emits = defineEmits(['setLayout'])
 function setLayout() {
   emits('setLayout');
 }
-watch(()=> userStore.avatar,() => {
-  userImg.value = userStore.avatar;
-},{deep:true})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/src/store/modules/user.js b/src/renderer/src/store/modules/user.js
index df770b7..a471f2a 100644
--- a/src/renderer/src/store/modules/user.js
+++ b/src/renderer/src/store/modules/user.js
@@ -36,6 +36,7 @@ const useUserStore = defineStore(
       getInfo() {
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
+            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;
@@ -46,8 +47,8 @@ const useUserStore = defineStore(
             } else {
               this.roles = ['ROLE_DEFAULT']
             }
-            
-            
+
+
             this.id = user.userId
             this.userName = user.userName
             this.nickName = user.nickName;
@@ -70,7 +71,7 @@ const useUserStore = defineStore(
             this.plainpwd = user.plainpwd;
 
             this.roles = res.roles;
-            
+
             resolve(res)
           }).catch(error => {
             reject(error)
diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index 54e3ae2..c70b229 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -99,6 +99,7 @@ const state = reactive({
 
 function getUser() {
   getUserProfile().then((response) => {
+    response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
     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 c8c0be7..89965ca 100644
--- a/src/renderer/src/views/profile/userAvatar.vue
+++ b/src/renderer/src/views/profile/userAvatar.vue
@@ -84,7 +84,7 @@ const title = ref('修改头像')
 
 //图片裁剪数据
 const options = reactive({
-  img: userStore.avatar, // 裁剪图片的地址
+  img: userStore.user.avatar, // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 200, // 默认生成截图框宽度
   autoCropHeight: 200, // 默认生成截图框高度
@@ -155,7 +155,7 @@ function uploadImg() {
     uploadAvatar(formData).then((response) => {
       open.value = false
       options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl
-      userStore.avatar = options.img
+      userStore.user.avatar = options.img
       ElMessage({
         message: '上传成功',
         type: 'success',