chenjj 3 months ago
parent
commit
c8ea728325
1 changed files with 19 additions and 6 deletions
  1. 19 6
      src/views/message/index.vue

+ 19 - 6
src/views/message/index.vue

@@ -11,12 +11,12 @@
           :class="{ active: currentUser?.userId === user.userId }" @click="selectUser(user)">
           <el-avatar :size="40" :src="user.conversationAvatar || logo" />
           <div class="user-info">
-            <div class="user-name">{{ user.userName }}</div>
+            <div class="user-name">{{ user.conversationTitle }}{{ user.userName }}</div>
             <div class="last-message">{{ user.newestMsgContent }}</div>
           </div>
-          <div class="message-time">
+          <div class="message-time2">
             <div class="newestMsgTime">{{ formatTime(user.newestMsgTime) }}</div>
-            <div class="msgUnreadCount" v-if="user.msgUnreadCount && user.msgUnreadCount>0 && user.senderId !== userId">{{ user.msgUnreadCount }}</div>
+            <div class="msgUnreadCount" v-if="user.msgUnreadCount && user.msgUnreadCount>0 && user.senderId !== districtCode">{{ user.msgUnreadCount }}</div>
           </div>
         </div>
       </div>
@@ -36,11 +36,11 @@
             <span>加载更多消息...</span>
           </div>
           <div v-for="message in messages" :key="message.senderId" class="message-item"
-            :class="{ 'message-self': message.senderId === userId }">
+            :class="{ 'message-self': message.senderId === districtCode }">
             <el-avatar :size="40"
-              :src="message.senderId === userId ? userStore.avatar : currentMessages.conversationAvatar || logo" />
+              :src="message.senderId === districtCode ? userStore.avatar : currentMessages.conversationAvatar || logo" />
             <div class="message-content">
-              <div class="message-time" :style="{ textAlign: message.senderId === userId ? 'right' : 'left' }">{{
+              <div class="message-time" :style="{ textAlign: message.senderId === districtCode ? 'right' : 'left' }">{{
                 message.msgSendTime }}</div>
               <div class="message-bubble">
                 <template v-if="message.msgType === '1'">
@@ -88,6 +88,9 @@ import logo from '@/assets/logo/logo.png'
 const userId = computed(() => {
   return userStore.user.userId
 })
+const districtCode = computed(() => {
+  return userStore.user.districtCode
+})
 console.log("TCL: userId -> userId", userId)
 
 
@@ -408,6 +411,9 @@ onUnmounted(() => {
 .user-name {
   font-weight: bold;
   margin-bottom: 4px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .last-message {
@@ -463,6 +469,13 @@ onUnmounted(() => {
   margin-bottom: 4px;
   text-align: left;
 
+}
+.message-time2 {
+  font-size: 12px;
+  color: #999;
+  margin-bottom: 4px;
+  text-align: left;
+
   display: flex;
   align-items: end;
   justify-content: center;