From d42c18577070c172820ea6e999fa3de29526df6a Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 13:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E8=A7=A3=E6=95=A3=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E6=93=8D=E4=BD=9C=EF=BC=8C=E7=BE=A4=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue |  6 +++---
 pages/im/group/chat.nvue              |  5 +++++
 pages/im/group/index.vue              |  7 ++++---
 utils/im/index.js                     | 11 ++++-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 20d07e2..9f8ccd3 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -1,12 +1,12 @@
 <template>
     <view class="member--list">
         <view class="users">
-            <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
+            <view :class="['user', {'active': item.targetId === currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
                 <view class="avatar">
                     <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
-                    <view class="admin" v-if="item.is_admin">管理</view>
-                    <view class="owner" v-if="item.targetId === adminUid">群主</view>
+                    <view class="admin" v-if="item.is_admin === 1">管理</view>
+                    <view class="owner" v-if="item.is_admin === 2">群主</view>
                 </view>
                 <view class="name">{{ item.name }}</view>
             </view>
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index ee6d940..f1843f5 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -95,6 +95,11 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
+            uni.$on('onGroupDismiss', () => {
+                uni.switchTab({
+                    url: '/pages/im/index'
+                })
+            })
         },
         onNavigationBarButtonTap() {
             uni.navigateTo({
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index 97bbad8..058835a 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -42,6 +42,7 @@
         },
         onLoad() {
             this.initData()
+            uni.$on('onGroupDismiss', this.initData)
         },
         methods: {
             initData() {
@@ -68,9 +69,9 @@
                         icon: 'none',
                         title: err.message
                     })
-                }).finally(() => {
-                    this.initData()
-                    this.onHideModal()
+                }).finally(() => {
+                    this.initData()
+                    this.onHideModal()
                 })
             },
             toGroup(targetId) {
diff --git a/utils/im/index.js b/utils/im/index.js
index 5cd6fab..2984b38 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -166,13 +166,10 @@ const addListeners = () => {
             // 解散群
             if (message.content.operation === 'Dismiss') {
                 RongIMLib.cleanHistoryMessages(message.conversationType, message.targetId,
-                    message.sentTime - 1, false, ({
-                        code
-                    }) => {
-                        if (code == 0) {
-                            uni.$emit('onGroupDismiss', message.targetId)
-                        }
-                    })
+                    message.sentTime - 1, false, () => {})
+                // 解散了就删了吧
+                RongIMLib.removeConversation(message.conversationType, message.targetId, () => {})
+                uni.$emit('onGroupDismiss', message.targetId)
             }
             uni.$emit('onReceiveMessage', message)
         }