diff --git a/pages/im/.DS_Store b/pages/im/.DS_Store
new file mode 100644
index 0000000..b089d3f
Binary files /dev/null and b/pages/im/.DS_Store differ
diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 097bcfc..c198f5b 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -57,11 +57,7 @@
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
-<<<<<<< HEAD
-            padding:10rpx 30rpx;
-=======
             padding: 20rpx 24rpx;
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 6042c97..395eac3 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -2,7 +2,8 @@
     <view class="">
         <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
             {{ message.content.message }}
-            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
+            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看
+            </text>
         </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
@@ -25,6 +26,9 @@
 </template>
 
 <script>
+    import {
+        getGroupAnnouncement
+    } from '@/apis/interfaces/im.js'
     import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import showVoice from './show/showVoice'
     import showImage from './show/showImage'
@@ -68,17 +72,25 @@
                 }
             },
             // 跳转群公告
-<<<<<<< HEAD
             toAnnounce(message) {
-                if (message.content.extra) {
-                    uni.navigateTo({
-                        url: '/pages/im/group/announceCreate?type=cheack&targetId=' + message.targetId + '&aId=' + message.content.extra
-=======
-            toAnnounce(targetId) {
-                if (targetId) {
-                    uni.navigateTo({
-                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.message.targetId + '&aId=' + targetId
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
+                if (message.content.extra) {
+                    getGroupAnnouncement(message.targetId, message.content.extra).then(res => {
+                        uni.navigateTo({
+                            url: '/pages/im/group/announceCreate?type=check&targetId=' + message
+                                .targetId + '&aId=' + message.content.extra
+                        })
+                    }).catch(err => {
+                        IMLib.deleteMessagesByIds([message.messageId], ({
+                            code
+                        }) => {
+                            if (code === 0) {
+                                uni.$emit('remove_message_' + message.targetId, message.messageId)
+                            }
+                        })
+                        uni.showToast({
+                            title: '公告不存在或已删除',
+                            icon: 'none',
+                        })
                     })
                 } else {
                     uni.showToast({
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index 0ad252e..52f4c83 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,23 +1,14 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-<<<<<<< HEAD
-        <block v-if="type !== 'cheack'">
-            <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
-            <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
-        </block>
-        <block v-if="type === 'cheack'">
-            <view class="content-a"> {{content}} </view>
-=======
-        
+
         <block v-if="type === 'check'">
             <view class="content"> {{content}} </view>
-        </block>
-        
-        <block v-else>
-            <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
-            <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
+        </block>
+
+        <block v-else>
+            <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
+            <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
         </block>
     </view>
 </template>
@@ -41,17 +32,12 @@
                 type: '' // cheack ' 查看详情'
             }
         },
-        onLoad(e) {
-<<<<<<< HEAD
-            console.log(e,'e,,,,,')
-=======
-            console.log('E', e);
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
+        onLoad(e) {
             this.targetId = e.targetId
             if (e.type) {
-                this.type = e.type
-                uni.setNavigationBarTitle({
-                    title:' 公告内容'
+                this.type = e.type
+                uni.setNavigationBarTitle({
+                    title: ' 公告内容'
                 })
             }
             if (e.aId) {
@@ -62,11 +48,17 @@
                 getGroupAnnouncement(this.targetId, this.aId).then(res => {
                     this.content = res.content
                 }).catch(err => {
-                    uni.showToast({
-                        title: err.message,
-                        icon: 'none',
-                        mask: true
-                    })
+                    if (err.status_code == 404) {
+                        this.$nextTick(() => {
+                            uni.navigateBack()
+                        })
+                    } else {
+                        uni.showToast({
+                            title: err.message,
+                            icon: 'none',
+                            mask: true
+                        })
+                    }
                 })
             }
         },
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 9c140de..81e3926 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -121,7 +121,7 @@
             },
             tabA(id) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
                 })
             },
             onTop(aId) {
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index e6ab97e..ac1260c 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -22,10 +22,10 @@
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
     import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '../mixins/imBase.js'
-    
+    import imBase from '../mixins/imBase.js'
+
     export default {
-        mixins: [
+        mixins: [
             imBase,
             onGroupDismiss
         ],
@@ -54,9 +54,9 @@
                     }
                 }
             }
-        },
-        onShow() {
-            this.initGroupInfo()
+        },
+        onShow() {
+            this.initGroupInfo()
         },
         onLoad(e) {
             this.targetId = e.targetId
@@ -89,22 +89,24 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
-            uni.$on('onRecallMessage', (res) => {
-                if (res.targetId == this.targetId) {
-                    this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
-                            return res
-                        } else {
-                            return item
-                        }
-                    })
-                }
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
+                this.messages = this.messages.map(item => {
+                    if (message.messageId == item.messageId) {
+                        return message
+                    } else {
+                        return item
+                    }
+                })
+            })
+            uni.$on('remove_message_' + this.targetId, (messageId) => {
+                this.messages = this.messages.filter(item => item.messageId != messageId)
             })
         },
         onUnload() {
-            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('remove_message_' + this.targetId)
+            uni.$off('onReceiveMessage_' + this.targetId)
             uni.$off('onUpdateProfile_' + this.targetId)
-            uni.$off('onRecallMessage')
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onReceiptRequest')
             uni.$off('onReceiptResponse')
         },
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index cc2f30e..65c7491 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -75,20 +75,19 @@
                     })
                 }
             })
-            uni.$on('onRecallMessage', (res) => {
-                if (res.targetId == this.targetId) {
-                    this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
-                            return res
-                        } else {
-                            return item
-                        }
-                    })
-                }
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
+                this.messages = this.messages.map(item => {
+                    if (message.messageId == item.messageId) {
+                        return message
+                    } else {
+                        return item
+                    }
+                })
             })
         },
         onUnload() {
             uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onRecallMessage')
             uni.$off('onReadReceiptReceived')
         },
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index f3d4b04..ab0260a 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,8 +55,8 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight,
-    IMLib.ObjectName.GroupNotification
+    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.GroupNotification
 ]
 
 const imLibListeners = () => {
@@ -72,7 +72,7 @@ const imLibListeners = () => {
         checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
             onReceiveMessage(message)
-        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
+        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
             uni.$emit('onUpdateProfile_' + message.targetId)
             // 更新联系人信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
@@ -119,10 +119,16 @@ const imLibListeners = () => {
         uni.$emit('onReadReceiptReceived', data)
     })
     // 监听消息撤回操作
-    IMLib.addRecallMessageListener((res) => {
-        IMLib.getMessage(res.data.messageId, (res) => {
-            console.error("消息撤回: ", res.message);
-            uni.$emit('onRecallMessage', res.message)
+    IMLib.addRecallMessageListener(({
+        data
+    }) => {
+        IMLib.getMessage(data.messageId, ({
+            message
+        }) => {
+            console.error("消息撤回: ", message);
+            im.setNotifyBadge()
+            uni.$emit('onReceiveMessage', message)
+            uni.$emit('onRecallMessage_' + message.targetId, message)
         })
     })
     // 监听需要群聊消息回执