diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue index 52f4c83..0f22bf1 100644 --- a/pages/im/group/announceCreate.vue +++ b/pages/im/group/announceCreate.vue @@ -34,17 +34,12 @@ }, onLoad(e) { this.targetId = e.targetId - if (e.type) { - this.type = e.type - uni.setNavigationBarTitle({ - title: ' 公告内容' + if (e.aId) { + this.type = e.type + uni.setNavigationBarTitle({ + title: '群公告' }) - } - if (e.aId) { this.aId = e.aId - uni.setNavigationBarTitle({ - title: '群公告' - }) getGroupAnnouncement(this.targetId, this.aId).then(res => { this.content = res.content }).catch(err => { diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue index 81e3926..e177e17 100644 --- a/pages/im/group/announcement.vue +++ b/pages/im/group/announcement.vue @@ -36,10 +36,10 @@ topGroupAnnouncement } from '@/apis/interfaces/im.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 ], @@ -184,7 +184,8 @@ box-sizing: border-box; font-size: $title-size-m; color: $text-gray-m; - padding: 10rpx; + padding: 20rpx 10rpx 10rpx 10rpx; + border-top: solid 1rpx #F9F9F9; .name { padding-left: 10rpx; @@ -205,8 +206,6 @@ -webkit-line-clamp: 3; overflow: hidden; line-height: 1.5; - border-bottom: solid 1rpx #F9F9F9; - padding-bottom: 20rpx; span { color: #fff; diff --git a/static/.DS_Store b/static/.DS_Store index c67e41f..c3beeb7 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