From 103679c372b24e289c3506d9941dd8ab96a8662a Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 17:01:26 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/friendApplyCell.vue | 11 ++--
 pages/im/friends/index.vue              | 79 ++++++++++++++-----------
 pages/im/index.vue                      |  6 +-
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index 65b89f6..b962aa9 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -36,7 +36,6 @@
         methods: {
             resolve() {
                 resolveFriend(this.message.sourceUserId).then(res => {
-                    this.clearMessages()
                     uni.showToast({
                         icon: 'none',
                         title: '通过好友申请'
@@ -47,6 +46,8 @@
                         icon: 'none',
                         title: err.message
                     })
+                }).finally(() => {
+                    this.clearMessages()
                 })
             },
             reject() {
@@ -67,12 +68,12 @@
                 })
             },
             // 不管是通过还是拒绝，都要把相关的信息清理
-            clearMessages() {
+            clearMessages() {
                 RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
                 this.$emit('success')
-                uni.$emit('onNewContactConversation', message)
-                uni.$emit('onNewContactFriends', message)
-                uni.$emit('onNewContactPendings', message)
+                uni.$emit('onNewContactConversation')
+                uni.$emit('onNewContactFriends')
+                uni.$emit('onNewContactPendings')
             }
         }
     }
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 7179b89..e563914 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -10,25 +10,33 @@
                 <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')" />
                 <view class="info">我的群聊</view>
             </view>
-            <block v-if="friends.length > 0">   
+            <block v-if="friends.length > 0">
                 <u-index-item v-for="(item, fkey) in friends" :key="fkey">
-                    <u-index-anchor :text="indexs[fkey]" bgColor="#f9f9f9" height="20" size="12" color="#666" class="anchor" />
-                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex" @click="toFriend(friendItem.targetId)">
-                        <u-avatar class="avatar-img" size="40" shape="square" :src="contact(friendItem.targetId).portraitUrl" />
-                        <view class="info"> <view class="name">{{ contact(friendItem.targetId).name }}</view> </view>
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#f9f9f9" height="20" size="12" color="#666"
+                        class="anchor" />
+                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
+                        @click="toFriend(friendItem.targetId)">
+                        <u-avatar class="avatar-img" size="40" shape="square"
+                            :src="contact(friendItem.targetId).portraitUrl" />
+                        <view class="info">
+                            <view class="name">{{ contact(friendItem.targetId).name }}</view>
+                        </view>
                     </view>
                 </u-index-item>
             </block>
-            <view class="no-lists" v-else>
-                <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src=" require('@/static/imgs/no-friend.png')" :lazy-load="true" />
-                <span>暂无好友列表~</span>
+            <view class="no-lists" v-else>
+                <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+                    :src=" require('@/static/imgs/no-friend.png')" :lazy-load="true" />
+                <span>暂无好友列表~</span>
             </view>
         </u-index-list>
     </view>
 </template>
 
 <script>
-    import {getFriendsLetter} from '@/apis/interfaces/im';
+    import {
+        getFriendsLetter
+    } from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
 
@@ -47,20 +55,21 @@
                 }
             }
         },
+        onLoad() {
+            uni.$on('onNewContactFriends', this.checkNewFriendPending)
+        },
         onShow() {
             this.getFriendList()
             this.checkNewFriendPending()
-            uni.$on('onContactNotification', this.checkNewFriendPending)
-        },
-        onUnload() {
-            uni.$off("onContactNotification")
+        },
+        onUnload() {
+            uni.$off("onNewContactFriends")
         },
         methods: {
             getFriendList() {
-                getFriendsLetter().then(res => {
-                    console.log(res)
+                getFriendsLetter().then(res => {
                     this.indexs = res.indexList
-                    this.friends = res.itemArr
+                    this.friends = res.itemArr
                 })
             },
             checkNewFriendPending() {
@@ -70,10 +79,7 @@
             },
             toGroup() {
                 uni.navigateTo({
-                    url: '/pages/im/group/index',
-                    fail(err) {
-                        console.log(err);
-                    }
+                    url: '/pages/im/group/index'
                 })
             },
             toFriend(targetId) {
@@ -85,13 +91,13 @@
             toPending() {
                 uni.navigateTo({
                     url: '/pages/im/friends/pending'
-                });
+                })
             }
         },
         onNavigationBarButtonTap(e) {
             uni.navigateTo({
                 url: '/pages/im/friends/search'
-            });
+            })
         }
     };
 </script>
@@ -159,19 +165,20 @@
         font-size: 14px;
         line-height: 24px;
         background-color: #fff;
-    }
-    .no-lists {
-        padding-top: $padding * 3;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        box-sizing: border-box;
-        font-size: $title-size-m;
-        color: $text-gray-m;
-    
-        span {
-            padding-top: $padding;
-        }
+    }
+
+    .no-lists {
+        padding-top: $padding * 3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m;
+        color: $text-gray-m;
+
+        span {
+            padding-top: $padding;
+        }
     }
 </style>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index ef370a6..c514884 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -57,7 +57,11 @@
             // 好友申请数量
             this.checkNewFriendPending()
             // 监听新的好友申请
-            uni.$on('onNewContactConversation', this.checkNewFriendPending)
+            uni.$on('onNewContactConversation', () => {
+                console.log('更新好友申请数量');
+                // 更新好友申请数量
+                this.checkNewFriendPending()
+            })
         },
         onShow() {
             if (this.$store.state.token !== '') {

From d9748d0827e2e5cf722a05747640d261ddc67cae Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 17:07:14 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/show/showImage.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/im/components/show/showImage.vue b/pages/im/components/show/showImage.vue
index ca752d6..c41e618 100644
--- a/pages/im/components/show/showImage.vue
+++ b/pages/im/components/show/showImage.vue
@@ -45,27 +45,27 @@
                 }
             }
         },
