merge

pages/im/components/groupUserList.vue

@@ -104,7 +104,10 @@
             hideAction(item) {
                 this.actionShow = false
             },
-            showAction(item) {
+            showAction(item) {
+                if (item.is_admin == 2) {
+                    return
+                }
                 this.currentUser = item
                 this.actionTitle = item.name
                 // 只有管理员以上才会弹窗

pages/im/components/showMessageCell.vue

@@ -121,8 +121,8 @@
                                 icon: 'none',
                                 title: '消息撤回成功'
                             })
-                            IMLib.getMessage(this.message.messageId, res => {
-                                uni.$emit('onRecallMessage', res.message)
+                            IMLib.getMessage(this.message.messageId, res => {
+                                uni.$emit('onRecallMessage_' + this.message.targetId, res.message)
                             })
                         } else {
                             uni.showToast({