From 6f508d906d0a914e4943795e8e96067db3c12460 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 11:11:38 +0800
Subject: [PATCH] marge

---
 pages/im/group/announceCreate.vue |  13 ++++---------
 pages/im/group/announcement.vue   |  11 +++++------
 static/.DS_Store                  | Bin 12292 -> 12292 bytes
 3 files changed, 9 insertions(+), 15 deletions(-)

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 c67e41f6d2de71edb512258dfb78cd7c7906da2d..c3beeb7b56e151392059ef03931e4a09ae75e923 100644
GIT binary patch
delta 126
zcmZokXi3<xnsIWVsORP{jJt#xH&0$Ks>CTODkd%}AtWU|xlvhca;iYm<PXYOlMMxp
zC+7<4F>akaM^IYRk<ppagVB>Qhye_k7$G!+43vgajM1BO#piKMY~bF^t+1AT@?mkG
K%`6&QzzhITy&j?f

delta 59
zcmZokXi3<xnvuiM+)zis$kc3-vh3yyjQ4~$hbntBG6f%)yhx>dbGrCUj?LT(YuP8S
N75CZ9qOk?c003Yh6qW!0