diff --git a/pages.json b/pages.json index 26657a2..6179384 100644 --- a/pages.json +++ b/pages.json @@ -373,9 +373,7 @@ { "path": "pages/im/private/chat", "style": { - "disableScroll": true, "navigationBarTitleText": "聊天", - "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#F3F6FB" } }, 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" /> {{ contact(friendItem.targetId).name }} - + @@ -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 @@