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] 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