From 64e53b3dd08078dc0cae19ee26dfb01134be8778 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 15 Apr 2022 22:09:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BE=A4=E8=81=8A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=98=BE=E7=A4=BA=E5=8F=91=E8=A8=80=E4=BA=BA?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/pages/manage/messenger.vue      |  9 +++++++-
 .../assets/sass/pages/page-messenger.scss     | 23 ++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 885d6cf8a..ab5565cc6 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -57,7 +57,14 @@
                                     <Icon v-if="dialog.type == 'user' && lastMsgReadDone(dialog.last_msg)" :type="lastMsgReadDone(dialog.last_msg)"/>
                                     <em v-if="dialog.last_at">{{$A.formatTime(dialog.last_at)}}</em>
                                 </div>
-                                <div class="dialog-text no-dark-mode">{{formatLastMsg(dialog.last_msg)}}</div>
+                                <div class="dialog-text no-dark-mode">
+                                    <UserAvatar
+                                        v-if="dialog.type=='group' && dialog.last_msg.userid != userId"
+                                        :userid="dialog.last_msg.userid"
+                                        :show-name="true"
+                                        :show-icon="false"/>
+                                    <div class="last-text">{{formatLastMsg(dialog.last_msg)}}</div>
+                                </div>
                             </div>
                             <Badge class="dialog-num" :count="$A.getDialogUnread(dialog)"/>
                         </li>
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 5c7e8bfe7..7aba18da2 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -166,9 +166,26 @@
                                     color: #999999;
                                     font-size: 12px;
                                     line-height: 24px;
-                                    white-space: nowrap;
-                                    overflow: hidden;
-                                    text-overflow: ellipsis;
+                                    display: flex;
+                                    align-items: center;
+                                    .common-avatar {
+                                        padding-right: 4px;
+                                        margin-right: 4px;
+                                        position: relative;
+                                        &:after {
+                                            content: ":";
+                                            position: absolute;
+                                            top: 50%;
+                                            transform: translateY(-50%);
+                                            right: 0;
+                                        }
+                                    }
+                                    .last-text {
+                                        flex: 1;
+                                        white-space: nowrap;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                    }
                                 }
                             }
                             .dialog-num {