merge

2022-02-24 10:18:11 +08:00
parent 4a31ba32f7 32e3e0ef30
commit 8b7a259c00
11 changed files with 55 additions and 31 deletions
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -68,10 +68,17 @@
                }
            },
            // 跳转群公告
+<<<<<<< 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
                    })
                } else {
                    uni.showToast({