From 20990ed3b166fdc20e577252379f23c3c03a9854 Mon Sep 17 00:00:00 2001
From: MoonLeeeaf <150461955+MoonLeeeaf@users.noreply.github.com>
Date: Sun, 23 Jun 2024 14:00:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(chat):=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ling_chair_http/chat-message.css | 11 +++++------
 ling_chair_http/handler.js       |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ling_chair_http/chat-message.css b/ling_chair_http/chat-message.css
index 664fe37..37a7eaf 100644
--- a/ling_chair_http/chat-message.css
+++ b/ling_chair_http/chat-message.css
@@ -19,14 +19,14 @@
  * limitations under the License.
  */
 
-.chat-message-right {
+.chat-message.right {
     display: flex;
     justify-content: flex-end;
     align-items: flex-start;
     margin: 13px 13px 13px 10%;
 }
 
-.chat-message-left {
+.chat-message.left {
     display: flex;
     justify-content: flex-start;
     align-items: flex-start;
@@ -71,15 +71,14 @@
     /* 左对齐元素 */
 }
 
-.chat-message-left .message-content-with-nickname-left .nickname,
-.chat-message-right .message-content-with-nickname-right .nickname {
+.chat-message .message-content-with-nickname-left .nickname,
+.chat-message .message-content-with-nickname-right .nickname {
     margin-right: 5px;
     font-size: medium;
     margin-top: 3px;
 }
 
-.chat-message-left > .avatar,
-.chat-message-right > .avatar {
+.chat-message > .avatar {
     width: 50px;
     height: 50px;
     border-radius: 50%;
diff --git a/ling_chair_http/handler.js b/ling_chair_http/handler.js
index 4867093..9cc3e49 100644
--- a/ling_chair_http/handler.js
+++ b/ling_chair_http/handler.js
@@ -523,7 +523,7 @@ class ChatPage {
 
         let temp
         if (name === localStorage.userName)
-            temp = `<div class="chat-message-right">
+            temp = `<div class="chat-message right">
                 <div class="message-content-with-nickname-right">
                 <span class="nickname">${nick}</span>
                 <div class="message-content mdui-card" tag="msg-card" id="msgid_${msgid}">
@@ -534,7 +534,7 @@ class ChatPage {
                 <img class="avatar" src="${CurrentUser.getUserHeadUrl(name)}" onerror="this.src='res/default_head.png'" />
                 </div>`
         else
-            temp = `<div class="chat-message-left">
+            temp = `<div class="chat-message left">
                 <img class="avatar" src="${CurrentUser.getUserHeadUrl(name)}" onerror="this.src='res/default_head.png'" />
                 <div class="message-content-with-nickname-left">
                 <span class="nickname">${nick}</span>
@@ -610,12 +610,13 @@ class ChatMsgAdapter {
             // CSS 牵一发而动全身 因此这个减少的数值是每天都要更改的
             viewBinding.chatPager.height(window.innerHeight - viewBinding.inputToolbar.height() - $("header.mdui-appbar").height() - viewBinding.chatTab.height() - 17)
             let ledi = this.resizeDick - window.innerHeight
+            let h = $('.chat-seesion[actived=true] > .chat-message:last-child').height()
             if (isMobile()) viewBinding.chatPager.get(0).scrollBy({
                 // 5.19晚10：56分调配出来的秘方
                 // < 0 为窗口变大
                 // cnm的，调试十万次就你tm检测不到底是吧，就你语法天天错误是吧
                 // 欺负我现在用不了电脑
-                top: (ledi >= 0 ? ledi * 2 : 60),
+                top: (ledi > 0 ? (this.isAtBottom() ? viewBinding.inputToolbar.height() : -h * ledi / 20) : -h * ledi / 20),
                 behavior: 'smooth'
             })
             this.resizeDick = window.innerHeight