From 423d31e5a443825a0dd3c8e8c14815e894d3a057 Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Mon, 9 Sep 2024 16:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/message/MessageItem.vue | 44 ++++++++------------------
 src/views/message/MessageLayout.vue    | 42 +++++++++++++++++++++---
 2 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/components/message/MessageItem.vue b/src/components/message/MessageItem.vue
index 249f03c..55bb791 100644
--- a/src/components/message/MessageItem.vue
+++ b/src/components/message/MessageItem.vue
@@ -5,13 +5,13 @@ import { userStore } from '@/stores'
 import { messageSysShowTime, messageBoxShowTime } from '@/utils/common'
 import AvatarIcon from './AvatarIcon.vue'
 
-const props = defineProps(['type', 'objectInfo', 'content'])
+const props = defineProps(['obj'])
 
 const userData = userStore()
 const isShowUserCard = ref(false)
 
 const isSelf = computed(() => {
-  return userData.user.account === props.objectInfo.account
+  return userData.user.account === props.obj.user.account
 })
 
 const showTime = computed(() => {
@@ -21,7 +21,7 @@ const showTime = computed(() => {
 })
 
 const msgTime = computed(() => {
-  return messageBoxShowTime(new Date())
+  return messageBoxShowTime(props.obj.time)
 })
 
 const handleUserCard = (flag) => {
@@ -34,10 +34,7 @@ const onShowUserCard = () => {
 </script>
 
 <template>
-  <div v-if="props.type === msgType.NO_MORE_MSG" class="no-more-message">
-    <span>当前无更多消息</span>
-  </div>
-  <div v-if="props.type === msgType.USER_MSG" class="user-message">
+  <div v-if="props.obj.type === msgType.USER_MSG" class="user-message">
     <span class="datetime">{{ showTime }}</span>
     <div class="message-container-wrapper">
       <el-container class="el-container-right" v-if="isSelf">
@@ -46,17 +43,15 @@ const onShowUserCard = () => {
             <el-header class="message-time">{{ msgTime }}</el-header>
             <el-main class="message-content">
               <div class="div-blank"></div>
-              <div class="div-content">
-                你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！
-              </div>
+              <div class="div-content">{{ props.obj.content }}</div>
             </el-main>
           </el-container>
         </el-main>
         <el-aside class="el-aside-right">
           <AvatarIcon
-            :showId="props.objectInfo.account"
-            :showName="props.objectInfo.nickName"
-            :showAvatarThumb="props.objectInfo.avatarThumb"
+            :showId="props.obj.user.account"
+            :showName="props.obj.user.nickName"
+            :showAvatarThumb="props.obj.user.avatarThumb"
             @click="onShowUserCard"
             :size="30"
           ></AvatarIcon>
@@ -66,9 +61,9 @@ const onShowUserCard = () => {
       <el-container class="el-container-left" v-else>
         <el-aside class="el-aside-left">
           <AvatarIcon
-            :showId="props.objectInfo.account"
-            :showName="props.objectInfo.nickName"
-            :showAvatarThumb="props.objectInfo.avatarThumb"
+            :showId="props.obj.user.account"
+            :showName="props.obj.user.nickName"
+            :showAvatarThumb="props.obj.user.avatarThumb"
             @click="onShowUserCard"
             :size="30"
           ></AvatarIcon>
@@ -77,9 +72,7 @@ const onShowUserCard = () => {
           <el-container class="message-content-wrapper">
             <el-header class="message-time">{{ msgTime }}</el-header>
             <el-main class="message-content">
-              <div class="div-content">
-                你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！你好，很高兴认识你！
-              </div>
+              <div class="div-content">{{ props.obj.content }}</div>
               <div class="div-blank"></div>
             </el-main>
           </el-container>
@@ -90,22 +83,11 @@ const onShowUserCard = () => {
   <UserCard
     :isShow="isShowUserCard"
     @update:isShow="handleUserCard"
-    :user="props.objectInfo"
+    :user="props.obj.user"
   ></UserCard>
 </template>
 
 <style lang="scss" scoped>
-.no-more-message {
-  width: 100%;
-  height: 40px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 14px;
-  color: gray;
-  user-select: text;
-}
-
 .user-message {
   width: 100%;
   margin-top: 15px;
diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue
index 38596bc..df1d7a8 100644
--- a/src/views/message/MessageLayout.vue
+++ b/src/views/message/MessageLayout.vue
@@ -115,6 +115,29 @@ const onLoadMore = () => {
   loadMoreTips.value = ''
 }
 
+const testdata = ref([
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你好呀' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我很好' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你是谁啊？' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我是bob呀' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你好呀' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我很好' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你是谁啊？' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我是bob呀' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你好呀' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我很好' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你是谁啊？' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我是bob呀' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你好呀' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我很好' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你是谁啊？' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我是bob呀' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你好呀' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我很好' },
+  {user: {account:'a00001', nickName: '甘道夫', avatarThumb: ''}, type: msgType.USER_MSG, time: new Date(), content: '你是谁啊？' },
+  {user: userData.user, type: msgType.USER_MSG, time: new Date(), content: '我是bob呀' },
+])
+
 </script>
 
 <template>
@@ -184,10 +207,8 @@ const onLoadMore = () => {
               </div>
             </div>
             <div class="message-main">
-              <MessageItem :type="msgType.NO_MORE_MSG"></MessageItem>
-              <MessageItem :type="msgType.USER_MSG" :objectInfo="curObject"></MessageItem>
-              <MessageItem :type="msgType.USER_MSG" :objectInfo="userData.user"></MessageItem>
-              <MessageItem></MessageItem>
+              <span class="no-more-message">当前无更多消息</span>
+              <MessageItem v-for="(item, index) in testdata" :key="index" :obj="item"></MessageItem>
             </div>
           </div>
           <div class="input-box bdr-t" :style="{ height: inputBoxHeight + 'px' }">
@@ -329,12 +350,14 @@ const onLoadMore = () => {
         padding: 0;
         display: flex;
         flex-direction: column;
+        overflow: hidden; // 禁用它的滚动条
 
         .show-box {
           width: 100%;
           display: flex;
           flex: 1;
           position: relative;
+          overflow-y: scroll; // 用它的滚动条
 
           .top-loading {
             width: 100%;
@@ -363,6 +386,17 @@ const onLoadMore = () => {
             width: 100%;
             height: 100%;
             padding: 15px;
+
+            .no-more-message {
+              width: 100%;
+              height: 40px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              font-size: 14px;
+              color: gray;
+              user-select: text;
+            }
           }
         }