From 2decfe86f129fe2d7793446b37cb2e603e91bdef Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Thu, 26 Sep 2024 11:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=8D=E8=B6=B3pageSize,=E5=88=99=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E6=B2=A1=E6=9C=89=E6=9B=B4=E5=A4=9A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/message/MessageLayout.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue
index a1c8faa..57be58e 100644
--- a/src/views/message/MessageLayout.vue
+++ b/src/views/message/MessageLayout.vue
@@ -90,7 +90,7 @@ onUnmounted(() => {
 })
 
 const handleMsgListScroll = async () => {
-  if (msgListDiv.value.scrollTop === 0) {
+  if (msgListDiv.value.scrollTop === 0 && !isLoadMoreLoading.value && !hasNoMoreMsg.value) {
     const scrollHeight = msgListDiv.value.scrollHeight
     if (messageData.msgRecordsList[sessionId.value]?.length <= capacity.value) {
       await pullMsg(1, msgRecords.value[0].msgId)
@@ -189,9 +189,10 @@ const pullMsg = async (mode = 0, ref = -1) => {
     return
   }
 
+  const pageSize = 30;
   const params = {
     sessionId: sessionId.value, 
-    pageSize: 30, 
+    pageSize: pageSize, 
     mode: mode, 
     refMsgId: ref
   }
@@ -209,11 +210,11 @@ const pullMsg = async (mode = 0, ref = -1) => {
       lastMsgTime: res.data.data.msgList[msgCount - 1].msgTime
     })
   }
-  else {
-    if (mode === 1) {
-      hasNoMoreMsg.value = true
-    }
+
+  if (msgCount < pageSize) {
+    hasNoMoreMsg.value = true
   }
+
   if (mode === 0) isLoading.value = false
   if (mode === 1) isLoadMoreLoading.value = false
 }