修改头像上报avatarId

src/components/card/GroupCard.vue

@@ -217,6 +217,8 @@ const onShowUserCard = (account) => {
             ...messageData.sessionList[sessionId].objectInfo,
             nickName: res.data.data.nickName,
             signature: res.data.data.signature,
+            avatarId: res.data.data.avatarId,
+            avatar: res.data.data.avatar,
             avatarThumb: res.data.data.avatarThumb,
             gender: res.data.data.gender,
             phoneNum: res.data.data.phoneNum,
@@ -357,18 +359,18 @@ const onReturnInfo = () => {
   groupCardData.setShowModel('info')
 }
 
-const onNewAvatar = ({ avatar, avatarThumb }) => {
+const onNewAvatar = ({ avatarId, avatar, avatarThumb }) => {
   const loadingInstance = ElLoading.service(el_loading_options)
   groupUpdateInfoService({
     groupId: groupCardData.groupId,
-    avatar: avatar,
-    avatarThumb: avatarThumb
+    avatarId: avatarId
   })
     .then(() => {
       groupData.setGroupInfo({
         groupId: groupCardData.groupId,
         groupInfo: {
           ...groupInfo.value,
+          avatarId: avatarId,
           avatar: avatar,
           avatarThumb: avatarThumb
         }

src/components/common/EditAvatar.vue

@@ -30,7 +30,7 @@ const avatar = computed(() => {
 
 // 打开的时候触发
 const onOpen = () => {
-  fileName.value = avatar.value?.split('/').pop()
+  fileName.value = avatar.value?.split('/').pop().split('?')[0]
   srcImg.value = avatar.value ? import.meta.env.VITE_OSS_CORS_FLAG + avatar.value : avatar.value
   previewImg.value = srcImg.value
   resetData.value = {
@@ -71,6 +71,7 @@ const onUpload = async () => {
     try {
       const res = await mtsUploadService({ file: file, storeType: 0 })
       emit('update:newAvatar', {
+        avatarId: res.data.data.objectId,
         avatar: res.data.data.originUrl,
         avatarThumb: res.data.data.thumbUrl
       })

src/views/setting/sub/SettingPersonal.vue

@@ -12,6 +12,7 @@ import { ElMessage } from 'element-plus'
 const userData = userStore()
 // 准备表单数据
 const formModel = ref({})
+const avatarUrl = ref(userData.user.avatar)
 const isLoading = ref(false)
 const isShowEditAvatar = ref(false)
 
@@ -22,13 +23,13 @@ onMounted(async () => {
   })
 })
 
-const onNewAvatar = ({ avatar, avatarThumb }) => {
-  formModel.value.avatar = avatar
-  formModel.value.avatarThumb = avatarThumb
+const onNewAvatar = ({ avatarId, avatar }) => {
+  formModel.value.avatarId = avatarId
+  avatarUrl.value = avatar
 }
 
 const onSave = () => {
-  if (!isSomeChanged()) {
+  if (!isSomeOneChanged()) {
     ElMessage.warning('您还没有修改任何信息哦！')
     return
   }
@@ -44,14 +45,13 @@ const onSave = () => {
   })
 }
 
-const isSomeChanged = () => {
+const isSomeOneChanged = () => {
   return !(
     formModel.value.nickName === userData.user.nickName &&
     formModel.value.gender === userData.user.gender &&
     formModel.value.birthday === showTimeFormatDay(userData.user.birthday) &&
     formModel.value.signature === userData.user.signature &&
-    formModel.value.avatar === userData.user.avatar &&
-    formModel.value.avatarThumb === userData.user.avatarThumb
+    formModel.value.avatarId === userData.user.avatarId
   )
 }
 
@@ -70,7 +70,7 @@ const displayPhone = computed(() => {
     <el-container class="el-container__body">
       <el-aside width="240px">
         <img
-          :src="formModel.avatar || defaultImg"
+          :src="avatarUrl || defaultImg"
           alt="图片加载错误"
           @click="isShowEditAvatar = true"
           style="text-align: center; border-radius: 10px"