From 9ea250278d08761d278dd48409113af5c8366abe Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 18 Jun 2022 00:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E5=87=BA=E7=8E=B0=E7=99=BD=E5=B1=8F=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/DialogWrapper.vue    | 13 ++++++++++---
 .../sass/pages/components/dialog-wrapper.scss       |  5 +----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 1e08aeda2..e8434ed59 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -90,8 +90,7 @@
             @on-emoji="onEmoji">
             <template slot="header">
                 <div v-if="(allMsgs.length === 0 && dialogData.loading > 0) || nextPage > 0" class="dialog-item loading"><Loading/></div>
-                <div v-else-if="allMsgs.length > 0" class="dialog-item loaded">{{$L('已加载全部消息')}}</div>
-                <div v-else class="dialog-item nothing">{{$L('暂无消息')}}</div>
+                <div v-else-if="allMsgs.length === 0" class="dialog-item nothing">{{$L('暂无消息')}}</div>
             </template>
         </VirtualList>
 
@@ -839,7 +838,15 @@ export default {
                         const previousSize = typeof previousValue === "object" ? previousValue.size : scroller.getSize(previousValue)
                         return {size: previousSize + scroller.getSize(currentId)}
                     })
-                    scroller.scrollToOffset(offset.size);
+                    let size = this.$refs.scroller.getOffset() + offset.size;
+                    if (this.nextPage === 0) {
+                        size -= 36
+                    }
+                    scroller.scrollToOffset(size);
+                    setTimeout(_ => {
+                        // 预防出现白屏的情况
+                        scroller.scrollToOffset(size);
+                    }, 1)
                 });
             }).catch(() => {})
         },
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index f509d8a23..e0a765cf5 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -672,10 +672,7 @@
 
             }
 
-            &.loading,
-            &.loaded {
-                color: rgba($primary-desc-color, 0.6);
-                font-size: 13px;
+            &.loading {
                 height: 20px;
                 box-sizing: content-box;
                 justify-content: center;