-        methods: {
-            showImage(path) {
-                uni.previewImage({
-                    urls: [
-                        path
-                    ]
-                })
+        methods: {
+            showImage(path) {
+                uni.previewImage({
+                    urls: [
+                        path
+                    ]
+                })
             },
-            previewImage() {
+            previewImage() {
                 if (this.content.local && this.content.local.indexOf('///data/user/') < 0) {
                     this.showImage(this.content.local)
                 } else {
+                    this.showImage(this.content.remote)
                     RongIMLib.downloadMediaMessage(this.message.messageId, {
                         success: (path) => {
                             this.content.local = path
-                            this.showImage(path)
                         },
-                        error: (errorCode, messageId) => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: errorCode
+                        error: (errorCode, messageId) => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: errorCode
                             })
                         }
                     })

From 1d648f2dc12ae2cf71aa7ba6e3ce8c8501d51834 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 23 Feb 2022 17:08:28 +0800
Subject: [PATCH 03/19] ...

---
 pages/im/components/messageCell.vue |  5 +++--
 pages/im/index.vue                  | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 87ec20e..0e465d6 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -2,12 +2,13 @@
     <view class="message--cell">
         <view class="avatar">
             <u-badge max="99" shape="horn" absolute :offset="[-5, -8]" :value="item.unreadMessageCount" />
-            <u-avatar :src="contact(item.targetId).portraitUrl" shape="square" :size="avatarSize" />
+            <!-- <u-avatar :src="item.portraitUrl !== '' ? contact(item.targetId).portraitUrl : require('@/static/user/cover-s.png')" shape="square" :size="avatarSize" /> -->
+            <u-avatar :src="require('@/static/user/cover-s.png')" shape="square" :size="avatarSize" />
         </view>
         <view class="content">
             <view class="header">
                 <view class="name">
-                    {{ contact(item.targetId).name }}
+                    {{ contact(item.targetId).name }} {{item.portraitUrl}}
                     <text v-if="item.conversationType === 3" class='group'>[群]</text>
                 </view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index ef370a6..c513af7 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -5,7 +5,9 @@
         <view class="custom-header">
             <view class="header-flex">
                 <view class="tabs">
-                    <view class="item active">聊聊</view>
+                    <view class="item" @click="tabsClick('all')" :class="activeId === 'all'?'active':''">全部</view>
+                    <view class="item" @click="tabsClick('self')" :class="activeId === 'self'?'active':''">私聊</view>
+                    <view class="item" @click="tabsClick('group')" :class="activeId === 'group'?'active':''">群聊</view>
                 </view>
                 <view class="btns">
                     <view class="item" @click="scanQrCode">
@@ -46,7 +48,8 @@
             return {
                 conversations: [], // 会话列表
                 connection: 0,
-                hasNewFriends: 0
+                hasNewFriends: 0,
+                activeId:'all',
             }
         },
         components: {
@@ -54,12 +57,14 @@
             connectionStatus
         },
         onLoad() {
-            // 好友申请数量
-            this.checkNewFriendPending()
+            
             // 监听新的好友申请
             uni.$on('onNewContactConversation', this.checkNewFriendPending)
         },
-        onShow() {
+        onShow() {
+            // 好友申请数量
+            this.checkNewFriendPending()
+            
             if (this.$store.state.token !== '') {
                 this.getConversationList()
             }
@@ -76,11 +81,14 @@
             })
         },
         onHide() {
-            // 页面隐藏的时候，不监听了，性能可能会好一点
             uni.$off('onReceiveMessage')
             uni.$off('onConnectionStatusChange')
         },
-        methods: {
+        methods: {
+            // 切换聊天模式
+            tabsClick(type){
+                this.activeId = type
+            },
             checkNewFriendPending() {
                 im.getPendingList((pendings) => {
                     this.hasNewFriends = pendings.length
@@ -103,7 +111,9 @@
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
+                    if (code === 0) {
+                        console.log(conversations)
+                        console.log("item.conversationType === 3............")
                         this.conversations = conversations
                     }
                 })

From f4e44de777cd222695d7657214c24642dd2ba4cb Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 17:28:42 +0800
Subject: [PATCH 04/19] im-MIXINS

---
 pages/im/components/groupUserList.vue   | 15 +++++------
 pages/im/components/messageCell.vue     | 24 +++++------------
 pages/im/components/showMessageCell.vue | 23 +++++-----------
 pages/im/friends/index.vue              |  8 ++++--
 pages/im/group/announcement.vue         |  6 +++--
 pages/im/group/apply.vue                |  2 ++
 pages/im/group/chat.vue                 |  6 +++--
 pages/im/group/index.vue                |  2 +-
 pages/im/group/info.vue                 |  8 +++---
 pages/im/group/invite.vue               | 11 +++-----
 pages/im/group/reviewed.vue             |  4 ++-
 pages/im/index.vue                      | 36 +++++++++----------------
 pages/im/private/chat.vue               |  9 +++----
 utils/im/imBase.js                      | 24 +++++++++++++++++
 14 files changed, 87 insertions(+), 91 deletions(-)
 create mode 100644 utils/im/imBase.js

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 5283b15..031a03d 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -38,8 +38,12 @@
         transferGroupOwner
     } from '@/apis/interfaces/im.js'
     import utils from '@/utils/index.js'
-
-    export default {
+    import imBase from '@/utils/im/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         props: {
             targetId: {
                 type: String,
@@ -67,13 +71,6 @@
                 iconSize: 14
             }
         },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         created() {
             this.avatarSize = utils.rpx2px(84)
             this.labelSize = utils.rpx2px(24)
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 0e465d6..06147f9 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -2,13 +2,12 @@
     <view class="message--cell">
         <view class="avatar">
             <u-badge max="99" shape="horn" absolute :offset="[-5, -8]" :value="item.unreadMessageCount" />
-            <!-- <u-avatar :src="item.portraitUrl !== '' ? contact(item.targetId).portraitUrl : require('@/static/user/cover-s.png')" shape="square" :size="avatarSize" /> -->
-            <u-avatar :src="require('@/static/user/cover-s.png')" shape="square" :size="avatarSize" />
+            <u-avatar :src="contact(item.targetId).portraitUrl" shape="square" :size="avatarSize" />
         </view>
         <view class="content">
             <view class="header">
                 <view class="name">
-                    {{ contact(item.targetId).name }} {{item.portraitUrl}}
+                    {{ contact(item.targetId).name }}
                     <text v-if="item.conversationType === 3" class='group'>[群]</text>
                 </view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
@@ -22,8 +21,12 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
+    import imBase from '@/utils/im/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             item: {
                 type: Object,
@@ -32,21 +35,6 @@
                 }
             }
         },
-        data() {
-            return {
-                avatarRpx: 84
-            }
-        },
-        computed: {
-            avatarSize() {
-                return utils.rpx2px(this.avatarRpx)
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         components: {
             messagePreview
         }
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index f01d07d..a7863bf 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -32,8 +32,12 @@
     import showText from './show/showText'
     import showCall from './show/showCall'
     import utils from '@/utils/index.js'
-
-    export default {
+    import imBase from '@/utils/im/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         components: {
             showCall,
             showVoice,
@@ -52,21 +56,6 @@
                 default: false
             }
         },
-        data() {
-            return {
-                avatarRpx: 84
-            }
-        },
-        computed: {
-            avatarSize() {
-                return utils.rpx2px(this.avatarRpx)
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         methods: {
             toUser(item) {
                 if (item.messageDirection == 1) {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index e563914..3cd2ba2 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -39,8 +39,12 @@
     } from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
-
-    export default {
+    import imBase from '@/utils/im/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 indexs: [],
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 3b2a420..149ee69 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -36,9 +36,11 @@
         topGroupAnnouncement
     } from '@/apis/interfaces/im.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-
+    import imBase from '@/utils/im/imBase.js'
+    
     export default {
-        mixins: [
+        mixins: [
+            imBase,
             onGroupDismiss
         ],
         data() {
diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index b288b4f..c4387e3 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -21,9 +21,11 @@
         joinGroup
     } from '@/apis/interfaces/im.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import imBase from '@/utils/im/imBase.js'
     
     export default {
         mixins: [
+            imBase,
             onGroupDismiss
         ],
         data() {
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 525563f..3ed76d0 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -22,9 +22,11 @@
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-
+    import imBase from '@/utils/im/imBase.js'
+    
     export default {
-        mixins: [
+        mixins: [
+            imBase,
             onGroupDismiss
         ],
         components: {
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index 5b0c47c..6452480 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -3,7 +3,7 @@
         <block v-if="groups.length > 0">
             <view class="title"> 群聊 </view>
             <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
-                <u-avatar size="36" shape="square" :src="item.portraitUrl !== ''?contact(item.targetId).portraitUrl :require('@/static/user/cover-s.png')" />
+                <u-avatar size="36" shape="square" :src="contact(item.targetId).portraitUrl" />
                 <view class="info">
                     <view class="name">{{ item.name }}  <span class="total">共{{ item.members }} 成员</span></view>
                 </view>
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index 8b73708..6715b6b 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -21,9 +21,9 @@
         <u-cell-group class="cells" v-if="group.is_admin" :border="false">
             <u-cell :border="false" class="u-border-bottom" isLink title="修改群聊名称" :value="groupName"
                 @click="onGroupName" />
-            <u-cell :border="false" class="u-border-bottom" isLink title="修改群头像" @click="onGroupAvatar">
+           <!-- <u-cell :border="false" class="u-border-bottom" isLink title="修改群头像" @click="onGroupAvatar">
                 <u-avatar slot="value" size="25" shape="square" :src="group.cover" />
-            </u-cell>
+            </u-cell> -->
             <u-cell :border="false" class="u-border-bottom" isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType" />
         </u-cell-group>
 
@@ -58,12 +58,14 @@
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import groupUserList from '../components/groupUserList'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-
+    import imBase from '@/utils/im/imBase.js'
+    
     export default {
         components: {
             groupUserList
         },
         mixins: [
+            imBase,
             onGroupDismiss
         ],
         data() {
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 54769f2..7a3a0ee 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -47,9 +47,11 @@
     import utils from '@/utils/index.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import imBase from '@/utils/im/imBase.js'
 
     export default {
-        mixins: [
+        mixins: [
+            imBase,
             onGroupDismiss
         ],
         data() {
@@ -64,13 +66,6 @@
                 selectValue: []
             };
         },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         onLoad(e) {
             this.targetId = e.targetId
             this.getFriendList()
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index f861dce..a46eb56 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -35,9 +35,11 @@
     import im from '@/utils/im/message.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import imBase from '@/utils/im/imBase.js'
 
     export default {
-        mixins: [
+        mixins: [
+            imBase,
             onGroupDismiss
         ],
         data() {
diff --git a/pages/im/index.vue b/pages/im/index.vue
index d170e3f..afba35a 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -5,9 +5,7 @@
         <view class="custom-header">
             <view class="header-flex">
                 <view class="tabs">
-                    <view class="item" @click="tabsClick('all')" :class="activeId === 'all'?'active':''">全部</view>
-                    <view class="item" @click="tabsClick('self')" :class="activeId === 'self'?'active':''">私聊</view>
-                    <view class="item" @click="tabsClick('group')" :class="activeId === 'group'?'active':''">群聊</view>
+                    <view class="item active">聊聊</view>
                 </view>
                 <view class="btns">
                     <view class="item" @click="scanQrCode">
@@ -41,15 +39,14 @@
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
     import conversationList from './components/conversationList'
-    import connectionStatus from './components/connectionStatus'
+    import connectionStatus from './components/connectionStatus'
 
-    export default {
+    export default {
         data() {
             return {
                 conversations: [], // 会话列表
                 connection: 0,
-                hasNewFriends: 0,
-                activeId:'all',
+                hasNewFriends: 0
             }
         },
         components: {
@@ -57,18 +54,17 @@
             connectionStatus
         },
         onLoad() {
-            
             // 监听新的好友申请
-            uni.$on('onNewContactConversation', () => {
+            uni.$on('onNewContactConversation', () => {
                 console.log('更新好友申请数量');
                 // 更新好友申请数量
                 this.checkNewFriendPending()
             })
         },
-        onShow() {
-            // 好友申请数量
-            this.checkNewFriendPending()
-            
+        onShow() {
+            // 好友申请数量
+            this.checkNewFriendPending()
+
             if (this.$store.state.token !== '') {
                 this.getConversationList()
             }
@@ -88,11 +84,7 @@
             uni.$off('onReceiveMessage')
             uni.$off('onConnectionStatusChange')
         },
-        methods: {
-            // 切换聊天模式
-            tabsClick(type){
-                this.activeId = type
-            },
+        methods: {
             checkNewFriendPending() {
                 im.getPendingList((pendings) => {
                     this.hasNewFriends = pendings.length
@@ -107,17 +99,15 @@
                 }
                 return true
             },
-            // 获取私聊的会话列表
+            // 获取会话列表，最新的一千条
             getConversationList() {
-                const count = 1000
+                const count = 200
                 const timestamp = 0
                 RongIMLib.getConversationList([1, 3], count, timestamp, ({
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
-                        console.log(conversations)
-                        console.log("item.conversationType === 3............")
+                    if (code === 0) {
                         this.conversations = conversations
                     }
                 })
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index c1aeba8..d40340e 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -18,8 +18,12 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
+    import imBase from '@/utils/im/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         components: {
             sentMessageBar,
             showMessageCell
@@ -45,11 +49,6 @@
                         sentTime: 0
                     }
                 }
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         onLoad(e) {
diff --git a/utils/im/imBase.js b/utils/im/imBase.js
new file mode 100644
index 0000000..ed9dbaa
--- /dev/null
+++ b/utils/im/imBase.js
@@ -0,0 +1,24 @@
+import utils from '@/utils/index.js'
+
+const imBase = {
+    onLoad() {
+      console.log('IM BASE MININX');  
+    },
+    data() {
+        return {
+            
+        }
+    },
+    computed: {
+        contact() {
+            return function(targetId) {
+                return this.$store.getters.contactInfo(targetId)
+            }
+        },
+        avatarSize() {
+            return utils.rpx2px(84)
+        }
+    }
+}
+
+export default imBase

From 8f3c741ad1dbd4fdb6c8b10fc9d9ed8778581e55 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 09:14:30 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store | Bin 14340 -> 14340 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 6a740ac20f36d933833be08eea6e868378331ec8..8ee0c7c5b0808e4bb5daba65d9e1a85ae3db2004 100644
GIT binary patch
delta 43
tcmZoEXero`r^u9@Gr2%ff^FM|Q{Q_YPVQ5bf-%=A$}le2d|J^`3;?r56WRa(

delta 43
tcmZoEXero`r^w`4HMu}hf-QNr<7ubUllv5<V9a%jGK>YAPb*rA0RVF35S#!2


From 358372cdba52873dd110e27e60b6793510af06f6 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 09:25:35 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   4 +-
 pages/im/components/friendApplyCell.vue       |  20 +-
 pages/im/components/friendApplyList.vue       | 271 ++++++++++--------
 pages/im/components/friendSearchList.vue      |   7 +-
 pages/im/components/groupUserList.vue         |   2 +-
 pages/im/components/messageCell.vue           |   2 +-
 pages/im/components/show/showCall.vue         |  13 +-
 pages/im/components/show/showImage.vue        |  13 +-
 pages/im/components/show/showText.vue         |   8 +-
 pages/im/components/show/showVoice.vue        |   8 +-
 pages/im/components/showMessageCell.vue       |   4 +-
 pages/im/friends/index.vue                    |   2 +-
 pages/im/friends/mine.vue                     |   3 +-
 pages/im/friends/pending.vue                  |  58 ++--
 pages/im/friends/search.vue                   |   1 +
 pages/im/group/announceCreate.vue             |   2 +-
 pages/im/group/announcement.vue               |   4 +-
 pages/im/group/apply.vue                      |   4 +-
 pages/im/group/chat.vue                       |   4 +-
 pages/im/group/info.vue                       |   4 +-
 pages/im/group/invite.vue                     |   2 +-
 pages/im/group/reviewed.vue                   |   4 +-
 pages/im/group/users.vue                      |   2 +-
 pages/im/index.vue                            |  11 +-
 {utils/im => pages/im/mixins}/imBase.js       |   0
 .../im => pages/im/mixins}/onGroupDismiss.js  |   0
 pages/im/private/chat.vue                     |   2 +-
 27 files changed, 238 insertions(+), 217 deletions(-)
 rename {utils/im => pages/im/mixins}/imBase.js (100%)
 rename {utils/im => pages/im/mixins}/onGroupDismiss.js (100%)

diff --git a/manifest.json b/manifest.json
index 600220b..d58dbc8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.15",
-    "versionCode" : 113,
+    "versionName" : "1.0.16",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index b962aa9..ad345ab 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="apply--cell">
         <view class="avatar">
-            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
+            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" :size="avatarSize" />
         </view>
         <view class="info">
             <view class="name"> {{ user.name }}</view>
@@ -20,8 +20,12 @@
         resolveFriend,
         rejectFriend
     } from '@/apis/interfaces/im.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             message: {
                 type: Object,
@@ -35,7 +39,7 @@
         },
         methods: {
             resolve() {
-                resolveFriend(this.message.sourceUserId).then(res => {
+                resolveFriend(this.message.sourceUserId).then(res => {
                     uni.showToast({
                         icon: 'none',
                         title: '通过好友申请'
@@ -46,8 +50,8 @@
                         icon: 'none',
                         title: err.message
                     })
-                }).finally(() => {
-                    this.clearMessages()
+                }).finally(() => {
+                    this.clearMessages()
                 })
             },
             reject() {
@@ -68,11 +72,11 @@
                 })
             },
             // 不管是通过还是拒绝，都要把相关的信息清理
-            clearMessages() {
+            clearMessages() {
                 RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
-                this.$emit('success')
-                uni.$emit('onNewContactConversation')
-                uni.$emit('onNewContactFriends')
+                this.$emit('success')
+                uni.$emit('onNewContactConversation')
+                uni.$emit('onNewContactFriends')
                 uni.$emit('onNewContactPendings')
             }
         }
diff --git a/pages/im/components/friendApplyList.vue b/pages/im/components/friendApplyList.vue
index 4fa31b6..56feed3 100644
--- a/pages/im/components/friendApplyList.vue
+++ b/pages/im/components/friendApplyList.vue
@@ -1,126 +1,147 @@
-<template>
-    <view class="friend-apply">
-        <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
-            <view class="lists">
-                <view class="" style="width: 100rpx;height: 100rpx;">
-                    <u-avatar :src="JSON.parse(item.latestMessage.extra).portraitUrl" shape="square" size="44" />
-                </view>
-                <view class="right">
-                    <view class="title">
-                        <view class="name">{{ item.name }}</view>
-                        <view class="des">{{ item.latestMessage.message || '--' }}</view>
-                    </view>
-                    <view class="agress-btn">
-                        <span v-if="isAgree" @click="action('agree', item)">通过</span>
-                        <span v-if="isAgree" @click="action('reject', item)">拒绝</span>
-                        <span v-if="isApply && !item.is_friend" @click="action('apply', item)">查看</span>
-                        <span class="isFri" v-if="isApply && item.is_friend" @click="action('isFriend', item)">已是好友</span>
-                    </view>
-                </view>
-            </view>
-        </block>
-    </view>
-</template>
-
-<script>
-export default {
-    name: 'friend-apply-reject-agree',
-    props: {
-        lists: {
-            type: Array,
-            default: []
-        },
-        isAgree: {
-            type: Boolean,
-            default: false
-        },
-        isReject: {
-            type: Boolean,
-            default: false
-        },
-        isApply: {
-            type: Boolean,
-            default: false
-        }
-    },
-    created() {
-        console.log(this.lists);
-    },
-    methods: {
-        action(type, item) {
-            if (type === 'isFriend') {
-                // ，后期可以跳转到信息介绍页面，先留在这里
-                return uni.showToast({ title: '已是好友，无需重复添加', icon: 'none', duration:2000});
-            }
-            this.$emit('action', { type, item });
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.lists {
-    padding: 0 $padding;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    box-sizing: border-box;
-    font-size: $title-size;
-    color: $text-gray;
-
-    .cover {
-        background-color: #ffffff;
-    }
-    .right {
-        width: 570rpx;
-        margin-left: $margin - 10;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        padding: $padding 0;
-        border-bottom: solid 1rpx #f9f9f9;
-        .title {
-            width: 370rpx;
-            .name {
-                width: 100%;
-                color: $text-color;
-                font-size: $title-size + 2;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-            .des {
-                width: 100%;
-                flex: 1;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                font-size: $title-size-m;
-                margin-top: $margin - 10;
-                color: $text-gray-m;
-            }
-        }
-        .agress-btn {
-            display: flex;
-            color: #fff;
-            font-size: $title-size-m;
-            span {
-                display: inline-block;
-                padding: 6rpx 14rpx;
-                background-color: $text-price;
-                border-radius: 10rpx;
-            }
-            span:nth-child(1) {
-                background-color: $main-color;
-                margin-right: 10rpx;
-            }
-            .isFri {
-                background-color: #f9f9f9 !important;
-                color: #666;
-            }
-        }
-    }
-}
+<template>
+    <view class="friend-apply">
+        <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
+            <view class="lists">
+                <view class="" style="width: 100rpx;height: 100rpx;">
+                    <u-avatar :src="JSON.parse(item.latestMessage.extra).portraitUrl" shape="square" :size="avatarSize" />
+                </view>
+                <view class="right">
+                    <view class="title">
+                        <view class="name">{{ item.name }}</view>
+                        <view class="des">{{ item.latestMessage.message || '--' }}</view>
+                    </view>
+                    <view class="agress-btn">
+                        <span v-if="isAgree" @click="action('agree', item)">通过</span>
+                        <span v-if="isAgree" @click="action('reject', item)">拒绝</span>
+                        <span v-if="isApply && !item.is_friend" @click="action('apply', item)">查看</span>
+                        <span class="isFri" v-if="isApply && item.is_friend"
+                            @click="action('isFriend', item)">已是好友</span>
+                    </view>
+                </view>
+            </view>
+        </block>
+    </view>
+</template>
+
+<script>
+    import imBase from '../mixins/imBase.js'
+    
+    export default {
+        mixins:[
+            imBase
+        ],
+        name: 'friend-apply-reject-agree',
+        props: {
+            lists: {
+                type: Array,
+                default: []
+            },
+            isAgree: {
+                type: Boolean,
+                default: false
+            },
+            isReject: {
+                type: Boolean,
+                default: false
+            },
+            isApply: {
+                type: Boolean,
+                default: false
+            }
+        },
+        created() {
+            console.log(this.lists);
+        },
+        methods: {
+            action(type, item) {
+                if (type === 'isFriend') {
+                    // ，后期可以跳转到信息介绍页面，先留在这里
+                    return uni.showToast({
+                        title: '已是好友，无需重复添加',
+                        icon: 'none',
+                        duration: 2000
+                    });
+                }
+                this.$emit('action', {
+                    type,
+                    item
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+    .lists {
+        padding: 0 $padding;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        box-sizing: border-box;
+        font-size: $title-size;
+        color: $text-gray;
+
+        .cover {
+            background-color: #ffffff;
+        }
+
+        .right {
+            width: 570rpx;
+            margin-left: $margin - 10;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            padding: $padding 0;
+            border-bottom: solid 1rpx #f9f9f9;
+
+            .title {
+                width: 370rpx;
+
+                .name {
+                    width: 100%;
+                    color: $text-color;
+                    font-size: $title-size + 2;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+
+                .des {
+                    width: 100%;
+                    flex: 1;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    font-size: $title-size-m;
+                    margin-top: $margin - 10;
+                    color: $text-gray-m;
+                }
+            }
+
+            .agress-btn {
+                display: flex;
+                color: #fff;
+                font-size: $title-size-m;
+
+                span {
+                    display: inline-block;
+                    padding: 6rpx 14rpx;
+                    background-color: $text-price;
+                    border-radius: 10rpx;
+                }
+
+                span:nth-child(1) {
+                    background-color: $main-color;
+                    margin-right: 10rpx;
+                }
+
+                .isFri {
+                    background-color: #f9f9f9 !important;
+                    color: #666;
+                }
+            }
+        }
+    }
 </style>
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
index 0bbb506..0e92d43 100644
--- a/pages/im/components/friendSearchList.vue
+++ b/pages/im/components/friendSearchList.vue
@@ -3,7 +3,7 @@
         <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
             <view class="lists">
                 <view class="" style="width: 100rpx;height: 100rpx;">
-                    <u-avatar :src="item.portraitUrl || require('@/static/user/cover.png')" shape="square" size="44" />
+                    <u-avatar :src="item.portraitUrl || require('@/static/user/cover.png')" shape="square" :size="avatarSize" />
                 </view>
                 <view class="right">
                     <view class="title">
@@ -21,7 +21,12 @@
 </template>
 
 <script>
+    import imBase from '../mixins/imBase.js'
+    
     export default {
+        mixins: [
+            imBase
+        ],
         name: 'friend-apply-reject-agree',
         props: {
             lists: {
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 031a03d..281b643 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -38,7 +38,7 @@
         transferGroupOwner
     } from '@/apis/interfaces/im.js'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 06147f9..bd8a2a5 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -21,7 +21,7 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [
diff --git a/pages/im/components/show/showCall.vue b/pages/im/components/show/showCall.vue
index 8e6f592..72078d1 100644
--- a/pages/im/components/show/showCall.vue
+++ b/pages/im/components/show/showCall.vue
@@ -10,9 +10,13 @@
 
 <script>
     import utils from '@/utils/index.js'
-    import moment from 'moment'
+    import moment from 'moment'
+    import imBase from '../../mixins/imBase.js'
 
-    export default {
+    export default {
+        mixins: [
+            imBase
+        ],
         name: 'showText',
         props: {
             message: {
@@ -38,11 +42,6 @@
             isRemote() {
                 return this.message.messageDirection == 2
             },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            },
             duration() {
                 if (this.message.duration > 3600) {
                     return moment.utc(this.message.duration * 1000).format('HH:mm:ss')
diff --git a/pages/im/components/show/showImage.vue b/pages/im/components/show/showImage.vue
index c41e618..116a4c3 100644
--- a/pages/im/components/show/showImage.vue
+++ b/pages/im/components/show/showImage.vue
@@ -14,8 +14,12 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
-
-    export default {
+    import imBase from '../../mixins/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         name: 'showImage',
         props: {
             message: {
@@ -38,11 +42,6 @@
             },
             content() {
                 return this.message.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         methods: {
diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 768fefb..bbf29c7 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -11,7 +11,8 @@
 
 <script>
     import messageState from './messageState'
-
+    import imBase from '../../mixins/imBase.js'
+    
     export default {
         name: 'showText',
         props: {
@@ -35,11 +36,6 @@
             },
             content() {
                 return this.message.content.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         }
     }
diff --git a/pages/im/components/show/showVoice.vue b/pages/im/components/show/showVoice.vue
index b1a1240..9f26759 100644
--- a/pages/im/components/show/showVoice.vue
+++ b/pages/im/components/show/showVoice.vue
@@ -23,7 +23,8 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
-
+    import imBase from '../../mixins/imBase.js'
+    
     export default {
         props: {
             message: {
@@ -54,11 +55,6 @@
             isRemote() {
                 return this.message.messageDirection == 2
             },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            },
             width() {
                 if (this.duration > 3) {
                     return (this.duration * 5) + 150
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index a7863bf..155fea8 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -32,7 +32,7 @@
     import showText from './show/showText'
     import showCall from './show/showCall'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
@@ -72,7 +72,7 @@
             toAnnounce(targetId) {
                 if (targetId) {
                     uni.navigateTo({
-                        url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
                     })
                 } else {
                     uni.showToast({
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 3cd2ba2..c4996d4 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -39,7 +39,7 @@
     } from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue
index 92bdef2..ee25682 100644
--- a/pages/im/friends/mine.vue
+++ b/pages/im/friends/mine.vue
@@ -23,7 +23,8 @@
 <script>
     import {
         getUserInfo
-    } from '@/apis/interfaces/im'
+    } from '@/apis/interfaces/im.js'
+    
     export default {
         data() {
             return {
diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index cb1802d..0f84164 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -10,11 +10,11 @@
             <view v-for="(item, index) in pendings" :key="index">
                 <apply-cell :message="item.latestMessage" @success="getPendingList" />
             </view>
-        </block>
-        <view class="no-lists" v-else>
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
-                :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
-            <span> 暂无好友申请 ~ </span>
+        </block>
+        <view class="no-lists" v-else>
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+                :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
+            <span> 暂无好友申请 ~ </span>
         </view>
     </view>
 </template>
@@ -29,25 +29,25 @@
         },
         data() {
             return {
-                pendings: [],
+                pendings: [],
                 bg: '#fff'
             }
         },
         onShow() {
             this.getPendingList()
             uni.$on('onNewContactPendings', this.getPendingList)
-        },
-        onUnload() {
-            uni.$off('onNewContactPendings')
+        },
+        onUnload() {
+            uni.$off('onNewContactPendings')
         },
         methods: {
-            getPendingList() {
-                im.getPendingList((pendings) => {
-                    console.log(pendings,'res......')
-                    if (pendings.length > 0) {
-                        this.bg = '#f9f9f9'
-                    } else {
-                        this.bg = '#fff'
+            getPendingList() {
+                im.getPendingList((pendings) => {
+                    console.log(pendings, 'res......')
+                    if (pendings.length > 0) {
+                        this.bg = '#f9f9f9'
+                    } else {
+                        this.bg = '#fff'
                     }
                     this.pendings = pendings
                 })
@@ -62,18 +62,18 @@
         background: $window-color;
     }
 
-    .no-lists {
-        padding-top: $padding * 5;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        box-sizing: border-box;
-        font-size: $title-size-m;
-        color: $text-gray-m;
-    
-        span {
-            padding-top: $padding;
-        }
+    .no-lists {
+        padding-top: $padding * 5;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m;
+        color: $text-gray-m;
+
+        span {
+            padding-top: $padding;
+        }
     }
 </style>
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index 0125804..158dd06 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -32,6 +32,7 @@
         pedingFriend
     } from '@/apis/interfaces/im.js';
     import applyFriend from '../components/friendSearchList.vue';
+
     export default {
         components: {
             applyFriend
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index 30a5a7d..12eab0d 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -16,7 +16,7 @@
         createGroupAnnouncement,
         getGroupAnnouncement
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
 
     export default {
         mixins: [
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 149ee69..5e94971 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -35,8 +35,8 @@
         deleteGroupAnnouncement,
         topGroupAnnouncement
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index c4387e3..d17df26 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -20,8 +20,8 @@
         joinGroupPre,
         joinGroup
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 3ed76d0..e6ab97e 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -21,8 +21,8 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index 6715b6b..8b7ba61 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -57,8 +57,8 @@
     } from '@/apis/interfaces/uploading'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import groupUserList from '../components/groupUserList'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         components: {
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 7a3a0ee..c205ea9 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -47,7 +47,7 @@
     import utils from '@/utils/index.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index a46eb56..45c7070 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -34,8 +34,8 @@
     } from "@/apis/interfaces/im.js"
     import im from '@/utils/im/message.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [
diff --git a/pages/im/group/users.vue b/pages/im/group/users.vue
index 0e81fc8..608b990 100644
--- a/pages/im/group/users.vue
+++ b/pages/im/group/users.vue
@@ -4,7 +4,7 @@
 
 <script>
     import groupUserList from '../components/groupUserList'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
 
     export default {
         mixins: [
diff --git a/pages/im/index.vue b/pages/im/index.vue
index afba35a..097baf7 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -39,14 +39,15 @@
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
     import conversationList from './components/conversationList'
-    import connectionStatus from './components/connectionStatus'
+    import connectionStatus from './components/connectionStatus'
 
-    export default {
+    export default {
         data() {
             return {
                 conversations: [], // 会话列表
                 connection: 0,
-                hasNewFriends: 0
+                hasNewFriends: 0,
+                perPage: 200
             }
         },
         components: {
@@ -101,9 +102,7 @@
             },
             // 获取会话列表，最新的一千条
             getConversationList() {
-                const count = 200
-                const timestamp = 0
-                RongIMLib.getConversationList([1, 3], count, timestamp, ({
+                RongIMLib.getConversationList([1, 3], this.perPage, 0, ({
                     code,
                     conversations
                 }) => {
diff --git a/utils/im/imBase.js b/pages/im/mixins/imBase.js
similarity index 100%
rename from utils/im/imBase.js
rename to pages/im/mixins/imBase.js
diff --git a/utils/im/onGroupDismiss.js b/pages/im/mixins/onGroupDismiss.js
similarity index 100%
rename from utils/im/onGroupDismiss.js
rename to pages/im/mixins/onGroupDismiss.js
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index d40340e..cc2f30e 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -18,7 +18,7 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [

From 78d4611fb2fbe233265be441690dc4acf79f27c1 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 09:28:59 +0800
Subject: [PATCH 07/19] =?UTF-8?q?mixins=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/sentPopups.vue | 19 ++++++++++---------
 pages/im/components/sentText.vue   | 11 ++++++-----
 pages/im/components/sentVoice.vue  | 17 +++++++++--------
 pages/im/mixins/imBase.js          | 19 ++++++++-----------
 pages/im/mixins/onGroupDismiss.js  |  6 ++----
 5 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/pages/im/components/sentPopups.vue b/pages/im/components/sentPopups.vue
index fb84f54..87200e7 100644
--- a/pages/im/components/sentPopups.vue
+++ b/pages/im/components/sentPopups.vue
@@ -34,8 +34,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 callActions: [{
@@ -64,15 +68,11 @@
                 default: ''
             }
         },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
         methods: {
             singleCall(e) {
                 uni.navigateTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type +
+                        '&isCall=true'
                 })
             },
             onPopupsItem(type) {
@@ -140,13 +140,14 @@
 <style lang="scss" scoped>
     .sent--popups {
         background: white;
-        padding: 30rpx 15rpx;
-        display: flex;
+        padding: 30rpx 15rpx;
+        display: flex;
         flex-wrap: wrap;
         flex-direction: row;
+
         .item {
             width: 150rpx;
-            margin: 15rpx;
+            margin: 15rpx;
             text-align: center;
         }
 
diff --git a/pages/im/components/sentText.vue b/pages/im/components/sentText.vue
index efa4034..e10bece 100644
--- a/pages/im/components/sentText.vue
+++ b/pages/im/components/sentText.vue
@@ -8,8 +8,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-
-    export default {
+    import imBase from '../mixins/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         props: {
             conversationType: {
                 type: Number,
@@ -23,9 +27,6 @@
         computed: {
             disabled() {
                 return this.inputTxt.length === 0
-            },
-            sender() {
-                return this.$store.getters.sender
             }
         },
         mounted() {
diff --git a/pages/im/components/sentVoice.vue b/pages/im/components/sentVoice.vue
index ae7a66d..a27134d 100644
--- a/pages/im/components/sentVoice.vue
+++ b/pages/im/components/sentVoice.vue
@@ -14,8 +14,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import permision from '@/utils/permission.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             conversationType: {
                 type: Number,
@@ -35,11 +39,6 @@
                 recorderManager: null
             }
         },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
         created() {
             this.recorderManager = uni.getRecorderManager()
         },
@@ -100,8 +99,8 @@
 
 <style scoped lang="scss">
     .send--voice {
-        .voice {
-            display: flex;
+        .voice {
+            display: flex;
             background: $window-color;
             height: 70rpx;
             line-height: 70rpx;
@@ -110,13 +109,14 @@
             width: 500rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
+
             .button {
                 font-size: 30rpx;
                 color: #333;
             }
         }
 
-        .modal {
+        .modal {
             display: flex;
             background: rgba(0, 0, 0, .6);
             position: fixed;
@@ -129,6 +129,7 @@
             flex-direction: column;
             align-items: center;
             justify-content: center;
+
             .icon {
                 width: 88rpx;
                 height: 88rpx;
diff --git a/pages/im/mixins/imBase.js b/pages/im/mixins/imBase.js
index ed9dbaa..b67aef0 100644
--- a/pages/im/mixins/imBase.js
+++ b/pages/im/mixins/imBase.js
@@ -1,13 +1,9 @@
 import utils from '@/utils/index.js'
 
-const imBase = {
-    onLoad() {
-      console.log('IM BASE MININX');  
-    },
-    data() {
-        return {
-            
-        }
+export default {
+    onLoad() {},
+    data() {
+        return {}
     },
     computed: {
         contact() {
@@ -17,8 +13,9 @@ const imBase = {
         },
         avatarSize() {
             return utils.rpx2px(84)
+        },
+        sender() {
+            return this.$store.getters.sender
         }
     }
-}
-
-export default imBase
+}
diff --git a/pages/im/mixins/onGroupDismiss.js b/pages/im/mixins/onGroupDismiss.js
index 1f76c40..002c4c0 100644
--- a/pages/im/mixins/onGroupDismiss.js
+++ b/pages/im/mixins/onGroupDismiss.js
@@ -1,5 +1,5 @@
 // 监听群解散的消息，直接跳转到会话列表页面
-const onGroupDismiss = {
+export default {
     data() {
         return {
             currentTargetId: ''
@@ -31,6 +31,4 @@ const onGroupDismiss = {
         uni.$off('onGroupDismiss_' + this.currentTargetId)
         uni.$off('onGroupRemoveYou_' + this.currentTargetId)
     }
-}
-
-export default onGroupDismiss
+}

From 2d97294c9d1dd5fd1c79f6c2b48c7daa3289ff60 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 09:35:37 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/friends/search.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index 0125804..1366453 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -8,17 +8,17 @@
 
 <template>
     <view class="search">
-        <!-- 搜索 、   -->
+        <!-- 搜索 -->
         <u-sticky>
             <view class="header-search">
                 <u-search placeholder="输入用户账号、手机号" searchIcon="search" @custom="search" v-model="searchValue"
-                    @search="search" bgColor="#f9f9f9" :focus="focused" />
+                    @search="search" bgColor="#F3F6FB" :focus="focused" />
             </view>
         </u-sticky>
         <block v-if="searchResult.length > 0">
             <applyFriend :lists="searchResult" :isApply="true" @action="action" />
         </block>
-        <view class="no-lists" v-else>
+        <view class="no-lists" v-if="searchResult.length === 0 && searchValue.length > 1">
             <u-image class="cover" radius="4" width="400rpx" height="400rpx"
                 :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
             <span>暂无匹配内容~</span>
@@ -43,6 +43,20 @@
                 focused: true
             };
         },
+        watch: {
+            searchValue(value) {
+                console.log(value.length, 'length...')
+                if (value.length > 1) {
+                    this.searchResult = []
+                    this.search()
+                    return
+                }
+                if(value.length === 0){
+                    this.searchResult = []
+                    return
+                }
+            }
+        },
         methods: {
             search() {
                 // friendship: ''    没有好友关系

From 07f707f94a661a80c5a2bd08f2f4bf58afb70a7e Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 09:38:11 +0800
Subject: [PATCH 09/19] voice-bug

---
 pages/im/components/show/showVoice.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/im/components/show/showVoice.vue b/pages/im/components/show/showVoice.vue
index 9f26759..701b537 100644
--- a/pages/im/components/show/showVoice.vue
+++ b/pages/im/components/show/showVoice.vue
@@ -23,9 +23,12 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
-    import imBase from '../../mixins/imBase.js'
-    
+    import imBase from '../../mixins/imBase.js'
+
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             message: {
                 type: Object,

From 18173995ab06e1e8a9b633cb45247194c27ac85b Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 09:43:32 +0800
Subject: [PATCH 10/19] merge

---
 pages/im/components/show/showText.vue | 3 ++-
 pages/im/group/invite.vue             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index bbf29c7..9501c45 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -14,7 +14,8 @@
     import imBase from '../../mixins/imBase.js'
     
     export default {
-        name: 'showText',
+        name: 'showText',
+        mixins:[imBase],
         props: {
             message: {
                 type: Object,
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index c205ea9..bab8744 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -45,7 +45,7 @@
         getGroupUsers
     } from '@/apis/interfaces/im';
     import utils from '@/utils/index.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import imBase from '../mixins/imBase.js'
 

From 9c7a8c8ee1661d949c7d0ddd4c45db778769bcea Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 09:48:57 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/show/showText.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 9501c45..407f9a5 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -49,13 +49,14 @@
 
         .name {
             font-size: 24rpx;
-            color: $text-gray-m;
+            color: $text-gray-m;
+            margin-bottom: 10rpx;
         }
 
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
-            padding: 20rpx;
+            padding:10rpx 24rpx;
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;

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 12/19] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=BE=A4=E5=85=AC=E5=91=8A=E6=8C=87=E5=90=91=E4=BF=AE?=
 =?UTF-8?q?=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) {

From 32e3e0ef3040a5320c18aa4803fc5bf1476deb06 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 10:06:33 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/{ => conversation}/messageCell.vue    | 2 +-
 pages/im/components/{ => conversation}/messagePreview.vue | 0
 pages/im/components/conversationList.vue                  | 2 +-
 pages/im/components/sent/sentPopups.vue                   | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename pages/im/components/{ => conversation}/messageCell.vue (94%)
 rename pages/im/components/{ => conversation}/messagePreview.vue (100%)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/conversation/messageCell.vue
similarity index 94%
rename from pages/im/components/messageCell.vue
rename to pages/im/components/conversation/messageCell.vue
index bd8a2a5..7041980 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/conversation/messageCell.vue
@@ -21,7 +21,7 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
-    import imBase from '../mixins/imBase.js'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
         mixins: [
diff --git a/pages/im/components/messagePreview.vue b/pages/im/components/conversation/messagePreview.vue
similarity index 100%
rename from pages/im/components/messagePreview.vue
rename to pages/im/components/conversation/messagePreview.vue
diff --git a/pages/im/components/conversationList.vue b/pages/im/components/conversationList.vue
index 4858aa6..5abd6d8 100644
--- a/pages/im/components/conversationList.vue
+++ b/pages/im/components/conversationList.vue
@@ -17,7 +17,7 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
-    import messageCell from './messageCell'
+    import messageCell from './conversation/messageCell'
 
     export default {
         props: {
diff --git a/pages/im/components/sent/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
index 9c55cdb..5f7550d 100644
--- a/pages/im/components/sent/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -33,7 +33,6 @@
 
 <script>
     import im from '@/utils/im/index.js'
-    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
     import imBase from '../../mixins/imBase.js'
 
     export default {

From 4a31ba32f753cebf6ba049c916aa7f7d0c3fcfc1 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Feb 2022 10:17:54 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=B0=83=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/show/showText.vue   |  2 +-
 pages/im/components/showMessageCell.vue | 23 +++++++++++------------
 pages/im/group/announceCreate.vue       | 14 +++++++++-----
 pages/im/group/announcement.vue         | 20 ++------------------
 4 files changed, 23 insertions(+), 36 deletions(-)

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 @@
     <view class="">
         <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
             {{ message.content.message }}
-            <text class="link" @click="toAnnounce(message.content.extra)"
-                v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
+            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
         </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ 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 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-        <block v-if="type !== 'check'">
+        <block v-if="type !== 'cheack'">
             <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'">
+        <block v-if="type === 'cheack'">
             <view class="content-a"> {{content}} </view>
         </block>
     </view>
@@ -27,13 +27,17 @@
                 targetId: '',
                 content: '',
                 aId: '',
-                type: '' // check ' 查看详情'
+                type: '' // cheack ' 查看详情'
             }
         },
-        onLoad(e) {
+        onLoad(e) {
+            console.log(e,'e,,,,,')
             this.targetId = e.targetId
             if (e.type) {
-                this.type = e.type
+                this.type = e.type
+                uni.setNavigationBarTitle({
+                    title:' 公告内容'
+                })
             }
             if (e.aId) {
                 this.aId = e.aId
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 5e94971..9c140de 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({
@@ -121,7 +121,7 @@
             },
             tabA(id) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
+                    url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
                 })
             },
             onTop(aId) {
@@ -134,14 +134,6 @@
                     uni.$emit('updateAnnouncement')
                     this.initData()
                 })
-                // uni.showModal({
-                //     title: ' 置顶该公告',
-                //     success: (res) => {
-                //         if (res.confirm) {
-
-                //         }
-                //     }
-                // })
             },
             //  删除公告
             onDelete(aId) {
@@ -154,14 +146,6 @@
                     uni.$emit('updateAnnouncement')
                     this.initData()
                 })
-                //        uni.showModal({
-                //            title: '删除该公告',
-                //            success: (res) => {
-                //                if (res.confirm) {
-
-                //                }
-                //            }
-                //        })
             }
         }
     }

From e72d6b3a91c3a0db1725b55cf2553a712b85edd2 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 10:56:16 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=EF=BC=8C=E6=B6=88=E6=81=AF=E6=92=A4=E5=9B=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/.DS_Store                      | Bin 0 -> 6148 bytes
 pages/im/components/show/showText.vue   |   4 --
 pages/im/components/showMessageCell.vue |  34 ++++++++++------
 pages/im/group/announceCreate.vue       |  50 ++++++++++--------------
 pages/im/group/announcement.vue         |   2 +-
 pages/im/group/chat.vue                 |  38 +++++++++---------
 pages/im/private/chat.vue               |  19 +++++----
 utils/im/listeners.js                   |  20 ++++++----
 8 files changed, 87 insertions(+), 80 deletions(-)
 create mode 100644 pages/im/.DS_Store

diff --git a/pages/im/.DS_Store b/pages/im/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b089d3f3f513685888d5d777a8b4f3d1c8f327d3
GIT binary patch
literal 6148
zcmeHKOH0E*5Z<+|O({YSiXH=A3$|K(;3dTR2aM=Jr6#1*V9b_0%%K!=)j#Av@%K2h
zyMY$tRm9G~?l(J+-OLBs2V;yoc`#tiWQ-Zm5IHI}g63M+h7LyLa*ml_q%%Jfe$6z0
z(}dsNVpEnd!E(0z{U81;3e&9L|KuBuW^1!;w2iLu;691M&Acp69WS}V(X|kfU+JEI
z6Hbb;xqTtx%nRd5A``-30wMReVH}9U5qTV>GS^iOqhoZ&=I(qx81}5;>B*vJ&Cd?|
zpdTGC79C?}|KR*;{2aZ+;!W|$fp95X8Y_4QWvQT7H;E$=Pr+JcRFQ<l05L!e5Cdz<
zfIbk6?wZz5WfKF$z|Rce{$N2vv^ACr<<<cmUZ2t5L_`4{-x7$HMq6X45Ii7Ur2?u{
zuAdlOrGwqlakj=%p-N|5t_<_&m8-`Km#c%_lHrWo3aKXsh=ElG8fs|b`F{z&Ozk6o
zHHAjR05R~-7~sv3J93~XeYSop56@Z)+9Na+j4M$A0e$5X00Z1d_M}t!Ez}{-)>taU
US<o)i0qG(j389V{_yq>O09+4B-T(jq

literal 0
HcmV?d00001

diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 097bcfc..c198f5b 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -57,11 +57,7 @@
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
-<<<<<<< HEAD
-            padding:10rpx 30rpx;
-=======
             padding: 20rpx 24rpx;
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 6042c97..395eac3 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -2,7 +2,8 @@
     <view class="">
         <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
             {{ message.content.message }}
-            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
+            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看
+            </text>
         </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
@@ -25,6 +26,9 @@
 </template>
 
 <script>
+    import {
+        getGroupAnnouncement
+    } from '@/apis/interfaces/im.js'
     import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import showVoice from './show/showVoice'
     import showImage from './show/showImage'
@@ -68,17 +72,25 @@
                 }
             },
             // 跳转群公告
-<<<<<<< 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
+                if (message.content.extra) {
+                    getGroupAnnouncement(message.targetId, message.content.extra).then(res => {
+                        uni.navigateTo({
+                            url: '/pages/im/group/announceCreate?type=check&targetId=' + message
+                                .targetId + '&aId=' + message.content.extra
+                        })
+                    }).catch(err => {
+                        IMLib.deleteMessagesByIds([message.messageId], ({
+                            code
+                        }) => {
+                            if (code === 0) {
+                                uni.$emit('remove_message_' + message.targetId, message.messageId)
+                            }
+                        })
+                        uni.showToast({
+                            title: '公告不存在或已删除',
+                            icon: 'none',
+                        })
                     })
                 } else {
                     uni.showToast({
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index 0ad252e..52f4c83 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,23 +1,14 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-<<<<<<< HEAD
-        <block v-if="type !== 'cheack'">
-            <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 === 'cheack'">
-            <view class="content-a"> {{content}} </view>
-=======
-        
+
         <block v-if="type === 'check'">
             <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" />
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
+        </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>
@@ -41,17 +32,12 @@
                 type: '' // cheack ' 查看详情'
             }
         },
-        onLoad(e) {
-<<<<<<< HEAD
-            console.log(e,'e,,,,,')
-=======
-            console.log('E', e);
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
+        onLoad(e) {
             this.targetId = e.targetId
             if (e.type) {
-                this.type = e.type
-                uni.setNavigationBarTitle({
-                    title:' 公告内容'
+                this.type = e.type
+                uni.setNavigationBarTitle({
+                    title: ' 公告内容'
                 })
             }
             if (e.aId) {
@@ -62,11 +48,17 @@
                 getGroupAnnouncement(this.targetId, this.aId).then(res => {
                     this.content = res.content
                 }).catch(err => {
-                    uni.showToast({
-                        title: err.message,
-                        icon: 'none',
-                        mask: true
-                    })
+                    if (err.status_code == 404) {
+                        this.$nextTick(() => {
+                            uni.navigateBack()
+                        })
+                    } else {
+                        uni.showToast({
+                            title: err.message,
+                            icon: 'none',
+                            mask: true
+                        })
+                    }
                 })
             }
         },
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 9c140de..81e3926 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -121,7 +121,7 @@
             },
             tabA(id) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
                 })
             },
             onTop(aId) {
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index e6ab97e..ac1260c 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -22,10 +22,10 @@
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.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
         ],
@@ -54,9 +54,9 @@
                     }
                 }
             }
-        },
-        onShow() {
-            this.initGroupInfo()
+        },
+        onShow() {
+            this.initGroupInfo()
         },
         onLoad(e) {
             this.targetId = e.targetId
@@ -89,22 +89,24 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
-            uni.$on('onRecallMessage', (res) => {
-                if (res.targetId == this.targetId) {
-                    this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
-                            return res
-                        } else {
-                            return item
-                        }
-                    })
-                }
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
+                this.messages = this.messages.map(item => {
+                    if (message.messageId == item.messageId) {
+                        return message
+                    } else {
+                        return item
+                    }
+                })
+            })
+            uni.$on('remove_message_' + this.targetId, (messageId) => {
+                this.messages = this.messages.filter(item => item.messageId != messageId)
             })
         },
         onUnload() {
-            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('remove_message_' + this.targetId)
+            uni.$off('onReceiveMessage_' + this.targetId)
             uni.$off('onUpdateProfile_' + this.targetId)
-            uni.$off('onRecallMessage')
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onReceiptRequest')
             uni.$off('onReceiptResponse')
         },
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index cc2f30e..65c7491 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -75,20 +75,19 @@
                     })
                 }
             })
-            uni.$on('onRecallMessage', (res) => {
-                if (res.targetId == this.targetId) {
-                    this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
-                            return res
-                        } else {
-                            return item
-                        }
-                    })
-                }
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
+                this.messages = this.messages.map(item => {
+                    if (message.messageId == item.messageId) {
+                        return message
+                    } else {
+                        return item
+                    }
+                })
             })
         },
         onUnload() {
             uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onRecallMessage')
             uni.$off('onReadReceiptReceived')
         },
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index f3d4b04..ab0260a 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,8 +55,8 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight,
-    IMLib.ObjectName.GroupNotification
+    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.GroupNotification
 ]
 
 const imLibListeners = () => {
@@ -72,7 +72,7 @@ const imLibListeners = () => {
         checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
             onReceiveMessage(message)
-        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
+        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
             uni.$emit('onUpdateProfile_' + message.targetId)
             // 更新联系人信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
@@ -119,10 +119,16 @@ const imLibListeners = () => {
         uni.$emit('onReadReceiptReceived', data)
     })
     // 监听消息撤回操作
-    IMLib.addRecallMessageListener((res) => {
-        IMLib.getMessage(res.data.messageId, (res) => {
-            console.error("消息撤回: ", res.message);
-            uni.$emit('onRecallMessage', res.message)
+    IMLib.addRecallMessageListener(({
+        data
+    }) => {
+        IMLib.getMessage(data.messageId, ({
+            message
+        }) => {
+            console.error("消息撤回: ", message);
+            im.setNotifyBadge()
+            uni.$emit('onReceiveMessage', message)
+            uni.$emit('onRecallMessage_' + message.targetId, message)
         })
     })
     // 监听需要群聊消息回执

From 08ffc0fa5338be24f59839362d8d6e4f37daf39c Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 11:06:11 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BC=B9=E5=87=BA=E5=B1=82=EF=BC=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/conversationList.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/im/components/conversationList.vue b/pages/im/components/conversationList.vue
index 5abd6d8..fc4d99f 100644
--- a/pages/im/components/conversationList.vue
+++ b/pages/im/components/conversationList.vue
@@ -1,16 +1,17 @@
 <template>
     <view>
-        <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop, 'is-active': pickedItem.targetId == item.targetId }]"
-            :data-item="item" @longpress="onLongPress" @click="toDetail(item)">
-            <message-cell :item="item" />
-        </view>
-        <view class="shade" @click="hidePop" v-show="showPop">
+        <view class="shade" @click="hidePop" @touchmove="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
                 <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu" :data-index="index">
                     {{item}}
                 </view>
             </view>
         </view>
+        <view v-for="(item, index) in conversations" :key="index"
+            :class="['message', { 'is-top': item.isTop, 'is-active': pickedItem.targetId == item.targetId }]"
+            :data-item="item" @longpress="onLongPress" @click="toDetail(item)">
+            <message-cell :item="item" />
+        </view>
     </view>
 </template>
 
@@ -73,7 +74,7 @@
                         .pickedItem.isTop)
                 } else if (index == 1) {
                     RongIMLib.clearMessagesUnreadStatus(this.pickedItem.conversationType, this.pickedItem.targetId, this
-                        .pickedItem.sentTime)
+                        .pickedItem.sentTime)
                 } else {
                     RongIMLib.removeConversation(this.pickedItem.conversationType, this.pickedItem.targetId)
                     RongIMLib.deleteMessages(this.pickedItem.conversationType, this.pickedItem.targetId)
@@ -130,10 +131,10 @@
 
         &.is-top {
             background: $window-color;
-        }
-        
-        &.is-active {
-            background: #F8FAFF;
+        }
+
+        &.is-active {
+            background: #F8FAFF;
         }
     }
 
@@ -142,6 +143,7 @@
         position: fixed;
         width: 100%;
         height: 100%;
+        z-index: 999;
 
         .pop {
             position: fixed;

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 17/19] 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


From f77a91eafe180e978110a2b87eff54d9b4e622b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?=
 <tmoct5@noreply.git.yuzhankeji.cn>
Date: Thu, 24 Feb 2022 11:26:14 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'pages/im/.DS=5FStor?=
 =?UTF-8?q?e'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 pages/im/.DS_Store

diff --git a/pages/im/.DS_Store b/pages/im/.DS_Store
deleted file mode 100644
index b089d3f3f513685888d5d777a8b4f3d1c8f327d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOH0E*5Z<+|O({YSiXH=A3$|K(;3dTR2aM=Jr6#1*V9b_0%%K!=)j#Av@%K2h
zyMY$tRm9G~?l(J+-OLBs2V;yoc`#tiWQ-Zm5IHI}g63M+h7LyLa*ml_q%%Jfe$6z0
z(}dsNVpEnd!E(0z{U81;3e&9L|KuBuW^1!;w2iLu;691M&Acp69WS}V(X|kfU+JEI
z6Hbb;xqTtx%nRd5A``-30wMReVH}9U5qTV>GS^iOqhoZ&=I(qx81}5;>B*vJ&Cd?|
zpdTGC79C?}|KR*;{2aZ+;!W|$fp95X8Y_4QWvQT7H;E$=Pr+JcRFQ<l05L!e5Cdz<
zfIbk6?wZz5WfKF$z|Rce{$N2vv^ACr<<<cmUZ2t5L_`4{-x7$HMq6X45Ii7Ur2?u{
zuAdlOrGwqlakj=%p-N|5t_<_&m8-`Km#c%_lHrWo3aKXsh=ElG8fs|b`F{z&Ozk6o
zHHAjR05R~-7~sv3J93~XeYSop56@Z)+9Na+j4M$A0e$5X00Z1d_M}t!Ez}{-)>taU
US<o)i0qG(j389V{_yq>O09+4B-T(jq


From 056224881e9a49f4aecc61b11b057c3302035755 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 11:27:06 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/im.js |  5 +++--
 utils/im/listeners.js | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js
index 11c75be..47dee85 100644
--- a/apis/interfaces/im.js
+++ b/apis/interfaces/im.js
@@ -315,14 +315,15 @@ export {
     getGroupAnnouncement,
     createGroupAnnouncement,
     deleteGroupAnnouncement,
-    topGroupAnnouncement,
+    topGroupAnnouncement,
     searchGroup,
     joinGroupPre,
     joinGroup,
     quitGroup,
     dismissGroup,
     inviteGroupUser,
-    removeGroupUser,
+    removeGroupUser,
+    transferGroupOwner,
     setGroupAdmin,
     removeGroupAdmin,
     groupMakeSure, //  通过审核
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index ab0260a..0555ba7 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,8 +55,7 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight,
-    IMLib.ObjectName.GroupNotification
+    IMLib.ObjectName.Sight
 ]
 
 const imLibListeners = () => {
@@ -68,7 +67,7 @@ const imLibListeners = () => {
     // 添加消息监听函数
     IMLib.addReceiveMessageListener((res) => {
         const message = res.data.message
-        console.error('[收到消息]', message)
+        console.error('[收到消息]',IMLib.ObjectName.GroupNotification, message)
         checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
             onReceiveMessage(message)
@@ -83,7 +82,8 @@ const imLibListeners = () => {
             uni.$emit('onNewContactConversation', message)
             uni.$emit('onNewContactFriends', message)
             uni.$emit('onNewContactPendings', message)
-        } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+        } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+            console.log('踢出用户',message);
             // 解散群
             if (message.content.operation === 'Dismiss') {
                 IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
@@ -93,7 +93,8 @@ const imLibListeners = () => {
                 // 发布群解散的消息
                 uni.$emit('onGroupDismiss')
                 uni.$emit('onGroupDismiss_' + message.targetId)
-            } else if (message.content.operation === 'REMOVE') {
+            } else if (message.content.operation === 'REMOVE') {
+                console.log('踢出', message.content);
                 // 要判断是否当前用户，然后把当前用户踢出到主页去， 删除聊天记录，会话列表
                 if (message.content.extra == store.getters.sender.userId) {
                     IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,