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

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

@@ -9,14 +9,14 @@
       <div class="user-list-content">
         <div v-for="user in filteredUsers" :key="user.userId" class="user-item"
           :class="{ active: currentUser?.userId === user.userId }" @click="selectUser(user)">
-          <el-avatar :size="40" :src="user.conversationAvatar" />
+          <el-avatar :size="40" :src="user.conversationAvatar || logo" />
           <div class="user-info">
             <div class="user-name">{{ user.userName }}</div>
             <div class="last-message">{{ user.newestMsgContent }}</div>
           </div>
           <div class="message-time">
             <div class="newestMsgTime">{{ formatTime(user.newestMsgTime) }}</div>
-            <div class="msgUnreadCount" v-if="user.msgUnreadCount && user.msgUnreadCount>0">{{ user.msgUnreadCount }}</div>
+            <div class="msgUnreadCount" v-if="user.msgUnreadCount && user.msgUnreadCount>0 && user.senderId !== userId">{{ user.msgUnreadCount }}</div>
           </div>
         </div>
       </div>
@@ -38,7 +38,7 @@
           <div v-for="message in messages" :key="message.senderId" class="message-item"
             :class="{ 'message-self': message.senderId === userId }">
             <el-avatar :size="40"
-              :src="message.senderId === userId ? userStore.avatar : currentMessages.conversationAvatar" />
+              :src="message.senderId === userId ? userStore.avatar : currentMessages.conversationAvatar || logo" />
             <div class="message-content">
               <div class="message-time" :style="{ textAlign: message.senderId === userId ? 'right' : 'left' }">{{
                 message.msgSendTime }}</div>
@@ -84,7 +84,7 @@ import { getList, sendMsg, getListConversationInfo, setRead, getHistoryMsg } fro
 import { debounce } from '@/utils/index.js';
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore();
-
+import logo from '@/assets/logo/logo.png'
 const userId = computed(() => {
   return userStore.user.userId
 })
@@ -361,7 +361,7 @@ onUnmounted(() => {
 <style scoped>
 .chat-container {
   display: flex;
-  height: 100vh;
+  height: calc(100vh - 130px);
   background-color: #f5f5f5;
 }
 
@@ -464,7 +464,7 @@ onUnmounted(() => {
   text-align: left;
 
   display: flex;
-  align-items: center;
+  align-items: end;
   justify-content: center;
   flex-direction: column;
 }