From ef90faf77bb0ec0dfd1ab0b5652450b8a86c8ba9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 30 Apr 2025 20:35:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=B3=E9=97=AD=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E4=B8=8A=E4=BC=A0=E6=97=B6=EF=BC=8C=E5=8F=88=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=BC=80=20reactor=EF=BC=9A=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E4=B8=8A=E4=BC=A0=E6=97=B6=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=20httpRequest=20=EF=BC=8C=E5=8F=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=89=8D=E7=AB=AF=E7=9B=B4=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/profile.ts              | 14 +++++---------
 src/components/Cropper/src/CopperModal.vue  |  3 ++-
 src/views/Profile/components/UserAvatar.vue | 16 ++++++++++++----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/api/system/user/profile.ts b/src/api/system/user/profile.ts
index 1e80e8542..2e2790129 100644
--- a/src/api/system/user/profile.ts
+++ b/src/api/system/user/profile.ts
@@ -32,10 +32,11 @@ export interface ProfileVO {
 }
 
 export interface UserProfileUpdateReqVO {
-  nickname: string
-  email: string
-  mobile: string
-  sex: number
+  nickname?: string
+  email?: string
+  mobile?: string
+  sex?: number
+  avatar?: string
 }
 
 // 查询用户个人信息
@@ -58,8 +59,3 @@ export const updateUserPassword = (oldPassword: string, newPassword: string) =>
     }
   })
 }
-
-// 用户头像上传
-export const uploadAvatar = (data) => {
-  return request.upload({ url: '/system/user/profile/update-avatar', data: data })
-}
diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
index 27052b8a9..05b8d87b9 100644
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div @click.stop>
     <Dialog
       v-model="dialogVisible"
       :canFullscreen="false"
@@ -181,6 +181,7 @@ function openModal() {
 }
 
 function closeModal() {
+  debugger
   dialogVisible.value = false
 }
 
diff --git a/src/views/Profile/components/UserAvatar.vue b/src/views/Profile/components/UserAvatar.vue
index 49ccd2aae..8f3bedbf1 100644
--- a/src/views/Profile/components/UserAvatar.vue
+++ b/src/views/Profile/components/UserAvatar.vue
@@ -12,9 +12,11 @@
 </template>
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
-import { uploadAvatar } from '@/api/system/user/profile'
+import { updateUserProfile } from '@/api/system/user/profile'
 import { CropperAvatar } from '@/components/Cropper'
 import { useUserStore } from '@/store/modules/user'
+import { useUpload } from '@/components/UploadFile/src/useUpload'
+import { UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
 
 // TODO @芋艿：合并到 ProfileUser 组件中，更简洁一点
 defineOptions({ name: 'UserAvatar' })
@@ -27,10 +29,16 @@ const userStore = useUserStore()
 
 const cropperRef = ref()
 const handelUpload = async ({ data }) => {
-  // TODO @芋艿：去掉这个接口，使用 url 直接上传
-  const res = await uploadAvatar({ avatarFile: data })
+  const { httpRequest } = useUpload()
+  const avatar = ((await httpRequest({
+    file: data,
+    filename: 'avatar.png',
+  } as UploadRequestOptions)) as unknown as { data: string }).data
+  await updateUserProfile({ avatar })
+
+  // 关闭弹窗，并更新 userStore
   cropperRef.value.close()
-  userStore.setUserAvatarAction(res.data)
+  await userStore.setUserAvatarAction(avatar)
 }
 </script>