diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue index 407f9a5..6c0217f 100644 --- a/pages/im/components/show/showText.vue +++ b/pages/im/components/show/showText.vue @@ -56,7 +56,7 @@ .text { box-sizing: border-box; max-width: 502rpx; - padding:10rpx 24rpx; + padding:10rpx 30rpx; line-height: 46rpx; font-size: 32rpx; color: $text-color; diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue index 155fea8..891cfab 100644 --- a/pages/im/components/showMessageCell.vue +++ b/pages/im/components/showMessageCell.vue @@ -2,8 +2,7 @@ {{ message.content.message }} - 点击查看 + 点击查看 {{ contact(message.senderUserId).name }} 撤回了一条消息 @@ -32,11 +31,11 @@ import showText from './show/showText' import showCall from './show/showCall' import utils from '@/utils/index.js' - import imBase from '../mixins/imBase.js' - - export default { - mixins: [ - imBase + import imBase from '../mixins/imBase.js' + + export default { + mixins: [ + imBase ], components: { showCall, @@ -69,10 +68,10 @@ } }, // 跳转群公告 - toAnnounce(targetId) { - if (targetId) { - uni.navigateTo({ - url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + toAnnounce(message) { + if (message.content.extra) { + uni.navigateTo({ + url: '/pages/im/group/announceCreate?type=cheack&targetId=' + message.targetId + '&aId=' + message.content.extra }) } else { uni.showToast({ @@ -126,7 +125,7 @@ color: #666; .link { - color: blue; + color: $main-color; margin-left: 10rpx; } } diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue index 12eab0d..6935088 100644 --- a/pages/im/group/announceCreate.vue +++ b/pages/im/group/announceCreate.vue @@ -1,11 +1,11 @@