From a7dccde63ad4419ef9e9e57c6268d196e2a31c97 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 10:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=88=E5=B9=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=BE=A4=E5=85=AC=E5=91=8A=E6=8C=87=E5=90=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/{ => sent}/sentPopups.vue |  2 +-
 pages/im/components/{ => sent}/sentText.vue   | 18 ++++++++--------
 pages/im/components/{ => sent}/sentVoice.vue  |  4 ++--
 pages/im/components/sentMessageBar.vue        |  6 +++---
 pages/im/components/show/showText.vue         | 17 ++++++++-------
 pages/im/components/showMessageCell.vue       |  4 ++--
 pages/im/group/announceCreate.vue             | 21 ++++++++++++-------
 pages/im/group/announcement.vue               |  2 +-
 pages/im/mixins/imBase.js                     |  4 ----
 9 files changed, 40 insertions(+), 38 deletions(-)
 rename pages/im/components/{ => sent}/sentPopups.vue (96%)
 rename pages/im/components/{ => sent}/sentText.vue (94%)
 rename pages/im/components/{ => sent}/sentVoice.vue (95%)

diff --git a/pages/im/components/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
similarity index 96%
rename from pages/im/components/sentPopups.vue
rename to pages/im/components/sent/sentPopups.vue
index 87200e7..9c55cdb 100644
--- a/pages/im/components/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -34,7 +34,7 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
-    import imBase from '../mixins/imBase.js'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
         mixins: [
diff --git a/pages/im/components/sentText.vue b/pages/im/components/sent/sentText.vue
similarity index 94%
rename from pages/im/components/sentText.vue
rename to pages/im/components/sent/sentText.vue
index e10bece..e0fd36d 100644
--- a/pages/im/components/sentText.vue
+++ b/pages/im/components/sent/sentText.vue
@@ -8,11 +8,11 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import imBase from '../mixins/imBase.js'
-    
-    export default {
-        mixins: [
-            imBase
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
         ],
         props: {
             conversationType: {
@@ -42,17 +42,17 @@
         },
         data() {
             return {
-                focusState: false,
+                focusState: false,
                 inputTxt: ''
             }
         },
         methods: {
             sent() {
-                if (!this.disabled) {
-                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
+                if (!this.disabled) {
+                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
                         RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId)
                         this.$emit('success')
-                        this.inputTxt = ''
+                        this.inputTxt = ''
                     })
                 }
             },
diff --git a/pages/im/components/sentVoice.vue b/pages/im/components/sent/sentVoice.vue
similarity index 95%
rename from pages/im/components/sentVoice.vue
rename to pages/im/components/sent/sentVoice.vue
index a27134d..e52d040 100644
--- a/pages/im/components/sentVoice.vue
+++ b/pages/im/components/sent/sentVoice.vue
@@ -14,8 +14,8 @@
 <script>
     import im from '@/utils/im/index.js'
     import permision from '@/utils/permission.js'
-    import imBase from '../mixins/imBase.js'
-
+    import imBase from '../../mixins/imBase.js'
+    
     export default {
         mixins: [
             imBase
diff --git a/pages/im/components/sentMessageBar.vue b/pages/im/components/sentMessageBar.vue
index dcc4f76..470bee3 100644
--- a/pages/im/components/sentMessageBar.vue
+++ b/pages/im/components/sentMessageBar.vue
@@ -16,9 +16,9 @@
 </template>
 
 <script>
-    import sentText from './sentText'
-    import sentVoice from './sentVoice'
-    import sentPopups from './sentPopups'
+    import sentText from './sent/sentText'
+    import sentVoice from './sent/sentVoice'
+    import sentPopups from './sent/sentPopups'
 
     export default {
         props: {
diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 407f9a5..c198f5b 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="msg--text">
         <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
-
+
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
             <view :class="['text', isRemote ? 'left': 'right']">{{ content }}</view>
@@ -11,11 +11,13 @@
 
 <script>
     import messageState from './messageState'
-    import imBase from '../../mixins/imBase.js'
-    
+    import imBase from '../../mixins/imBase.js'
+
     export default {
-        name: 'showText',
-        mixins:[imBase],
+        name: 'showText',
+        mixins: [
+            imBase,
+        ],
         props: {
             message: {
                 type: Object,
@@ -49,14 +51,13 @@
 
         .name {
             font-size: 24rpx;
-            color: $text-gray-m;
-            margin-bottom: 10rpx;
+            color: $text-gray-m;
         }
 
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
-            padding:10rpx 24rpx;
+            padding: 20rpx 24rpx;
             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..c564177 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -69,10 +69,10 @@
                 }
             },
             // 跳转群公告
-            toAnnounce(targetId) {
+            toAnnounce(targetId) {
                 if (targetId) {
                     uni.navigateTo({
-                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
+                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.message.targetId + '&aId=' + targetId
                     })
                 } else {
                     uni.showToast({
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index 12eab0d..a474938 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,12 +1,14 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-        <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 === 'check'">
-            <view class="content-a"> {{content}} </view>
+            <view class="content"> {{content}} </view>
+        </block>
+        
+        <block v-else>
+            <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
+            <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
         </block>
     </view>
 </template>
@@ -30,15 +32,18 @@
                 type: '' // check ' 查看详情'
             }
         },
-        onLoad(e) {
+        onLoad(e) {
+            console.log('E', e);
             this.targetId = e.targetId
             if (e.type) {
                 this.type = e.type
             }
             if (e.aId) {
                 this.aId = e.aId
+                uni.setNavigationBarTitle({
+                    title: '群公告'
+                })
                 getGroupAnnouncement(this.targetId, this.aId).then(res => {
-                    console.log(res.content)
                     this.content = res.content
                 }).catch(err => {
                     uni.showToast({
@@ -99,7 +104,7 @@
             }
         }
 
-        .content-a {
+        .content {
             color: $text-color;
             font-size: $title-size;
             line-height: 1.7;
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 5e94971..79c49a2 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -78,7 +78,7 @@
         onNavigationBarButtonTap() {
             if (this.isAdmin) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
+                    url: '/pages/im/group/announceCreate?targetId=' + this.targetId
                 })
             } else {
                 uni.showToast({
diff --git a/pages/im/mixins/imBase.js b/pages/im/mixins/imBase.js
index b67aef0..959112d 100644
--- a/pages/im/mixins/imBase.js
+++ b/pages/im/mixins/imBase.js
@@ -1,10 +1,6 @@
 import utils from '@/utils/index.js'
 
 export default {
-    onLoad() {},
-    data() {
-        return {}
-    },
     computed: {
         contact() {
             return function(targetId) {