Merge branch 'main' into lyc-dev

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()],

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>

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;

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

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',