From 972f83ca064543cb5541df98c0e5f9a3537d81a6 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 22 Feb 2023 22:53:21 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/user/account/setting/UserInfo.vue  | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/views/system/user/account/setting/UserInfo.vue b/src/views/system/user/account/setting/UserInfo.vue
index 677dce0..5f86cda 100644
--- a/src/views/system/user/account/setting/UserInfo.vue
+++ b/src/views/system/user/account/setting/UserInfo.vue
@@ -11,7 +11,7 @@
         <div class="change-avatar">
           <CropperAvatar
             :uploadApi="commonUpload"
-            :value="getUserInfo.avatar"
+            :value="userInfoStore.avatar"
             btnText="更换头像"
             :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
             :width="150"
@@ -34,8 +34,7 @@
   import { commonUpload } from '/@/api/platform/core/controller/upload';
   import { useContentHeight } from '/@/hooks/web/useContentHeight';
   import { User } from '/@/api/platform/core/entity/user';
-  import {isBase64image, isEmpty, isUrl} from '/@/utils/is';
-  import { assignWith } from 'lodash-es';
+  import { isBase64image, isUrl } from '/@/utils/is';
 
   interface State {
     baseInfoBtnLoading: boolean;
@@ -93,26 +92,16 @@
           const formData = await validate();
           // 设置图片路径
           !isBase64image(state.userInfo.avatar) &&
-          (formData.avatar = isUrl(state.userInfo.avatar)
-              ? state.userInfo.avatar
-              : state.userInfo.avatar.replace(/\/[^\/]+/, ''));
+          (formData.avatar = state.userInfo.avatar);
           state.baseInfoBtnLoading = true;
           await editUser(formData);
           createMessage.success('保存成功!');
-          const result = await getUser(userInfoStore.id);
-          state.userInfo = result.result;
-          // 更新用户状态管理与用户信息数据
-          const userinfo = userStore.getUserInfo;
-          assignWith(userinfo, state.userInfo, (objValue, srcValue)=> !isEmpty(srcValue) ? srcValue : objValue);
-          userStore.setUserInfo(userinfo);
-          await setFieldsValue(result.result);
+          await userStore.getUserInfoAction();
         } finally {
           state.baseInfoBtnLoading = false;
         }
       }
 
-      const getUserInfo = computed((): User => state.userInfo || {});
-
       function handleAvatarChange({ src, data }) {
         state.userInfo.avatar = data.url;
       }
@@ -120,7 +109,7 @@
       return {
         register,
         wrapperRef,
-        getUserInfo,
+        userInfoStore,
         commonUpload,
         handleAvatarChange,
         getContentStyle,