From 6c0feb9cb60e7c756df3bbe34e36fbe467b90d27 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 10:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 29 +++++++++++++----------------
 pages/im/private/chat.vue | 35 ++++++++++++++---------------------
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 3126049..73ef8b0 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -1,9 +1,8 @@
 <template>
     <view class="group--chat">
-        <list class="body" :show-scrollbar="false">
-            <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text
-                        class="text">{{ item.content.message }}</text> </view>
+        <scroll-view class="body" :show-scrollbar="false">
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="cell-system" v-if="item.senderUserId === '__system__'">{{ item.content.message }}</view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -16,9 +15,9 @@
                             :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -168,26 +167,24 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
-        .body {
+        .body {
+            overflow: scroll;
             flex: 1;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .cell-system {
-                    align-items: center;
-
-                    .text {
-                        font-size: 24rpx;
-                        color: $text-gray-m;
-                    }
+                    text-align: center;
                 }
 
                 .cell-item {
+                    display: flex;
+                    flex-direction: row;
                     width: 690rpx;
                     justify-content: flex-start;
                     align-items: flex-start;
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index a049abb..1175f79 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="chat">
         <!-- chat -->
-        <list class="body" :show-scrollbar="false">
-            <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
+        <scroll-view class="body" scroll-y>
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="time">{{ customCN(item.sentTime) }}</view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -20,9 +20,9 @@
                         </view>
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -79,7 +79,7 @@
             this.targetId = e.targetId
             this.userInfo = this.$store.getters.contactInfo(this.targetId)
             uni.setNavigationBarTitle({
-                title: this.userInfo.name
+                title: this.contact(this.targetId).name
             })
             // 获取消息列表
             this.getMessageList()
@@ -170,32 +170,25 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
         .body {
             flex: 1;
+            overflow: scroll;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .time {
-                    justify-content: center;
-                    align-items: center;
-                    padding-bottom: 20rpx;
-
-                    .text {
-                        background: #fff;
-                        font-size: 24rpx;
-                        color: #666;
-                        line-height: 40rpx;
-                        padding: 0 20rpx;
-                        border-radius: 10rpx;
-                    }
+                    text-align: center;
+                    font-size: 24rpx;
+                    color: #666;
                 }
 
                 .cell-item {
+                    display: flex;
                     width: 690rpx;
                     justify-content: flex-start;