From 20317cc1df9d141f4634a37369a8bd35fcb9af50 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 16:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=85=AC=E5=91=8A=E7=9A=84=E7=BE=A4?=
 =?UTF-8?q?=E5=86=85=E6=8F=90=E9=86=92=EF=BC=8C=E9=93=BE=E6=8E=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/showMessageCell.vue | 24 +++++++++++++++++++++++-
 pages/im/group/announceCreate.vue       |  4 ++--
 pages/im/group/announcement.vue         |  4 ++--
 utils/im/listeners.js                   |  3 ++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index ec41398..f01d07d 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -1,6 +1,10 @@
 <template>
     <view class="">
-        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">{{ message.content.message }}</view>
+        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
+            {{ message.content.message }}
+            <text class="link" @click="toAnnounce(message.content.extra)"
+                v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
+        </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
         </view>
@@ -75,6 +79,19 @@
                     })
                 }
             },
+            // 跳转群公告
+            toAnnounce(targetId) {
+                if (targetId) {
+                    uni.navigateTo({
+                        url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                    })
+                } else {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '旧版本，无链接'
+                    })
+                }
+            },
             // 撤回消息测试
             backMessage() {
                 if (this.$store.getters.sender.userId != this.message.senderUserId) {
@@ -118,6 +135,11 @@
         text-align: center;
         font-size: 24rpx;
         color: #666;
+
+        .link {
+            color: blue;
+            margin-left: 10rpx;
+        }
     }
 
     .cell-item {
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index fd05ae4..30a5a7d 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,11 +1,11 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-        <block v-if="type !== 'cheack'">
+        <block v-if="type !== 'check'">
             <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'">
+        <block v-if="type === 'check'">
             <view class="content-a"> {{content}} </view>
         </block>
     </view>
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index d45e9ac..3b2a420 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -76,7 +76,7 @@
         onNavigationBarButtonTap() {
             if (this.isAdmin) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
                 })
             } else {
                 uni.showToast({
@@ -119,7 +119,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/utils/im/listeners.js b/utils/im/listeners.js
index f9ded27..f3d4b04 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,7 +55,8 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight
+    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.GroupNotification
 ]
 
 const imLibListeners = () => {