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 1/2] =?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 2/2] =?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
+}