刘洋 преди 2 години
родител
ревизия
7b1e00c7b7
променени са 2 файла, в които са добавени 14 реда и са изтрити 3 реда
  1. 5 1
      src/components/shared/message/MessageList.vue
  2. 9 2
      src/components/shared/message/MessageWindow.vue

+ 5 - 1
src/components/shared/message/MessageList.vue

@@ -30,7 +30,11 @@
         <div class="flex items-center p-base message-info-header">
           <div class="flex items-center send-user">
             <!-- <span class="m-r-mini">发件人</span> -->
-            <span class="radius-base user-name">{{ currentMessage?.sendUserName }}</span>
+            <span class="radius-base user-name">{{
+              mainStore?.myUserInfo?.id == currentMessage?.sendUserId
+                ? currentMessage?.receiveUserName
+                : currentMessage?.sendUserName
+            }}</span>
           </div>
           <!-- <div class="grid pointer m-l-auto close-icon" @click="$emit('close')">
             <el-icon><close /></el-icon>

+ 9 - 2
src/components/shared/message/MessageWindow.vue

@@ -38,7 +38,7 @@
 
 <script setup lang="ts" name="MessageWindow">
 /** 发送/回复消息 */
-import { ref, computed, withDefaults, nextTick } from 'vue'
+import { ref, computed, withDefaults, nextTick, watch } from 'vue'
 import useVModel from '@/hooks/useVModel'
 import BaseDialog from '@/components/element/BaseDialog.vue'
 import MessageHistory from '@/components/shared/message/MessageList.vue'
@@ -82,7 +82,14 @@ const refresh = () => {
     visible.value = true
   })
 }
-
+watch(visible, () => {
+  if (!visible.value) {
+    replyUserId.value = null
+    replyUserName.value = null
+    currentMessage.value = null
+    modalType.value = 'view'
+  }
+})
 const onChangeType = (type: ModalType) => {
   modalType.value = type
 }