From 780ffd647adf1c72c34947aded60aa05999a4859 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 14:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AF=A6=E6=83=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/friends/index.vue   | 11 +++--------
 pages/im/friends/pending.vue |  2 +-
 pages/im/private/chat.vue    |  8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 425daec..7a46ae7 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -20,7 +20,7 @@
                             :src="contact(friendItem.targetId).portraitUrl" />
                         <view class="info">
                             <view class="name">{{ contact(friendItem.targetId).name }}</view>
-                            <!-- <view class="address">Hash:{{ friendItem.address }}</view> -->
+                            <!-- <view class="address">地址:{{ friendItem.address }}</view> -->
                         </view>
                     </view>
                 </u-index-item>
@@ -66,13 +66,8 @@
                 })
             },
             checkNewFriendPending() {
-                // 获取是否有新的好友申请
-                RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], 1000, 0, (res) => {
-                    if (res.code === 0) {
-                        this.pendingCount = res.conversations.filter((item) => {
-                            return item.objectName == RongIMLib.ObjectName.ContactNotification
-                        }).length
-                    }
+                im.getPendingList((pendings) => {
+                    this.pendingCount = pendings.length
                 })
             },
             toGroup() {
diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index efe53e6..e0d2212 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -15,7 +15,7 @@
 <script>
     import applyCell from '../components/friendApplyCell'
     import im from '@/utils/im/index.js'
-
+
     export default {
         components: {
             applyCell
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index c415f0b..ec7131d 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -57,7 +57,7 @@
         computed: {
             latestMessage() {
                 if (this.messages.length) {
-                    return this.messages[this.messages.length - 1]
+                    return this.messages[0]
                 } else {
                     return {
                         sentTime: 0
@@ -108,7 +108,8 @@
                     this.latestMessage.sentTime || 0,
                     1,
                     false,
-                    (messages) => {
+                    (messages) => {
+                        console.log(messages);
                         this.messages.unshift(...messages)
                         // this.scrollBottom()
                     })
@@ -165,8 +166,7 @@
         overflow: scroll;
 
         .body {
-            background: blue;
-            height: 90vh;
+            flex: 1;
             display: flex;
             flex-direction: column-reverse;
             justify-content: flex-end;