From 08971f256dc5cd2e51832d61f4a02066f71a9745 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 09:58:15 +0800
Subject: [PATCH] =?UTF-8?q?chat=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 21 ++++++++++++++-------
 pages/im/index.vue        |  2 +-
 pages/im/private/chat.vue | 10 ++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index c62d24e..3126049 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -2,13 +2,18 @@
     <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>
+                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text
+                        class="text">{{ item.content.message }}</text> </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" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
@@ -163,11 +168,13 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        flex: 1;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
-
             flex: 1;
+
             .cell {
                 padding: 10rpx 30rpx;
 
diff --git a/pages/im/index.vue b/pages/im/index.vue
index b4b715d..0555e65 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -99,7 +99,7 @@
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
+                    if (code === 0) {
                         this.conversations = conversations
                     }
                 })
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index ea795d3..a049abb 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -15,7 +15,8 @@
                         <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
-                            <text :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
+                            <text
+                                :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
@@ -169,8 +170,9 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        flex: 1;
-
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
             flex: 1;
@@ -223,7 +225,7 @@
 
                             .state-text-active {
                                 font-size: $title-size-m - 2;
-                               color: #cecece;
+                                color: #cecece;
                             }
                         }
                     }