From 8d8d00726cabe6f1285081b23f6e80e4e9793dd2 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 16 Feb 2022 13:29:33 +0800
Subject: [PATCH 01/25] =?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

---
 pages/im/group/apply.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index 3f7aa3f..81429c6 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="apply">
-        <u-avatar :src="group.cover" size="128" shape="square"></u-avatar>
+    <view class="apply" v-if="loaded">
+        <u-avatar :src="group.cover || require('@/static/user/cover.png')" size="128" shape="square" />
         <view class="name">
             {{ group.name }}
         </view>
@@ -15,7 +15,7 @@
         <u-modal negativeTop="300" :show="modalShow" title="申请原因" showCancelButton @cancel="onHideModal"
             @confirm="onJoinGroup">
             <view class="slot-content">
-                <u--input placeholder="申请原因" border="surround" focus v-model="message"></u--input>
+                <u--input placeholder="申请原因" border="surround" focus v-model="message" />
             </view>
         </u-modal>
     </view>
@@ -34,14 +34,17 @@
                 group: {},
                 modalShow: false,
                 message: '',
-                disabled: false
+                disabled: false,
+                loaded:false
             }
         },
         onLoad(e) {
-            this.targetId = e.targetId
+            // this.targetId = e.targetId || TG2
+            this.targetId = "TG2"
             joinGroupPre(this.targetId).then(res => {
                 console.log(res);
                 this.group = res
+                this.loaded = true
             })
         },
         methods: {

From b4e17cc1931d9689e70818a6fa6dfc12a85e5259 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 15:05:17 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/im.js                 |   2 +-
 pages/im/components/groupUserList.vue | 300 ++++++++++++++++++++++++++
 pages/im/group/info.vue               | 197 ++---------------
 pages/im/group/users.vue              | 150 +------------
 {lib => utils}/emoji.js               |   0
 utils/im/index.js                     |   1 -
 6 files changed, 319 insertions(+), 331 deletions(-)
 create mode 100644 pages/im/components/groupUserList.vue
 rename {lib => utils}/emoji.js (100%)

diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js
index deb8b1c..ba17956 100644
--- a/apis/interfaces/im.js
+++ b/apis/interfaces/im.js
@@ -259,7 +259,7 @@ const removeGroupAdmin = (groupId, userId) => {
  */
 const transferGroupOwner = (groupId, userId) => {
     return request({
-        method: 'DELETE',
+        method: 'POST',
         url: 'im/groups/' + groupId + '/owner/' + userId
     })
 }
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
new file mode 100644
index 0000000..c328223
--- /dev/null
+++ b/pages/im/components/groupUserList.vue
@@ -0,0 +1,300 @@
+<template>
+    <view class="members">
+        <view class="users">
+            <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
+                v-for="(item, index) in users" :key="index" @click="toUser(item)">
+                <u-avatar size="44" shape="square" :src="item.portraitUrl"></u-avatar>
+                <view class="name">{{ item.name }}</view>
+                <view class="admin" v-if="item.is_admin">管理</view>
+                <view class="owner" v-if="item.targetId === adminUid">群主</view>
+            </view>
+            <view class="user" v-if="isAdmin">
+                <u-avatar @click="inviteUser" size="44" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
+                </u-avatar>
+                <view class="name">邀请好友</view>
+            </view>
+        </view>
+
+        <view @click="loadMore" v-if="members > users.length" class="loadmore">查看更多群成员 ></view>
+
+        <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
+            @select="handleAction" :show="actionShow">
+        </u-action-sheet>
+    </view>
+</template>
+
+<script>
+    import {
+        getGroupUsers,
+        getGroupBase,
+
+        removeGroupUser,
+        setGroupAdmin,
+        removeGroupAdmin,
+        transferGroupOwner
+    } from '@/apis/interfaces/im.js'
+
+    export default {
+        props: {
+            targetId: {
+                type: String,
+                default: ''
+            },
+            count: {
+                type: Number,
+                default: 0
+            }
+        },
+        data() {
+            return {
+                users: [],
+                isOwner: false,
+                isAdmin: false,
+                adminUid: 0,
+                members: 0,
+                actionShow: false,
+                actionMap: [],
+                actionTitle: '',
+                currentUser: {}
+            }
+        },
+        mounted() {
+            this.initGroupInfo()
+            this.initUsers()
+        },
+        methods: {
+            initGroupInfo() {
+                getGroupBase(this.targetId).then(res => {
+                    this.isOwner = res.is_owner
+                    this.isAdmin = res.is_admin
+                    this.adminUid = res.user_id
+                    this.members = res.members
+                })
+            },
+            initUsers() {
+                getGroupUsers(this.targetId, this.count).then(res => {
+                    this.users = res
+                    console.log('群成员列表', res);
+                })
+            },
+            hideAction(item) {
+                this.actionShow = false
+                this.actionTitle = ''
+                this.currentUser = {}
+            },
+            showAction(item) {
+                this.currentUser = item
+                this.actionTitle = item.name
+                // 只有管理员以上才会弹窗
+                if (this.isAdmin) {
+                    if (this.isOwner) {
+                        if (!item.is_admin) {
+                            this.actionMap = [{
+                                key: 0,
+                                name: '移除成员',
+                                disabled: false
+                            }, {
+                                key: 1,
+                                name: '设置管理',
+                                disabled: false
+                            }, {
+                                key: 2,
+                                name: '转移群主',
+                                disabled: false
+                            }]
+                        } else {
+                            this.actionMap = [{
+                                key: 0,
+                                name: '移除成员',
+                                disabled: false
+                            }, {
+                                key: 4,
+                                name: '取消管理',
+                                disabled: false
+                            }, {
+                                key: 2,
+                                name: '转移群主',
+                                disabled: false
+                            }]
+                        }
+                    } else {
+                        this.actionMap = [{
+                            key: 0,
+                            name: '移除成员',
+                            disabled: false
+                        }]
+                    }
+                    this.actionShow = true
+                }
+            },
+            handleAction(e) {
+                switch (e.key) {
+                    case 0:
+                        removeGroupUser(this.targetId, this.currentUser.targetId).then(res => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '成员移除成功'
+                            })
+                        }).catch(err => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: err.message
+                            })
+                        }).finally(() => {
+                            this.initUsers()
+                        })
+                        break;
+                    case 1:
+                        setGroupAdmin(this.targetId, this.currentUser.targetId).then(res => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '设置管理成功'
+                            })
+                        }).catch(err => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: err.message
+                            })
+                        }).finally(() => {
+                            this.initUsers()
+                        })
+                        break;
+                    case 4:
+                        removeGroupAdmin(this.targetId, this.currentUser.targetId).then(res => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '取消管理员成功'
+                            })
+                        }).catch(err => {
+                            uni.showToast({
+                                icon: 'none',
+                                title: err.message
+                            })
+                        }).finally(() => {
+                            this.initUsers()
+                        })
+                        break;
+                    case 2:
+                        uni.showModal({
+                            title: '转让群主',
+                            content: '这个操作不可逆转，确定要转让群主身份么？',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    transferGroupOwner(this.targetId, this.currentUser.targetId).then(
+                                        res => {
+                                            uni.showToast({
+                                                icon: 'none',
+                                                title: '群主转让成功'
+                                            })
+                                        }).catch(err => {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: err.message
+                                        })
+                                    }).finally(() => {
+                                        this.initUsers()
+                                        this.initGroupInfo()
+                                    })
+                                }
+                            }
+                        })
+                        break;
+                }
+            },
+            inviteUser() {
+                uni.navigateTo({
+                    url: '/pages/im/group/invite?targetId=' + this.targetId
+                })
+            },
+            loadMore() {
+                uni.navigateTo({
+                    url: '/pages/im/group/users?targetId=' + this.targetId
+                })
+            },
+            toUser(item) {
+                if (item.targetId == this.$store.getters.sender.userId) {
+                    uni.navigateTo({
+                        url: '/pages/im/friends/mine?targetId=' + item.targetId
+                    })
+                } else {
+                    uni.navigateTo({
+                        url: '/pages/im/friends/info?targetId=' + item.targetId
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+
+<style lang="scss" scoped>
+    .members {
+
+        .users {
+            flex-direction: row;
+            flex-wrap: wrap;
+            display: flex;
+            padding: 20rpx 0;
+
+            .user {
+                overflow: hidden;
+                position: relative;
+                width: 126rpx;
+                margin-left: 20rpx;
+                margin-bottom: 20rpx;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                border-radius: 0 10rpx 0 0;
+
+                &.active {
+                    background-color: $window-color;
+                }
+
+                .name {
+                    color: $text-gray-m;
+                    width: 126rpx;
+                    text-align: center;
+                    font-size: 26rpx;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    word-break: break-word;
+                }
+
+                .admin {
+                    position: absolute;
+                    background-color: $main-color;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+                
+                .owner {
+                    position: absolute;
+                    background-color: $text-price;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+            }
+        }
+
+        .loadmore {
+            font-size: 26rpx;
+            color: $text-gray-m;
+            text-align: center;
+        }
+    }
+</style>
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index f716b78..b86f58a 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -1,22 +1,7 @@
 <template>
     <view class="container">
         <view class="members u-border-bottom">
-            <view class="users">
-                <view :class="['user', {'active': item.targetId == currentUser.targetId}]"
-                    v-for="(item, index) in users" :key="index" @click="toUser(item)"
-                    @longpress="showUserActionSheet(item)">
-                    <u-avatar size="44" shape="square" :src="item.portraitUrl">
-                    </u-avatar>
-                    <view class="name">{{ item.name }}</view>
-                </view>
-                <view class="user" v-if="group.can_invite">
-                    <u-avatar @click="inviteUser" size="44" shape="square" icon="plus" bg-color="#eeeeee"
-                        color="#999999"></u-avatar>
-                    <view class="name">邀请好友</view>
-                </view>
-            </view>
-
-            <view @click="loadMore" v-if="members > users.length" class="loadmore">查看更多群成员 ></view>
+            <group-user-list :targetId="targetId" :count="14" />
         </view>
 
         <u-cell-group class="cells">
@@ -60,10 +45,6 @@
         <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions"
             @close="showActions=false">
         </u-action-sheet>
-
-        <u-action-sheet @select="handleUserAction" :actions="userActionMap" cancelText="取消" :show="showUserAction"
-            @close="hideUserAction">
-        </u-action-sheet>
     </view>
 </template>
 
@@ -72,27 +53,24 @@
         getGroupInfo,
         updateGroup,
         quitGroup,
-        removeGroupUser,
-        setGroupAdmin,
-        removeGroupAdmin,
-        dismissGroup,
-        transferGroupOwner,
-        getGroupUsers
+        dismissGroup
     } from '@/apis/interfaces/im.js'
     import {
         uploads
     } from '@/apis/interfaces/uploading'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import groupUserList from '../components/groupUserList'
 
     export default {
+        components: {
+            groupUserList
+        },
         data() {
             return {
                 targetId: '',
                 group: {},
                 conversationType: 3,
                 announcement: '',
-                users: [],
-                members: 0,
                 status: false,
                 isTop: false,
                 loaded: false,
@@ -102,24 +80,7 @@
                 qrContent: 'JOINGROUP|',
                 joinType: '',
                 joinTypeMap: [],
-                showActions: false,
-                showUserAction: false,
-                userActionMap: [{
-                        key: 0,
-                        name: '移除成员',
-                        disabled: false
-                    }, {
-                        key: 1,
-                        name: '设置管理',
-                        disabled: true
-                    },
-                    {
-                        key: 2,
-                        name: '转移群主',
-                        disabled: true
-                    }
-                ],
-                currentUser: {}
+                showActions: false
             }
         },
         onLoad(e) {
@@ -139,18 +100,12 @@
                 }
             })
             this.initData()
-            this.initUsers()
             uni.$on('groupAnnouncementCreated', this.initData)
         },
         onUnload() {
             uni.$off('groupAnnouncementCreated')
         },
         methods: {
-            initUsers() {
-                getGroupUsers(this.targetId, 14).then(res => {
-                    this.users = res
-                })
-            },
             initData() {
                 getGroupInfo(this.targetId).then(res => {
                     this.group = res.group
@@ -190,27 +145,6 @@
                     })
                 })
             },
-            toUser(item) {
-                if (item.targetId == this.$store.getters.sender.userId) {
-                    uni.navigateTo({
-                        url: '/pages/im/friends/mine?targetId=' + item.targetId
-                    })
-                } else {
-                    uni.navigateTo({
-                        url: '/pages/im/friends/info?targetId=' + item.targetId
-                    })
-                }
-            },
-            inviteUser() {
-                uni.navigateTo({
-                    url: '/pages/im/group/invite?targetId=' + this.targetId
-                })
-            },
-            loadMore() {
-                uni.navigateTo({
-                    url: '/pages/im/group/users?targetId=' + this.targetId
-                })
-            },
             toAnnouncement() {
                 uni.navigateTo({
                     url: '/pages/im/group/announcement?targetId=' + this.targetId
@@ -360,86 +294,19 @@
                                 uni.showToast({
                                     icon: 'none',
                                     title: '退出群聊成功'
-                                })
-                                // 移除指定的会话
-                                RongIMLib.removeConversation(this.conversationType, this.targetId)
-                                
+                                })
+                                // 移除指定的会话
+                                RongIMLib.removeConversation(this.conversationType, this.targetId)
+
                                 uni.switchTab({
                                     url: '/pages/im/index'
                                 })
-                            }).catch(err => {
-                                console.log(err);
+                            }).catch(err => {
+                                console.log(err);
                             })
                         }
                     }
                 })
-            },
-            showUserActionSheet(item) {
-                this.currentUser = item
-                // 只有管理员以上才会弹窗
-                if (this.group.is_admin) {
-                    if (this.group.is_owner) {
-                        this.userActionMap.map((item) => {
-                            item.disabled = false
-                            return item
-                        })
-                    }
-                    this.showUserAction = true
-                }
-            },
-            hideUserAction() {
-                this.currentUser = {}
-                this.showUserAction = false
-            },
-            handleUserAction(e) {
-                switch (e.key) {
-                    case 0:
-                        removeGroupUser(this.targetId, this.currentUser.targetId).then(res => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: '成员移除成功'
-                            })
-                        }).catch(err => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: err.message
-                            })
-                        }).finally(() => {
-                            this.initUsers()
-                        })
-                        break;
-                    case 1:
-                        setGroupAdmin(this.targetId, this.currentUser.targetId).then(res => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: '设置管理成功'
-                            })
-                        }).catch(err => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: err.message
-                            })
-                        }).finally(() => {
-                            this.initUsers()
-                        })
-                        break;
-                    case 2:
-                        transferGroupOwner(this.targetId, this.currentUser.targetId).then(res => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: '群主转让成功'
-                            })
-                        }).catch(err => {
-                            uni.showToast({
-                                icon: 'none',
-                                title: err.message
-                            })
-                        }).finally(() => {
-                            this.initUsers()
-                            this.initData()
-                        })
-                        break;
-                }
             }
         }
     }
@@ -459,44 +326,6 @@
     .members {
         background-color: white;
         padding-bottom: 40rpx;
-
-        .users {
-            flex-direction: row;
-            flex-wrap: wrap;
-            display: flex;
-            padding: 20rpx 0;
-
-            .user {
-                width: 126rpx;
-                margin-left: 20rpx;
-                margin-bottom: 20rpx;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-
-                &.active {
-                    background-color: $window-color;
-                }
-
-                .name {
-                    color: $text-gray-m;
-                    width: 126rpx;
-                    text-align: center;
-                    font-size: 26rpx;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    word-break: break-word;
-                }
-            }
-        }
-
-        .loadmore {
-            font-size: 26rpx;
-            color: $text-gray-m;
-            text-align: center;
-        }
     }
 
     .actions {
diff --git a/pages/im/group/users.vue b/pages/im/group/users.vue
index 6daa258..f356d8b 100644
--- a/pages/im/group/users.vue
+++ b/pages/im/group/users.vue
@@ -1,164 +1,24 @@
 <template>
-    <view class="members">
-        <view class="users">
-            <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" size="44" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
-                </u-avatar>
-                <view class="name">邀请好友</view>
-            </view>
-            <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
-                v-for="(item, index) in members" :key="index" @click="toUser(item)">
-                <u-avatar size="44" shape="square" :src="item.portraitUrl"></u-avatar>
-                <view class="name">{{ item.name }}</view>
-            </view>
-        </view>
-        <view class="loadmore">成员总数（{{ members.length }}）</view>
-
-        <u-action-sheet :actions="userActions" :title="actionTitle" cancelText="取消" @close="hideAction"
-            @select="doAction" :show="actionShow">
-        </u-action-sheet>
-    </view>
+    <group-user-list :targetId="targetId" />
 </template>
 
 <script>
-    import {
-        getGroupBase,
-        getGroupUsers
-    } from '@/apis/interfaces/im.js'
-
+    import groupUserList from '../components/groupUserList'
     export default {
+        components: {
+            groupUserList
+        },
         data() {
             return {
                 targetId: '',
-                members: [],
-                isOwner: false,
-                isAdmin: false,
-                actionShow: false,
-                userActions: [{
-                        type: 0,
-                        name: '设置管理员',
-                        disabled: false
-                    },
-                    {
-                        type: 1,
-                        name: '解除管理员',
-                        disabled: false
-                    },
-                    {
-                        type: 2,
-                        name: '移除成员',
-                        disabled: false
-                    }
-                ],
-                actionTitle: '',
-                currentUser: {}
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
-            getGroupBase(this.targetId).then(res => {
-                this.isOwner = res.is_owner
-                this.isAdmin = res.is_admin
-                if (this.isOwner) {
-                    this.userActions.push({
-                        type: 3,
-                        name: '转移群主',
-                        disabled: false
-                    })
-                }
-            })
-            this.getUserList()
-        },
-        methods: {
-            getUserList() {
-                getGroupUsers(this.targetId).then(res => {
-                    this.members = res
-                })
-            },
-            toUser(item) {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + item.targetId
-                })
-            },
-            showAction(item) {
-                this.currentUser = item
-                this.actionTitle = item.name
-                this.actionShow = true
-                // 根据当前用户，是不是管理，来控制按钮的可用性
-                this.userActions[0].disabled = true
-            },
-            hideAction(item) {
-                this.actionShow = false
-                this.actionTitle = ''
-                this.currentUser = {}
-                this.userActions[0].disabled = false
-                this.userActions[1].disabled = false
-            },
-            doAction(e) {
-                switch (e.type) {
-                    case 0:
-                        // 设置管理
-                        break;
-                    case 1:
-                        // 取消管理
-                        break;
-                    case 2:
-                        // 移除成员
-                        break;
-                    case 3:
-                        // 转移管理员
-                        break;
-                }
-                this.getUserList()
-            },
-            inviteUser() {
-
-            }
         }
     }
 </script>
 
 <style lang="scss" scoped>
-    .members {
-        background-color: white;
-        padding-bottom: 40rpx;
 
-        .users {
-            flex-direction: row;
-            flex-wrap: wrap;
-            display: flex;
-            padding: 20rpx 0;
-
-            .user {
-                width: 126rpx;
-                margin-left: 20rpx;
-                margin-bottom: 20rpx;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-
-                &.active {
-                    background-color: $window-color;
-                }
-
-                .name {
-                    color: $text-gray-m;
-                    width: 126rpx;
-                    text-align: center;
-                    font-size: 26rpx;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    word-break: break-word;
-                }
-            }
-        }
-
-        .loadmore {
-            font-size: 26rpx;
-            color: $text-gray-m;
-            text-align: center;
-        }
-    }
 </style>
diff --git a/lib/emoji.js b/utils/emoji.js
similarity index 100%
rename from lib/emoji.js
rename to utils/emoji.js
diff --git a/utils/im/index.js b/utils/im/index.js
index 7fdf5dc..e68329b 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -210,7 +210,6 @@ const newMessage = (msg) => {
     }) => {
         if (code === 0) {
             if (status) {
-                uni.vibrateLong()
                 triTone()
             }
         }

From 3790ec89012c408c48e664b2200cb5dd6f43207d Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 16 Feb 2022 15:28:04 +0800
Subject: [PATCH 03/25] =?UTF-8?q?im=E8=81=8A=E5=A4=A9=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E7=BE=A4=E7=94=B3=E8=AF=B7=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B=E9=95=BF=E6=8C=89=E5=88=A0=E9=99=A4=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E8=B0=83=E6=95=B4=EF=BC=9B=E8=81=8A=E5=A4=A9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=83=8C=E6=99=AF=E8=89=B2=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |  2 +-
 pages/im/components/conversationList.vue | 17 +++++++-
 pages/im/components/messagePreview.nvue  |  2 +-
 pages/im/group/apply.vue                 | 51 +++++++++++++++++++-----
 pages/im/index.vue                       |  4 +-
 5 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/pages.json b/pages.json
index 61a9c6a..d9a90cb 100644
--- a/pages.json
+++ b/pages.json
@@ -634,7 +634,7 @@
         }
     ],
     "tabBar": {
-        "borderStyle": "white",
+        "borderStyle": "black",
         "selectedColor": "#34CE98",
         "list": [{
                 "iconPath": "static/tabBar/tabBar_00.png",
diff --git a/pages/im/components/conversationList.vue b/pages/im/components/conversationList.vue
index cf3eeca..2468e8a 100644
--- a/pages/im/components/conversationList.vue
+++ b/pages/im/components/conversationList.vue
@@ -46,6 +46,16 @@
             }
         },
 
+        created() {
+            uni.getSystemInfo({
+                success: (e) => {
+                    this.winSize = {
+                        width: e.windowWidth,
+                        height: e.windowHeight
+                    }
+                }
+            })
+        },
         methods: {
             // 隐藏功能菜单
             hidePop() {
@@ -79,12 +89,15 @@
                 } else {
                     style = `top:${touches.clientY}px;`
                 }
-                if (touches.clientX > (this.winSize.witdh / 2)) {
-                    style += `right:${this.winSize.witdh-touches.clientX}px`
+
+                if (touches.clientX > (this.winSize.width / 2)) {
+                    style += `right:${this.winSize.width-touches.clientX}px`
                 } else {
                     style += `left:${touches.clientX}px`
                 }
 
+
+
                 this.popButton[0] = item.isTop ? '取消置顶' : '置顶聊天'
                 this.popStyle = style
                 this.pickedItem = item
diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.nvue
index 8a0efab..91f38b1 100644
--- a/pages/im/components/messagePreview.nvue
+++ b/pages/im/components/messagePreview.nvue
@@ -54,7 +54,7 @@
     .preview {
         word-break: break-all;
         color: $text-gray-m;
-        padding-top: $padding - 20;
+        padding-top: $padding - 22;
         padding-bottom: $padding;
         font-size: $title-size-m;
         height: 32rpx;
diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index 81429c6..247545a 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -5,13 +5,15 @@
             {{ group.name }}
         </view>
 
-        <u-button v-if="group.can_join" @click="applyGroup" text="申请加群" :disabled="disabled" color="#34CE98" />
+        <u-button class="apply-btn" v-if="group.can_join" @click="applyGroup" text="申请加群" :disabled="disabled"
+            color="#34CE98" />
         <view class="" v-else>
             <view class="" v-if="group.is_full">群已满员</view>
             <view class="" v-if="group.deny_apply">禁止申请</view>
-            <u-button v-if="group.state === 'accepted'" color="#34CE98" text="进入群聊" @click="toGroupChat" />
+            <u-button class="apply-btn2" v-if="group.state === 'accepted'" color="#34CE98" text="进入群聊"
+                @click="toGroupChat" />
         </view>
-
+
         <u-modal negativeTop="300" :show="modalShow" title="申请原因" showCancelButton @cancel="onHideModal"
             @confirm="onJoinGroup">
             <view class="slot-content">
@@ -35,16 +37,23 @@
                 modalShow: false,
                 message: '',
                 disabled: false,
-                loaded:false
+                loaded: false
             }
         },
         onLoad(e) {
-            // this.targetId = e.targetId || TG2
-            this.targetId = "TG2"
+            console.log(e, 'e。。。。。。')
+            this.targetId = e.targetId
+            // this.targetId = "TG2"
             joinGroupPre(this.targetId).then(res => {
-                console.log(res);
                 this.group = res
                 this.loaded = true
+            }).catch(err => {
+                uni.showToast({
+                    title: err.message,
+                    icon: 'none',
+                    mask: true,
+                    duration: 3000
+                })
             })
         },
         methods: {
@@ -65,8 +74,13 @@
                     console.log('申请结果', res);
                     uni.showToast({
                         icon: 'none',
-                        title: '申请成功'
+                        title: '申请成功',
+                        duration:2000,
+                        mast:true
                     })
+                    setTimeout(() => {
+                        this.$Router.back()
+                    }, 2000)
                 }).catch(err => {
                     uni.showToast({
                         icon: 'none',
@@ -85,10 +99,27 @@
         display: flex;
         flex-direction: column;
         align-items: center;
+        width: 100%;
+        min-height: 100vh;
+        background-color: $window-color;
 
         .u-avatar {
-            width: 200rpx;
-            height: 200rpx;
+            margin-top: 60rpx;
+            width: 180rpx;
+            height: 180rpx;
+        }
+
+        .name {
+            margin: 40rpx 0;
+            font-size: $title-size + 2;
+        }
+
+        .apply-btn {
+            width: 80%;
+            font-size: $title-size;
+        }
+        .apply-btn2{   
+            padding: 0 100rpx;
         }
     }
 </style>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 5cb1a75..bbd63ed 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -130,9 +130,9 @@
 <style lang="scss" scoped>
     // contents
     .contents {
-        background-color: $window-color;
+        background-color: #fff;
         min-height: 100vh;
-        padding-top: 90rpx + 20rpx;
+        padding-top: 90rpx + 6rpx;
         box-sizing: border-box;
 
         .custom-header {

From dc2114691741be251c20866aeda20ea16b818f67 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 15:43:19 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E7=BE=A4=E8=81=8A=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.nvue | 34 ++++++++++++++++++++--------------
 pages/im/index.vue       |  2 +-
 utils/im/index.js        |  7 +++++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index 151eec2..b597f7a 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -4,14 +4,15 @@
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
-                        :src="item.content.userInfo.portraitUrl" />
+                        :src="contact(item.senderUserId).portraitUrl" />
+                        <!-- item.content.userInfo.portraitUrl -->
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                         <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                         <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
@@ -50,17 +51,22 @@
                     name: ''
                 }
             }
-        },
-        computed: {
-            latestMessage() {
-                if (this.messages.length > 1) {
-                    return this.messages[this.messages.length - 1]
-                } else {
-                    return {
-                        sentTime: 0
-                    }
+        },
+        computed: {
+            latestMessage() {
+                if (this.messages.length > 1) {
+                    return this.messages[this.messages.length - 1]
+                } else {
+                    return {
+                        sentTime: 0
+                    }
+                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
                 }
-            }
+            }
         },
         onLoad(e) {
             this.targetId = e.targetId
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 5cb1a75..cfdf2cf 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -91,7 +91,7 @@
                 const count = 1000
                 const timestamp = 0
                 RongIMLib.getConversationList([1, 3], count, timestamp, (res) => {
-                    if (res.code === 0) {
+                    if (res.code === 0) {
                         this.conversations = res.conversations
                     }
                 })
diff --git a/utils/im/index.js b/utils/im/index.js
index e68329b..7f52693 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -141,6 +141,13 @@ const addListeners = () => {
                 }).catch(err => {
                     console.log('ERR', err)
                 })
+            }
+            if (!store.getters.contactIsExist(message.senderUserId)) {
+                getUserInfo(message.senderUserId).then(res => {
+                    store.dispatch('initContact', res)
+                }).catch(err => {
+                    console.log('ERR', err)
+                })
             }
             newMessage(message)
         } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {

From 3e16fddb46fc73caac68ece41007478bf80c1e7a Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 16 Feb 2022 15:44:20 +0800
Subject: [PATCH 05/25] ...

---
 pages/im/components/messageCell.vue     |  2 +-
 pages/im/components/messagePreview.nvue | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 3c6563c..6080df1 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -82,7 +82,7 @@
                 }
 
                 .time {
-                    font-size: $title-size-sm;
+                    font-size: $title-size-sm - 2;
                     color: $text-gray-m;
                     position: absolute;
                     right: 30rpx;
diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.nvue
index 91f38b1..cb44e6a 100644
--- a/pages/im/components/messagePreview.nvue
+++ b/pages/im/components/messagePreview.nvue
@@ -1,28 +1,28 @@
 <template>
     <view>
         <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>{{ msg.content || '' }}
+            <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
         </view>
         <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[语音]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[图片]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[表情]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[文件]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[位置]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:AudioMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[语音通话]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
         </view>
         <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}: </text>[视频通话]
+            <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
         </view>
     </view>
 </template>
@@ -56,7 +56,7 @@
         color: $text-gray-m;
         padding-top: $padding - 22;
         padding-bottom: $padding;
-        font-size: $title-size-m;
+        font-size: $title-size-m - 2;
         height: 32rpx;
         line-height: 32rpx;
         width: 520rpx;

From fe9b79a18d5378b6b1fbcfd99c67d483e6a053d3 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 16:29:52 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=E7=BE=A4=E5=A4=B4=E5=83=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue | 47 +++++++++++++++------------
 pages/im/group/chat.nvue              |  3 +-
 pages/im/group/info.vue               |  4 +--
 pages/im/private/chat.nvue            |  2 +-
 store/modules/im.js                   | 10 +++---
 utils/im/index.js                     |  3 +-
 6 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index c328223..4efd6f6 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -3,13 +3,14 @@
         <view class="users">
             <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
-                <u-avatar size="44" shape="square" :src="item.portraitUrl"></u-avatar>
+                <u-avatar :size="avatarSize" shape="square" :src="item.portraitUrl"></u-avatar>
                 <view class="name">{{ item.name }}</view>
                 <view class="admin" v-if="item.is_admin">管理</view>
                 <view class="owner" v-if="item.targetId === adminUid">群主</view>
             </view>
             <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" size="44" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
+                <u-avatar @click="inviteUser" size="126rpx" shape="square" icon="plus" bg-color="#eeeeee"
+                    color="#999999">
                 </u-avatar>
                 <view class="name">邀请好友</view>
             </view>
@@ -49,15 +50,20 @@
             return {
                 users: [],
                 isOwner: false,
-                isAdmin: false,
+                isAdmin: false,
                 adminUid: 0,
                 members: 0,
                 actionShow: false,
                 actionMap: [],
                 actionTitle: '',
-                currentUser: {}
+                currentUser: {},
+                avatarSize: 40
             }
         },
+        created() {
+            this.avatarSize = 126 / 750 * wx.getSystemInfoSync().windowWidth
+            console.log(this.avatarSize)
+        },
         mounted() {
             this.initGroupInfo()
             this.initUsers()
@@ -66,7 +72,7 @@
             initGroupInfo() {
                 getGroupBase(this.targetId).then(res => {
                     this.isOwner = res.is_owner
-                    this.isAdmin = res.is_admin
+                    this.isAdmin = res.is_admin
                     this.adminUid = res.user_id
                     this.members = res.members
                 })
@@ -79,8 +85,6 @@
             },
             hideAction(item) {
                 this.actionShow = false
-                this.actionTitle = ''
-                this.currentUser = {}
             },
             showAction(item) {
                 this.currentUser = item
@@ -180,6 +184,7 @@
                             content: '这个操作不可逆转，确定要转让群主身份么？',
                             success: (res) => {
                                 if (res.confirm) {
+                                    console.log(this.targetId, this.currentUser.targetId);
                                     transferGroupOwner(this.targetId, this.currentUser.targetId).then(
                                         res => {
                                             uni.showToast({
@@ -245,7 +250,7 @@
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
-                align-items: center;
+                align-items: center;
                 border-radius: 0 10rpx 0 0;
 
                 &.active {
@@ -274,19 +279,19 @@
                     text-align: center;
                     right: -45rpx;
                     top: -20rpx;
-                }
-                
-                .owner {
-                    position: absolute;
-                    background-color: $text-price;
-                    transform: rotate(45deg);
-                    color: #ffffff;
-                    font-size: 12rpx;
-                    width: 100rpx;
-                    padding-top: 30rpx;
-                    text-align: center;
-                    right: -45rpx;
-                    top: -20rpx;
+                }
+
+                .owner {
+                    position: absolute;
+                    background-color: $text-price;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
                 }
             }
         }
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index b597f7a..a601c61 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -5,7 +5,6 @@
                 <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
                         :src="contact(item.senderUserId).portraitUrl" />
-                        <!-- item.content.userInfo.portraitUrl -->
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" :name="contact(item.senderUserId).name" />
@@ -54,7 +53,7 @@
         },
         computed: {
             latestMessage() {
-                if (this.messages.length > 1) {
+                if (this.messages.length) {
                     return this.messages[this.messages.length - 1]
                 } else {
                     return {
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index b86f58a..a6cced9 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -17,8 +17,8 @@
 
         <u-cell-group class="cells" v-if="group.is_admin">
             <u-cell isLink title="修改群聊名称" :value="groupName" @click="onGroupName"></u-cell>
-            <u-cell isLink title="修改群头像">
-                <u-avatar slot="value" size="25" shape="square" @click="onGroupAvatar" :src="group.cover"></u-avatar>
+            <u-cell isLink title="修改群头像" @click="onGroupAvatar">
+                <u-avatar slot="value" size="25" shape="square" :src="group.cover"></u-avatar>
             </u-cell>
             <u-cell isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType"></u-cell>
         </u-cell-group>
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index 02dfc0f..1dba707 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -62,7 +62,7 @@
         },
         computed: {
             latestMessage() {
-                if (this.messages.length > 1) {
+                if (this.messages.length) {
                     return this.messages[this.messages.length - 1]
                 } else {
                     return {
diff --git a/store/modules/im.js b/store/modules/im.js
index 8077e66..6526937 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -34,7 +34,7 @@ export default {
         }
     },
     mutations: {
-        updateContactInfo(state, contactInfo) {
+        updateContactInfo(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         },
         setSenderInfo(state, contactInfo) {
@@ -68,7 +68,6 @@ export default {
                     // 没有数据，直接新增一条
                     dispatch('initContact', contactInfo)
                 } else if (contactInfo.hash != result[0].hash) {
-                    commit('updateContactInfo', contactInfo)
                     if (contactInfo.portraitUrl && contactInfo.portraitUrl != result[0].portraitUrl) {
                         saveAvatar(contactInfo, (savedFilePath) => {
                             const info = {
@@ -79,8 +78,8 @@ export default {
                                 localAvatar: savedFilePath
                             }
                             model.update('targetId="' + contactInfo.targetId + '"', info, (err,
-                            res) => {
-                                console.log('UPDATE AVATAR, ERR', err);
+                                res) => {
+                                console.log('UPDATE AVATAR, ERR', err, info);
                             })
                             commit('updateContactInfo', info)
                         })
@@ -93,8 +92,9 @@ export default {
                             localAvatar: result[0].localAvatar
                         }
                         model.update('targetId="' + contactInfo.targetId + '"', info, (err, res) => {
-                            console.log('UPDATE NAME, ERR', err);
+                            console.log('UPDATE NAME, ERR', err, info);
                         })
+                        commit('updateContactInfo', info)
                     }
                 } else {
                     console.log('updateContact, 无操作');
diff --git a/utils/im/index.js b/utils/im/index.js
index 7f52693..59e44cc 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -150,7 +150,8 @@ const addListeners = () => {
                 })
             }
             newMessage(message)
-        } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {
+        } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {
+            // 更新会话信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
             // 调用完更新之后，删除这条消息
             RongIMLib.deleteMessagesByIds([message.messageId], ({

From 255a727d32d216eeea91baedf383ca3871597801 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 16:58:45 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E7=A7=81=E8=81=8A=E4=B8=AD=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E9=94=99=E8=AF=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/sentPopups.nvue |  8 +++-----
 pages/im/components/sentText.nvue   |  4 ++--
 pages/im/components/sentVoice.nvue  |  5 ++---
 pages/im/group/chat.nvue            | 16 ++++++++--------
 pages/im/private/chat.nvue          | 11 +++++++++--
 public/userAuth.js                  |  3 +--
 utils/im/index.js                   | 22 +++++++++++-----------
 utils/im/message.js                 | 12 +++++++-----
 8 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/pages/im/components/sentPopups.nvue b/pages/im/components/sentPopups.nvue
index 6772875..a91ba04 100644
--- a/pages/im/components/sentPopups.nvue
+++ b/pages/im/components/sentPopups.nvue
@@ -64,7 +64,7 @@
             }
         },
         computed: {
-            user() {
+            sender() {
                 return this.$store.getters.sender
             }
         },
@@ -87,8 +87,7 @@
                             sourceType: ['album'],
                             success: res => {
                                 im.sentImage(this.conversationType, this.targetId, res.tempFilePaths[0],
-                                    this.user, (
-                                        res) => {
+                                    this.sender, (res) => {
                                         this.success()
                                     })
                             }
@@ -99,8 +98,7 @@
                             sourceType: ['camera'],
                             success: res => {
                                 im.sentImage(this.conversationType, this.targetId, res.tempFilePaths[0],
-                                    this.user, (
-                                        res) => {
+                                    this.sender, (res) => {
                                         this.success()
                                     })
                             }
diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.nvue
index ee7ef6b..fe3396b 100644
--- a/pages/im/components/sentText.nvue
+++ b/pages/im/components/sentText.nvue
@@ -29,7 +29,7 @@
             disabled() {
                 return this.inputTxt.length === 0
             },
-            user() {
+            sender() {
                 return this.$store.getters.sender
             }
         },
@@ -50,7 +50,7 @@
             sent() {
                 if (!this.disabled) {
                     RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId)
-                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.user, () => {
+                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
                         this.$emit('success')
                         this.inputTxt = ''
                     })
diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.nvue
index 65ef4cf..30a60c1 100644
--- a/pages/im/components/sentVoice.nvue
+++ b/pages/im/components/sentVoice.nvue
@@ -36,7 +36,7 @@
             }
         },
         computed: {
-            user() {
+            sender() {
                 return this.$store.getters.sender
             }
         },
@@ -85,8 +85,7 @@
                 // 监听录音结束
                 this.recorderManager.onStop(res => {
                     im.sentVoice(this.conversationType, this.targetId, res.tempFilePath, (this.maxRecordTime -
-                        this
-                        .recordTime), this.user, () => {
+                        this.recordTime), this.sender, () => {
                         setTimeout(() => {
                             this.$emit('success')
                         }, 500)
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index a601c61..a6d6faa 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -4,7 +4,7 @@
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
-                        :src="contact(item.senderUserId).portraitUrl" />
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" :name="contact(item.senderUserId).name" />
@@ -60,11 +60,11 @@
                         sentTime: 0
                     }
                 }
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         onLoad(e) {
@@ -108,7 +108,7 @@
                     this.latestMessage.sentTime,
                     1,
                     false,
-                    (messages) => {
+                    (messages) => {
                         this.messages = this.messages.concat(messages)
                         this.scrollBottom()
                     })
@@ -122,7 +122,7 @@
                     100,
                     true,
                     (messages) => {
-                        this.messages = messages.reverse()
+                        this.messages = messages.reverse()
                         this.scrollBottom()
                     })
             },
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index 1dba707..bf07114 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -8,7 +8,7 @@
                 </view>
                 <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
                     <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)"
-                        :src="userInfo.portraitUrl" />
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" />
@@ -69,6 +69,11 @@
                         sentTime: 0
                     }
                 }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         onLoad(e) {
@@ -113,6 +118,7 @@
                     1,
                     false,
                     (messages) => {
+                        console.log(messages);
                         this.messages = this.messages.concat(messages)
                         this.scrollBottom()
                     })
@@ -125,7 +131,8 @@
                     0,
                     100,
                     true,
-                    (messages) => {
+                    (messages) => {
+                        console.log(messages);
                         this.messages = messages.reverse()
                         this.scrollBottom()
                     })
diff --git a/public/userAuth.js b/public/userAuth.js
index faf4df5..55f0691 100644
--- a/public/userAuth.js
+++ b/public/userAuth.js
@@ -109,8 +109,7 @@ class userAuth {
                             .access_token)
                         // 在这里，登录成功，链接IM服务
                         getImToken().then(res => {
-                            console.log('在这获取IM-TOKEN', res);
-                            im.connect(res.token, res.userInfo)
+                            im.connect(res.token, res.userInfo, () => {})
                         })
                         resolve()
                     }).catch(err => {
diff --git a/utils/im/index.js b/utils/im/index.js
index 59e44cc..53ca2e9 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -71,14 +71,14 @@ const connect = (token, userInfo, callback) => {
                     })
                 })
             },
-            fail: () => {
+            fail: () => {
                 // 程序是首次运行，初始化加载好友和群组信息
-                Promise.all([getFriends(), getMyGroups()]).then(result => {
+                Promise.all([getFriends(), getMyGroups()]).then(result => {
                     result.map(contacts => {
                         contacts.map(item => {
                             store.dispatch('initContact', item)
                         })
-                    })
+                    })
                     uni.setStorageSync(FK, userInfo.targetId)
                 })
             }
@@ -141,16 +141,16 @@ const addListeners = () => {
                 }).catch(err => {
                     console.log('ERR', err)
                 })
-            }
-            if (!store.getters.contactIsExist(message.senderUserId)) {
-                getUserInfo(message.senderUserId).then(res => {
-                    store.dispatch('initContact', res)
-                }).catch(err => {
-                    console.log('ERR', err)
-                })
+            }
+            if (!store.getters.contactIsExist(message.senderUserId)) {
+                getUserInfo(message.senderUserId).then(res => {
+                    store.dispatch('initContact', res)
+                }).catch(err => {
+                    console.log('ERR', err)
+                })
             }
             newMessage(message)
-        } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {
+        } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {
             // 更新会话信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
             // 调用完更新之后，删除这条消息
diff --git a/utils/im/message.js b/utils/im/message.js
index 53e51d1..add384b 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -151,14 +151,15 @@ const sentImage = (conversationType, targetId, imageUrl, user, callback) => {
     })
 }
 
-const sentGif = (conversationType, targetId, gifUrl, time, callback) => {
+const sentGif = (conversationType, targetId, gifUrl, time, user, callback) => {
     const msg = {
         conversationType: conversationType,
         targetId: String(targetId),
         content: {
             objectName: 'RC:GIFMsg',
             local: 'file:///' + plus.io.convertLocalFileSystemURL(gifUrl),
-            duration: time
+            duration: time,
+            userInfo: user
         }
     }
     RongIMLib.sendMediaMessage(msg, {
@@ -177,14 +178,15 @@ const sentGif = (conversationType, targetId, gifUrl, time, callback) => {
     })
 }
 
-const sendFile = (conversationType, targetId, fileUrl, time, callback) => {
+const sendFile = (conversationType, targetId, fileUrl, time, user, callback) => {
     const msg = {
         conversationType: conversationType,
         targetId: String(targetId),
         content: {
             objectName: 'RC:FileMsg',
             local: 'file:///' + plus.io.convertLocalFileSystemURL(fileUrl),
-            duration: time
+            duration: time,
+            userInfo: user
         }
     }
     RongIMLib.sendMediaMessage(msg, {
@@ -204,7 +206,7 @@ const sendFile = (conversationType, targetId, fileUrl, time, callback) => {
 }
 
 export default {
-    getMessageList,
+    getMessageList,
     getPendingList,
     sentText,
     sentVoice,

From ff334c1cb0ec8cbb373f69907aab879107dbe9eb Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 17:11:07 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue | 129 +++++++++++++-------------
 store/modules/im.js                   |   4 +-
 2 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 4efd6f6..5a3cfcf 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -1,16 +1,15 @@
 <template>
-    <view class="members">
+    <view class="member--list">
         <view class="users">
             <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
-                <u-avatar :size="avatarSize" shape="square" :src="item.portraitUrl"></u-avatar>
+                <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
                 <view class="name">{{ item.name }}</view>
                 <view class="admin" v-if="item.is_admin">管理</view>
                 <view class="owner" v-if="item.targetId === adminUid">群主</view>
             </view>
             <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" size="126rpx" shape="square" icon="plus" bg-color="#eeeeee"
-                    color="#999999">
+                <u-avatar @click="inviteUser" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
                 </u-avatar>
                 <view class="name">邀请好友</view>
             </view>
@@ -59,6 +58,13 @@
                 currentUser: {},
                 avatarSize: 40
             }
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
+            }
         },
         created() {
             this.avatarSize = 126 / 750 * wx.getSystemInfoSync().windowWidth
@@ -233,73 +239,70 @@
 
 
 <style lang="scss" scoped>
-    .members {
+    .users {
+        flex-direction: row;
+        flex-wrap: wrap;
+        display: flex;
+        padding: 20rpx 0;
 
-        .users {
-            flex-direction: row;
-            flex-wrap: wrap;
+        .user {
+            overflow: hidden;
+            position: relative;
+            width: 126rpx;
+            margin-left: 20rpx;
+            margin-bottom: 20rpx;
             display: flex;
-            padding: 20rpx 0;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            border-radius: 0 10rpx 0 0;
 
-            .user {
-                overflow: hidden;
-                position: relative;
+            &.active {
+                background-color: $window-color;
+            }
+
+            .name {
+                color: $text-gray-m;
                 width: 126rpx;
-                margin-left: 20rpx;
-                margin-bottom: 20rpx;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-                border-radius: 0 10rpx 0 0;
+                text-align: center;
+                font-size: 26rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                word-break: break-word;
+            }
 
-                &.active {
-                    background-color: $window-color;
-                }
+            .admin {
+                position: absolute;
+                background-color: $main-color;
+                transform: rotate(45deg);
+                color: #ffffff;
+                font-size: 12rpx;
+                width: 100rpx;
+                padding-top: 30rpx;
+                text-align: center;
+                right: -45rpx;
+                top: -20rpx;
+            }
 
-                .name {
-                    color: $text-gray-m;
-                    width: 126rpx;
-                    text-align: center;
-                    font-size: 26rpx;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    word-break: break-word;
-                }
-
-                .admin {
-                    position: absolute;
-                    background-color: $main-color;
-                    transform: rotate(45deg);
-                    color: #ffffff;
-                    font-size: 12rpx;
-                    width: 100rpx;
-                    padding-top: 30rpx;
-                    text-align: center;
-                    right: -45rpx;
-                    top: -20rpx;
-                }
-
-                .owner {
-                    position: absolute;
-                    background-color: $text-price;
-                    transform: rotate(45deg);
-                    color: #ffffff;
-                    font-size: 12rpx;
-                    width: 100rpx;
-                    padding-top: 30rpx;
-                    text-align: center;
-                    right: -45rpx;
-                    top: -20rpx;
-                }
+            .owner {
+                position: absolute;
+                background-color: $text-price;
+                transform: rotate(45deg);
+                color: #ffffff;
+                font-size: 12rpx;
+                width: 100rpx;
+                padding-top: 30rpx;
+                text-align: center;
+                right: -45rpx;
+                top: -20rpx;
             }
         }
+    }
 
-        .loadmore {
-            font-size: 26rpx;
-            color: $text-gray-m;
-            text-align: center;
-        }
+    .loadmore {
+        font-size: 26rpx;
+        color: $text-gray-m;
+        text-align: center;
     }
 </style>
diff --git a/store/modules/im.js b/store/modules/im.js
index 6526937..211f93a 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -11,7 +11,7 @@ export default {
         },
         contactInfo: (state) => (targetId) => {
             if (state.contacts[targetId]) {
-                const info = state.contacts[targetId]
+                const info = state.contacts[targetId]
                 return {
                     name: info.name,
                     hash: info.hash,
@@ -21,7 +21,7 @@ export default {
                 return {
                     name: '',
                     hash: '',
-                    portraitUrl: ''
+                    portraitUrl: require('@/static/user/cover.png')
                 }
             }
         },

From 3eb7b804968bbc638cb17bf85bbcc681f1fce97d Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 18:00:23 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E6=96=B0=E5=A5=BD=E5=8F=8B=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/friends/index.vue   | 18 ++++++------------
 pages/im/friends/pending.vue |  3 ---
 pages/im/index.vue           | 18 ++++++++++++------
 utils/im/index.js            |  3 ++-
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 10e3e9f..b56a22f 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -57,13 +57,7 @@
         onLoad() {
             this.getFriendList()
             this.checkNewFriendPending()
-            uni.$on('onContactNotification', () => {
-                this.checkNewFriendPending()
-                this.getFriendList()
-            })
-        },
-        onUnload() {
-            uni.$off('onContactNotification')
+            uni.$on('onContactNotification', this.checkNewFriendPending)
         },
         methods: {
             getFriendList() {
@@ -83,11 +77,11 @@
                 })
             },
             toGroup() {
-                uni.navigateTo({
-                    url: '/pages/im/group/index',
-                    fail(err) {
-                        console.log(err);
-                    }
+                uni.navigateTo({
+                    url: '/pages/im/group/index',
+                    fail(err) {
+                        console.log(err);
+                    }
                 })
             },
             toFriend(targetId) {
diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index c25b597..efe53e6 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -29,9 +29,6 @@
             this.getPendingList()
             uni.$on('onContactNotification', this.getPendingList)
         },
-        onUnload() {
-            uni.$off('onContactNotification')
-        },
         methods: {
             getPendingList() {
                 im.getPendingList((pendings) => {
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 56dbd3a..111ce88 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -53,16 +53,20 @@
         },
         onLoad() {
             // 好友申请数量
-            this.checkNewFriendPending()
-            uni.$on('onConnectionStatusChange', (status) => {
-                this.connection = status
+            this.checkNewFriendPending()
+            // 监听新的好友申请
+            uni.$on('onContactNotification', () => {
+                console.log('监听申请');
+                this.checkNewFriendPending()
             })
-            uni.$on('onContactNotification', this.checkNewFriendPending)
         },
         onShow() {
             if (this.$store.state.token !== '') {
                 this.getConversationList()
             }
+            uni.$on('onConnectionStatusChange', (status) => {
+                this.connection = status
+            })
             // 监听新消息
             uni.$on('onReceiveMessage', (msg) => {
                 this.getConversationList()
@@ -73,7 +77,9 @@
         },
         methods: {
             checkNewFriendPending() {
-                im.getPendingList((pendings) => {
+                console.log('触发新申请好友事件');
+                im.getPendingList((pendings) => {
+                    console.log(pendings);
                     this.hasNewFriends = pendings.length
                 })
             },
@@ -91,7 +97,7 @@
                 const count = 1000
                 const timestamp = 0
                 RongIMLib.getConversationList([1, 3], count, timestamp, (res) => {
-                    if (res.code === 0) {
+                    if (res.code === 0) {
                         this.conversations = res.conversations
                     }
                 })
diff --git a/utils/im/index.js b/utils/im/index.js
index 53ca2e9..e508f78 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -159,7 +159,8 @@ const addListeners = () => {
             }) => {
                 console.log('消息删除结果', code)
             })
-        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
+        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
+            console.log('onContactNotification');
             // 触发一个新好友的通知事件
             uni.$emit('onContactNotification', message.content)
         }

From 9620278813e78470e5594031303b79ddff4042c9 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 16 Feb 2022 18:03:46 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E8=BF=98=E6=9C=89=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/friendApplyCell.vue  |   2 +-
 pages/im/components/friendSearchList.vue | 138 +++++++++++++++++++++++
 pages/im/components/messageCell.vue      |  10 +-
 pages/im/friends/index.vue               |  15 ++-
 pages/im/friends/info.vue                |  37 +++---
 pages/im/friends/search.vue              |  13 ++-
 6 files changed, 188 insertions(+), 27 deletions(-)
 create mode 100644 pages/im/components/friendSearchList.vue

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index 94f3263..e9ed0a2 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="apply--cell u-border-bottom">
         <view class="avatar">
-            <u-avatar :src="user.portraitUrl" shape="square" size="46" />
+            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
         </view>
         <view class="info">
             <view class="name">
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
new file mode 100644
index 0000000..76ae0d6
--- /dev/null
+++ b/pages/im/components/friendSearchList.vue
@@ -0,0 +1,138 @@
+<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="item.portraitUrl || require('@/static/user/cover.png')" shape="square" size="44" />
+                </view>
+                <view class="right">
+                    <view class="title">
+                        <view class="name">{{ item.name }}</view>
+                        <view class="des">{{ item.address }}</view>
+                    </view>
+                    <view class="agress-btn">
+                        <span v-if="isApply && item.friendship !=='accepted'" @click="action('apply', item)">查看</span>
+                        <span class="isFri" v-if="isApply && item.friendship ==='accepted'" @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;
+
+                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/messageCell.vue b/pages/im/components/messageCell.vue
index 6080df1..f5a373c 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,12 +6,10 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
-                        class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
-                :user="item.latestMessage.userInfo" />
+            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -19,6 +17,10 @@
 <script>
     import messagePreview from './messagePreview'
 
+
+
+
+
     export default {
         props: {
             item: {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 10e3e9f..8d70cb2 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -12,15 +12,14 @@
             </view>
             <block v-if="friends.length > 0">
                 <u-index-item v-for="(item, fkey) in friends" :key="fkey">
-                    <u-index-anchor :text="indexs[fkey]" bgColor="#F3F6FB" height="20" size="12" color="#666">
-                    </u-index-anchor>
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#F9F9F9" height="20" size="12" color="#666" />
 
                     <view v-for="(friendItem, index) in item" :key="index" class="friend-flex u-border-bottom"
                         @click="toFriend(friendItem.targetId)">
-                        <u-avatar size="40" shape="square" :src="contact(friendItem.targetId).portraitUrl" />
+                        <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 class="address">{{ friendItem.address }}</view>
+                            <view class="address">hash:{{ friendItem.address }}</view>
                         </view>
                     </view>
                 </u-index-item>
@@ -119,10 +118,13 @@
     // 好友列表
     .friend-flex {
         position: relative;
-        padding: 20rpx $padding;
+        padding: 24rpx $padding;
         display: flex;
         flex-direction: row;
         align-items: center;
+        .avatar-img{
+            box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
+        }
 
         .info {
             flex: 1;
@@ -137,7 +139,8 @@
 
             .address {
                 color: $text-gray-m;
-                font-size: $title-size-m - 5;
+                font-size: $title-size-m - 3;
+                padding-top: 10rpx;
             }
         }
     }
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 778a51f..35a3766 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -6,7 +6,7 @@
                 bg-color="#fff"></u-avatar>
             <view class="info-text">
                 <view class="nickname">{{ userInfo.name }}</view>
-                <view class="address" @longpress="copyAddress">地址：{{ userInfo.address }}</view>
+                <view class="address" @longpress="copyAddress">Hash：{{ userInfo.address }}</view>
             </view>
         </view>
         <!-- 用户资料 -->
@@ -19,7 +19,7 @@
             </view>
         </view>
 
-        <block v-if="userInfo.is_friend">
+        <block v-if="userInfo.friendship ==='accepted'">
             <view class="info-btns">
                 <view class="item u-border-bottom" @click="setRemark">
                     <label>设置备注</label>
@@ -83,7 +83,11 @@
     } from '@/apis/interfaces/im.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
-
+    // friendship: ''    没有好友关系
+    // accepted    好友
+    // pending  申请中
+    // denied 拒绝 
+    // blocked 黑名单
     export default {
         data() {
             return {
@@ -105,9 +109,10 @@
                 callShow: false
             }
         },
-        onLoad(e) {
+        onLoad(e) {
             this.targetId = e.targetId
             getFriendInfo(e.targetId).then(res => {
+                console.log(res, "获取朋友的信息")
                 this.userInfo = res
                 // 获取到用户信息之后，去检查一下要不要更新
                 this.$store.dispatch('updateContact', res)
@@ -158,7 +163,7 @@
                     content: '确认删除后不可恢复',
                     success: e => {
                         if (e.confirm) {
-                            deleteFriend(this.targetId).then(res => {
+                            deleteFriend(this.targetId).then(res => {
                                 uni.$emit('onContactNotification')
                                 // 删除聊天记录
                                 RongIMLib.deleteMessages(1, this.targetId);
@@ -198,17 +203,23 @@
             toBeFriend() {
                 pedingFriend(this.targetId).then(res => {
                         uni.showToast({
-                            title: '申请成功',
-                            icon: 'none'
+                            title: `  申请成功,等待审核  `,
+                            icon: 'none',
+                            duration: 3000,
+                            mask: true
                         });
-
                     })
                     .catch(err => {
-                        uni.showToast({
-                            icon: 'error',
-                            title: err.message,
-                            duration: 2000
-                        })
+                        // if(err.status_code === 6001){
+                        //     this.userInfo.friendship = 'accepted'
+                        // }else{
+                            uni.showToast({
+                                icon: 'error',
+                                title: err.message,
+                                duration: 2000,
+                                mask: true
+                            })
+                        // }
                     })
             },
             singleCall(e) {
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index a0d26f8..cab97c8 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -31,7 +31,7 @@
         searchFriend,
         pedingFriend
     } from '@/apis/interfaces/im.js';
-    import applyFriend from '../components/friendApplyList.vue';
+    import applyFriend from '../components/friendSearchList.vue';
     export default {
         components: {
             applyFriend
@@ -45,9 +45,15 @@
         },
         methods: {
             search() {
+                 // friendship: ''    没有好友关系
+                 // accepted    好友
+                 // pending  申请中
+                 // denied 拒绝 
+                 // blocked 黑名单
                 searchFriend(this.searchValue)
                     .then(res => {
                         this.searchResult = res;
+                        console.log(res)
                     })
                     .catch(err => {
                         uni.showToast({
@@ -56,9 +62,10 @@
                         });
                     });
             },
-            action(e) {
+            action(e) {
+                
                 uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + e.item.userId
+                    url: '/pages/im/friends/info?targetId=' + e.item.targetId
                 })
             }
         }

From dfc58676f96cbc6d1ac0f647f181d263fe83ff1e Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 18:04:53 +0800
Subject: [PATCH 11/25] clean

---
 pages/im/index.vue | 2 --
 utils/im/index.js  | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pages/im/index.vue b/pages/im/index.vue
index 111ce88..eb0df3c 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -56,7 +56,6 @@
             this.checkNewFriendPending()
             // 监听新的好友申请
             uni.$on('onContactNotification', () => {
-                console.log('监听申请');
                 this.checkNewFriendPending()
             })
         },
@@ -77,7 +76,6 @@
         },
         methods: {
             checkNewFriendPending() {
-                console.log('触发新申请好友事件');
                 im.getPendingList((pendings) => {
                     console.log(pendings);
                     this.hasNewFriends = pendings.length
diff --git a/utils/im/index.js b/utils/im/index.js
index e508f78..3f7d26c 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -160,9 +160,8 @@ const addListeners = () => {
                 console.log('消息删除结果', code)
             })
         } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
-            console.log('onContactNotification');
             // 触发一个新好友的通知事件
-            uni.$emit('onContactNotification', message.content)
+            uni.$emit('onContactNotification', message)
         }
     })
 

From 3a3517b5bee565c40e6ab9775a591ca89fe1fc87 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 09:37:05 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E7=BE=A4=E7=9A=84=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                             | Bin 12292 -> 14340 bytes
 pages/im/components/groupUserList.vue |  92 ++++++++++++++------------
 pages/im/group/chat.nvue              |  33 +++++++--
 pages/im/private/chat.nvue            |   4 +-
 4 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 0451fa5350573968a44737610eb8813fa8341acb..c1a2c05689ed421f0ce5b68a5d14a53025647039 100644
GIT binary patch
delta 210
zcmZokXem%&U|?W$DortDU@!nOIe-{M3-ADmHU<U-o{0+jq7gt2Gf<F$p_rjKC*3eO
zIX|~xVxjV6109yh+>C;gB?JT~>nezEekh^EKCwY^Gdl+h2cyPj4S~n}6B}eUb1R%<
z+WcQBpJlQD<HOCa632jwBqUjZrUHQhH;`~ewsNx|(|hL0{5ravj6kUaK+G`NhDVx*
f3F1Brut0{+M3&;*e3!|ds`8uNR5h4@X72$2PY5d?

delta 248
zcmZoEXh~3DU|?W$DortDV9)?EIe-{M3-ADifgA<yi3<9nkw6h<pdbT7F+*`ud2vBf
zPJYtFi;E{4n6OOj7MvWSes%Ik1+j%!*fz6suy8PHPMjdSnOEQu|7LE5b4*Ii3^@#$
z3`w3j`N<%SAmf3i%K~Y=|6std`KnSe%j6nyiOE^w4N?rOKq(;5;06+|$d1`~@jdfo
qeiL0CkTfF@H-H#G0Aw>kX%;9A@(M`YU~-Ph#LbsgN|~S*)BymjsWe9b

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 5a3cfcf..ad222ad 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -3,13 +3,16 @@
         <view class="users">
             <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
-                <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
+                <view class="avatar">
+                    <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
+                    <view class="admin" v-if="item.is_admin">管理</view>
+                    <view class="owner" v-if="item.targetId === adminUid">群主</view>
+                </view>
                 <view class="name">{{ item.name }}</view>
-                <view class="admin" v-if="item.is_admin">管理</view>
-                <view class="owner" v-if="item.targetId === adminUid">群主</view>
             </view>
             <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
+                <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bg-color="#eeeeee"
+                    color="#999999">
                 </u-avatar>
                 <view class="name">邀请好友</view>
             </view>
@@ -58,17 +61,16 @@
                 currentUser: {},
                 avatarSize: 40
             }
-        },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
+            }
         },
         created() {
-            this.avatarSize = 126 / 750 * wx.getSystemInfoSync().windowWidth
-            console.log(this.avatarSize)
+            this.avatarSize = 90 / 750 * wx.getSystemInfoSync().windowWidth
         },
         mounted() {
             this.initGroupInfo()
@@ -237,7 +239,6 @@
     }
 </script>
 
-
 <style lang="scss" scoped>
     .users {
         flex-direction: row;
@@ -246,8 +247,6 @@
         padding: 20rpx 0;
 
         .user {
-            overflow: hidden;
-            position: relative;
             width: 126rpx;
             margin-left: 20rpx;
             margin-bottom: 20rpx;
@@ -255,12 +254,46 @@
             flex-direction: column;
             justify-content: center;
             align-items: center;
-            border-radius: 0 10rpx 0 0;
 
             &.active {
                 background-color: $window-color;
             }
 
+            .avatar {
+                border-radius: 0 8rpx 0 0;
+                position: relative;
+                width: 90rpx;
+                height: 90rpx;
+                overflow: hidden;
+
+                .admin {
+                    position: absolute;
+                    background-color: $main-color;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+
+                .owner {
+                    position: absolute;
+                    background-color: $text-price;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+
+            }
+
             .name {
                 color: $text-gray-m;
                 width: 126rpx;
@@ -272,31 +305,6 @@
                 word-break: break-word;
             }
 
-            .admin {
-                position: absolute;
-                background-color: $main-color;
-                transform: rotate(45deg);
-                color: #ffffff;
-                font-size: 12rpx;
-                width: 100rpx;
-                padding-top: 30rpx;
-                text-align: center;
-                right: -45rpx;
-                top: -20rpx;
-            }
-
-            .owner {
-                position: absolute;
-                background-color: $text-price;
-                transform: rotate(45deg);
-                color: #ffffff;
-                font-size: 12rpx;
-                width: 100rpx;
-                padding-top: 30rpx;
-                text-align: center;
-                right: -45rpx;
-                top: -20rpx;
-            }
         }
     }
 
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index a6d6faa..2c65ff1 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -2,7 +2,10 @@
     <view class="group--chat">
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
+                <view class="cell-system" v-if="item.senderUserId === '__system__'">
+                    <text class="text">{{ item.content.content }}</text>
+                </view>
+                <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
                         :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
@@ -25,6 +28,9 @@
     import {
         timeCustomCN
     } from '@/utils/filters.js'
+    import {
+        getGroupBase
+    } from '@/apis/interfaces/im.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
     import showVoice from '../components/showVoice'
@@ -73,12 +79,21 @@
             uni.setNavigationBarTitle({
                 title: this.groupInfo.name
             })
+            // 获取群成员数量
+            getGroupBase(this.targetId).then(res => {
+                uni.setNavigationBarTitle({
+                    title: this.groupInfo.name + `(${res.members})`
+                })
+            })
+            // 获取历史消息列表
             this.getMessageList()
+            // 监听收到本群的消息，追加消息
             uni.$on('onReceiveMessage', (msg) => {
                 if (msg.targetId == this.targetId) {
                     this.getNewMessage()
                 }
             })
+            // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
         },
         onNavigationBarButtonTap() {
@@ -87,6 +102,7 @@
             })
         },
         methods: {
+            // 转到好友资料页面
             toUser(item) {
                 if (item.senderUserId == '__system__') {
                     return
@@ -106,9 +122,9 @@
                     this.conversationType,
                     this.targetId,
                     this.latestMessage.sentTime,
-                    1,
+                    10,
                     false,
-                    (messages) => {
+                    (messages) => {
                         this.messages = this.messages.concat(messages)
                         this.scrollBottom()
                     })
@@ -122,7 +138,8 @@
                     100,
                     true,
                     (messages) => {
-                        this.messages = messages.reverse()
+                        console.log(messages);
+                        this.messages = messages.reverse()
                         this.scrollBottom()
                     })
             },
@@ -161,6 +178,14 @@
             .cell {
                 padding: 10rpx 30rpx;
 
+                .cell-system {
+                    align-items: center;
+                    .text {
+                        font-size: 24rpx;
+                        color: $text-gray-m;
+                    }
+                }
+
                 .cell-item {
                     width: 690rpx;
                     justify-content: flex-start;
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index bf07114..ddbb87a 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -5,8 +5,8 @@
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="time">
                     <text class="text">{{ customCN(item.sentTime) }}</text>
-                </view>
-                <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
+                </view>
+                <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">

From 155d59a6a34dc2710abfde63101e361ab7e0372e Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 11:22:02 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue | 8 ++++++--
 pages/im/group/index.vue              | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index ad222ad..20d07e2 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -74,7 +74,12 @@
         },
         mounted() {
             this.initGroupInfo()
-            this.initUsers()
+            getGroupUsers(this.targetId, this.count).then(res => {
+                this.users = res
+                res.map(item => {
+                    this.$store.dispatch('updateContact', item)
+                })
+            })
         },
         methods: {
             initGroupInfo() {
@@ -88,7 +93,6 @@
             initUsers() {
                 getGroupUsers(this.targetId, this.count).then(res => {
                     this.users = res
-                    console.log('群成员列表', res);
                 })
             },
             hideAction(item) {
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index caf00ab..97bbad8 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -63,13 +63,14 @@
                     uni.showToast({
                         title: '创建成功'
                     })
-                    this.initData()
-                    this.onHideModal()
                 }).catch(err => {
                     uni.showToast({
                         icon: 'none',
-                        title: err
+                        title: err.message
                     })
+                }).finally(() => {
+                    this.initData()
+                    this.onHideModal()
                 })
             },
             toGroup(targetId) {

From 411b1ea349110dbb7e5a4c3c270b1ec3a02dc113 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 12:06:30 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E7=BE=A4=E8=A7=A3=E6=95=A3=E7=9A=84?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B6=88=E6=81=AF=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/messageCell.vue     | 16 +++++++---------
 pages/im/components/messagePreview.nvue |  3 +++
 pages/im/group/chat.nvue                |  5 +++--
 pages/im/group/info.vue                 |  1 +
 pages/im/index.vue                      | 20 ++++++++++++--------
 utils/im/index.js                       | 15 ++++++++++++++-
 utils/im/message.js                     |  3 ++-
 7 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index f5a373c..b3dc52e 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,10 +6,12 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
+                        class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
+            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
+                :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -17,10 +19,6 @@
 <script>
     import messagePreview from './messagePreview'
 
-
-
-
-
     export default {
         props: {
             item: {
@@ -72,9 +70,9 @@
 
                 .name {
                     font-size: $title-size + 2;
-                    color: #454545;
-                    display: flex;
-                    align-items: center;
+                    color: #454545;
+                    display: flex;
+                    align-items: center;
 
                     .qun {
                         color: $main-color;
diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.nvue
index cb44e6a..2e8814e 100644
--- a/pages/im/components/messagePreview.nvue
+++ b/pages/im/components/messagePreview.nvue
@@ -23,6 +23,9 @@
         </view>
         <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
             <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
+        </view>
+        <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+            [{{ msg.message }}]
         </view>
     </view>
 </template>
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index 2c65ff1..ee6d940 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -3,7 +3,7 @@
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="cell-system" v-if="item.senderUserId === '__system__'">
-                    <text class="text">{{ item.content.content }}</text>
+                    <text class="text">{{ item.content.message }}</text>
                 </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
@@ -178,8 +178,9 @@
             .cell {
                 padding: 10rpx 30rpx;
 
-                .cell-system {
+                .cell-system {
                     align-items: center;
+
                     .text {
                         font-size: 24rpx;
                         color: $text-gray-m;
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index a6cced9..78432ad 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -273,6 +273,7 @@
                     success: (res) => {
                         if (res.confirm) {
                             dismissGroup(this.targetId).then(res => {
+                                console.log('解散群', res);
                                 uni.showToast({
                                     icon: 'none',
                                     title: '解散成功'
diff --git a/pages/im/index.vue b/pages/im/index.vue
index eb0df3c..47c6d00 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -53,10 +53,10 @@
         },
         onLoad() {
             // 好友申请数量
-            this.checkNewFriendPending()
-            // 监听新的好友申请
-            uni.$on('onContactNotification', () => {
-                this.checkNewFriendPending()
+            this.checkNewFriendPending()
+            // 监听新的好友申请
+            uni.$on('onContactNotification', () => {
+                this.checkNewFriendPending()
             })
         },
         onShow() {
@@ -76,7 +76,7 @@
         },
         methods: {
             checkNewFriendPending() {
-                im.getPendingList((pendings) => {
+                im.getPendingList((pendings) => {
                     console.log(pendings);
                     this.hasNewFriends = pendings.length
                 })
@@ -94,9 +94,13 @@
             getConversationList() {
                 const count = 1000
                 const timestamp = 0
-                RongIMLib.getConversationList([1, 3], count, timestamp, (res) => {
-                    if (res.code === 0) {
-                        this.conversations = res.conversations
+                RongIMLib.getConversationList([1, 3], count, timestamp, ({
+                    code,
+                    conversations
+                }) => {
+                    console.log(conversations);
+                    if (code === 0) {
+                        this.conversations = conversations
                     }
                 })
             },
diff --git a/utils/im/index.js b/utils/im/index.js
index 3f7d26c..5cd6fab 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -159,9 +159,22 @@ const addListeners = () => {
             }) => {
                 console.log('消息删除结果', code)
             })
-        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
+        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
             // 触发一个新好友的通知事件
             uni.$emit('onContactNotification', message)
+        } else if (message.objectName === RongIMLib.ObjectName.GroupNotification) {
+            // 解散群
+            if (message.content.operation === 'Dismiss') {
+                RongIMLib.cleanHistoryMessages(message.conversationType, message.targetId,
+                    message.sentTime - 1, false, ({
+                        code
+                    }) => {
+                        if (code == 0) {
+                            uni.$emit('onGroupDismiss', message.targetId)
+                        }
+                    })
+            }
+            uni.$emit('onReceiveMessage', message)
         }
     })
 
diff --git a/utils/im/message.js b/utils/im/message.js
index add384b..39f0352 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -15,7 +15,8 @@ const getMessageList = (conversationType, targetId, timeStamp, count, isForward,
         'RC:LBSMsg',
         'RC:SightMsg',
         'RC:ReferenceMsg',
-        'RC:CombineMsg'
+        'RC:CombineMsg',
+        'RC:GrpNtf'
     ]
 
     RongIMLib.getHistoryMessagesByTimestamp(

From 7c9a8f702d9c6acb7aef6b9bcea5a366755cb3d9 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 17 Feb 2022 13:04:10 +0800
Subject: [PATCH 15/25] =?UTF-8?q?im=E8=81=8A=E5=A4=A9=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E6=88=91=E7=9A=84=E7=BE=A4=E8=81=8A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E9=80=9A=E8=AE=AF=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=9B=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A0=B7=E5=BC=8F=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |   6 +-
 pages/im/components/friendSearchList.vue |  15 +-
 pages/im/components/messageCell.vue      |   9 +-
 pages/im/components/messagePreview.nvue  |   2 +-
 pages/im/friends/index.vue               |  60 +++++--
 pages/im/friends/mine.vue                | 219 ++++++++++-------------
 pages/im/friends/search.vue              |   3 +-
 pages/im/group/index.vue                 |  36 +++-
 pages/user/index.vue                     |   4 +-
 static/imgs/copy-333.png                 | Bin 0 -> 2739 bytes
 uni.scss                                 |   2 +-
 11 files changed, 194 insertions(+), 162 deletions(-)
 create mode 100644 static/imgs/copy-333.png

diff --git a/pages.json b/pages.json
index d9a90cb..36e7ed8 100644
--- a/pages.json
+++ b/pages.json
@@ -390,7 +390,7 @@
             "path": "pages/im/friends/index",
             "name": "imFriends",
             "style": {
-                "navigationBarTitleText": "我的好友",
+                "navigationBarTitleText": "通讯录",
                 "app-plus": {
                     "titleNView": {
                         "type": "default",
@@ -429,7 +429,9 @@
             "path": "pages/im/friends/mine",
             "name": "imFriendsMine",
             "style": {
-                "navigationBarTitleText": "我的资料"
+                "navigationBarTitleText": "我的二维码",
+                "navigationBarBackgroundColor": "#34CE98",
+                "navigationBarTextStyle": "white"
             }
         },
         {
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
index 76ae0d6..0bbb506 100644
--- a/pages/im/components/friendSearchList.vue
+++ b/pages/im/components/friendSearchList.vue
@@ -48,11 +48,11 @@
             action(type, item) {
                 if (type === 'isFriend') {
                     // ，后期可以跳转到信息介绍页面，先留在这里
-                    return uni.showToast({
-                        title: '已是好友，无需重复添加',
-                        icon: 'none',
-                        duration: 2000
-                    });
+                    // return uni.showToast({
+                    //     title: '已是好友，无需重复添加',
+                    //     icon: 'none',
+                    //     duration: 2000
+                    // });
                 }
                 this.$emit('action', {
                     type,
@@ -94,7 +94,7 @@
                 .name {
                     width: 100%;
                     color: $text-color;
-                    font-size: $title-size + 2;
+                    font-size: $title-size;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;
@@ -106,7 +106,7 @@
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;
-                    font-size: $title-size-m;
+                    font-size: $title-size-m - 2;
                     margin-top: $margin - 10;
                     color: $text-gray-m;
                 }
@@ -115,6 +115,7 @@
             .agress-btn {
                 display: flex;
                 color: #fff;
+                font-size: $title-size-m;
 
                 span {
                     display: inline-block;
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index f5a373c..c3d3183 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -46,7 +46,7 @@
 <style lang="scss" scoped>
     .message--cell {
         display: flex;
-        padding: 20rpx 0 0 20rpx;
+        padding: 20rpx 10rpx 0 30rpx;
 
         .avatar {
             position: relative;
@@ -61,9 +61,10 @@
             box-sizing: border-box;
             position: relative;
             flex: 1;
+            
 
             border-bottom-width: 0.5px !important;
-            border-color: $u-border-color !important;
+            border-color: #f9f9f9 !important;
             border-bottom-style: solid;
 
             .header {
@@ -84,10 +85,12 @@
                 }
 
                 .time {
-                    font-size: $title-size-sm - 2;
+                    font-size: $title-size-sm - 3;
                     color: $text-gray-m;
                     position: absolute;
                     right: 30rpx;
+                    padding-top: 4rpx;
+                    font-weight: normal;
                 }
             }
         }
diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.nvue
index cb44e6a..d3e5562 100644
--- a/pages/im/components/messagePreview.nvue
+++ b/pages/im/components/messagePreview.nvue
@@ -54,7 +54,7 @@
     .preview {
         word-break: break-all;
         color: $text-gray-m;
-        padding-top: $padding - 22;
+        padding-top: 6rpx;
         padding-bottom: $padding;
         font-size: $title-size-m - 2;
         height: 32rpx;
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 63e3db5..425daec 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view>
         <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
-            <view class="friend-flex u-border-bottom" @click="toPending">
+            <view class="friend-flex" @click="toPending">
                 <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')"></u-avatar>
                 <u-badge max="99" absolute :offset="[23, 20]" :value="pendingCount" />
                 <view class="info">新的朋友</view>
@@ -12,21 +12,21 @@
             </view>
             <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" />
-
-                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex u-border-bottom"
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
+                        style="padding:10rpx 30rpx" />
+                    <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" />
+                        <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 class="address">hash:{{ friendItem.address }}</view>
+                            <!-- <view class="address">Hash:{{ friendItem.address }}</view> -->
                         </view>
                     </view>
                 </u-index-item>
             </block>
             <block v-else>
-                <u-empty class="pages-null" mode="data" text="暂无好友">
-                </u-empty>
+                <u-empty class="pages-null" mode="data" text="暂无好友" />
             </block>
         </u-index-list>
     </view>
@@ -90,9 +90,18 @@
             },
             // 新朋友
             toPending() {
-                uni.navigateTo({
-                    url: '/pages/im/friends/pending'
-                });
+                if (this.pendingCount > 0) {
+                    uni.navigateTo({
+                        url: '/pages/im/friends/pending'
+                    });
+                } else {
+                    uni.showToast({
+                        title: ` 暂无好友申请 ~ `,
+                        icon: "none",
+                        mask: true,
+                        duration: 3000
+                    })
+                }
             }
         },
         onNavigationBarButtonTap(e) {
@@ -112,21 +121,25 @@
     // 好友列表
     .friend-flex {
         position: relative;
-        padding: 24rpx $padding;
+        padding: 0 $padding 0 $padding;
         display: flex;
         flex-direction: row;
         align-items: center;
-        .avatar-img{
+        box-sizing: border-box;
+
+        .avatar-img {
             box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
         }
 
         .info {
             flex: 1;
             margin-left: $padding;
+            border-bottom: solid 1rpx #f9f9f9;
+            height: 120rpx;
+            line-height: 120rpx;
 
             .name {
-                font-size: $title-size + 2;
-                font-size: $title-size + 2;
+                font-size: $title-size;
                 color: #454545 !important;
                 @extend .nowrap;
             }
@@ -135,7 +148,24 @@
                 color: $text-gray-m;
                 font-size: $title-size-m - 3;
                 padding-top: 10rpx;
+                word-break: break-word;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 600rpx;
             }
         }
     }
+
+    .list-cell {
+        display: flex;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 10px 24rpx;
+        overflow: hidden;
+        color: #323233;
+        font-size: 14px;
+        line-height: 24px;
+        background-color: #fff;
+    }
 </style>
diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue
index a09eec1..92bdef2 100644
--- a/pages/im/friends/mine.vue
+++ b/pages/im/friends/mine.vue
@@ -1,32 +1,20 @@
 <template>
-    <view class="content">
+    <view class="friend-ewm-content">
+        <view class="bg"></view>
         <!-- 用户信息 -->
         <view class="info-flex">
-            <u-avatar :src="infoObj.portraitUrl" shape="square" size="50" bg-color="#fff"></u-avatar>
-            <view class="info-text">
+            <view class="info-flex-item">
+                <u-avatar :src="infoObj.portraitUrl" shape="square" size="210rpx" bg-color="#fff" class="avatar" />
                 <view class="nickname">{{infoObj.name}}</view>
-                <view class="address">地址：{{infoObj.address}}</view>
-            </view>
-        </view>
-        <!-- 用户身份 -->
-        <view class="info-btns">
-            <view class="item">
-                <label>性别</label>
-                <view class="text" v-if="infoObj.gender === 0">保密</view>
-                <view class="text" v-if="infoObj.gender === 1">男</view>
-                <view class="text" v-if="infoObj.gender === 2">女</view>
-            </view>
-            <view class="item">
-                <label>地址</label>
-                <view class="text">{{infoObj.address}}</view>
-            </view>
-        </view>
-        <!-- 二维码 -->
-        <view class="info-code">
-            <uqrcode class="info-code-src" :size="198" :text="qrContent" />
-            <view class="info-code-text">
-                <view>ZH-HEALTH扫一扫上面的二维码</view>
-                <view>添加我的好友</view>
+                <view class="address">{{infoObj.address}}</view>
+                <view class="info-code">
+                    <uqrcode class="info-code-src" :size="160" :text="qrContent" />
+                    <view class="info-code-text">扫描二维码加我ZH大健康好友</view>
+                </view>
+                <u-icon class="download" :name="require('@/static/imgs/copy-333.png')" size="14" :bold="true"
+                    @click="copy" :label="'应用下载:'+ downUrl" labelPos="left" labelSize="14" space="6"
+                    labelColor="#26a377" />
+                <view class="copy" @click="copy"> 复制地址 </view>
             </view>
         </view>
     </view>
@@ -48,141 +36,126 @@
                     gender: 0,
                     hash: ''
                 },
+                downUrl: 'http://www.baidu.com',
                 qrContent: 'ADDFRIEND|'
             }
         },
-        onLoad(e) {
-            this.qrContent += e.targetId
-            getUserInfo(e.targetId).then(res => {
-                this.infoObj = res
-            })
+        onLoad(e) {
+            this.qrContent += e.targetId
+            getUserInfo(e.targetId).then(res => {
+                this.infoObj = res
+            })
         },
         methods: {
-
+            copy() {
+                uni.setClipboardData({
+                    data: this.downUrl,
+                    success: function() {
+                        uni.showToast({
+                            title: ` 下载链接已复制到剪贴板 `,
+                            icon: 'none',
+                            position:'bottom',
+                            mask: true,
+                            duration: 2000
+                        })
+                    }
+                });
+            }
         }
     }
 </script>
 
 <style lang="scss" scoped>
-    .content {
-        background: $window-color;
+    .friend-ewm-content {
+        background: #fff;
         min-height: 100vh;
-        padding-top: $padding;
         box-sizing: border-box;
 
-        .info-code {
-            background: white;
-            margin: 0 $margin;
-            border-radius: $radius;
-            padding: $padding*3 $padding $padding;
-            text-align: center;
-
-            &-src {
-                display: inline-block;
-            }
-
-            &-text {
-                text-align: center;
-                color: $text-gray;
-                font-size: $title-size-sm;
-                line-height: 40rpx;
-                padding: $padding 0;
-            }
+        .bg {
+            background-color: red;
+            width: 100%;
+            height: 340rpx;
+            background-color: $main-color;
         }
 
         // 用户信息
         .info-flex {
-            padding: $padding;
-            margin: 0 $margin;
-            display: flex;
+            padding: $padding 0;
+            // margin: 0 $margin;
             background: white;
-            border-radius: $radius;
+            border-radius: 50rpx 50rpx 0 0;
+            position: relative;
+            top: -100rpx;
 
-            .info-text {
-                width: calc(100% - 50px);
-                padding-left: $padding;
+
+            .info-flex-item {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                flex-direction: column;
                 box-sizing: border-box;
+                position: relative;
+                top: -160rpx;
+
+                .avatar {
+                    // padding: 14rpx; 
+                    border-radius: 10rpx;
+                    background-color: #fff;
+                    border: solid 14rpx rgba($color: #fff, $alpha:1);
+                }
 
                 .nickname {
-                    line-height: 30px;
-                    font-size: $title-size + 6;
+                    line-height: 80rpx;
+                    font-size: $title-size + 5;
                     color: $text-color;
-                    text-align: left;
+                    font-weight: 600;
                 }
 
                 .address {
-                    line-height: 20px;
-                    font-size: $title-size-sm;
+                    line-height: 60rpx;
+                    font-size: $title-size-m + 2;
                     color: $text-gray;
                     text-align: left;
                     @extend .nowrap;
                 }
-            }
-        }
 
-        // footer
-        .footer {
-            position: fixed;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            padding: $padding*2 $padding;
-            display: flex;
-            justify-content: space-around;
+                .info-code {
+                    background: white;
+                    margin: 0 $margin;
+                    border-radius: $radius;
+                    padding: $padding * 1.4 $padding $padding;
+                    text-align: center;
 
-            .footer-item {
-                margin: 0 $margin/2;
+                    &-src {
+                        display: inline-block;
+                        border-radius: 10rpx;
+                        border: solid 20rpx rgba($color: #f9f9f9, $alpha:1);
+                        background-color: #fff;
+                        padding: 14rpx;
+                    }
 
-                .icon {
-                    background: $main-color;
-                    width: 88rpx;
-                    height: 88rpx;
-                    line-height: 88rpx;
-                    display: inline-block;
-                    border-radius: 50%;
-
-                    .icon-u {
-                        margin-top: calc((88rpx/2) - 13px);
-                        margin-left: calc((88rpx/2) - 13px);
+                    &-text {
+                        text-align: center;
+                        color: $text-gray;
+                        font-size: $title-size-m + 1;
+                        line-height: 40rpx;
+                        padding: 8rpx 0 $padding 0;
                     }
                 }
 
-                .text {
+                .download {
+                    background-color: #f9f9fb;
+                    padding: 20rpx 30rpx 10rpx 30rpx;
+                    border-radius: 10rpx;
+                }
+
+                .copy {
+                    font-size: $title-size + 4;
                     color: $main-color;
-                    font-size: $title-size-m;
-                    text-align: center;
-                    padding-top: 10rpx;
-                }
-            }
-        }
-
-        // btns
-        .info-btns {
-            background: white;
-            margin: $margin;
-            border-radius: $radius;
-
-            .item {
-                line-height: 100rpx;
-                border-bottom: solid 1rpx $border-color;
-                display: flex;
-                padding: 0 $padding;
-                justify-content: space-between;
-                font-size: $title-size-lg;
-
-                &:last-child {
-                    border-bottom: none;
-                }
-
-                label {
-                    width: 200rpx;
-                }
-
-                .text {
-                    width: calc(100% - 200rpx);
-                    color: $text-gray-m;
-                    text-align: right;
-                    @extend .nowrap;
+                    background-color: rgba($color: $main-color, $alpha: .1);
+                    padding: 20rpx 100rpx;
+                    border-radius: 50rpx;
+                    margin-top: 40rpx;
                 }
             }
         }
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index cab97c8..21ed374 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -62,8 +62,7 @@
                         });
                     });
             },
-            action(e) {
-                
+            action(e) {
                 uni.navigateTo({
                     url: '/pages/im/friends/info?targetId=' + e.item.targetId
                 })
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index caf00ab..094e742 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -1,12 +1,13 @@
 <template>
-    <view>
-        <view v-for="(item, index) in groups" :key="index" class="friend-flex u-border-bottom"
-            @click="toGroup(item.targetId)">
-            <u-avatar size="40" shape="square" :src="contact(item.targetId).portraitUrl" />
+    <view class="group">
+        <view class="title"> 群聊 </view>
+        <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
+            <u-avatar size="38" shape="square" :src="contact(item.targetId).portraitUrl" />
             <view class="info">
                 <view class="name">{{ item.name }}</view>
             </view>
         </view>
+        <view class="group-count"> {{groups.length}}个群聊 </view>
         <u-modal negativeTop="300" :show="createModal" title="创建群聊" showCancelButton @cancel="onHideModal"
             @confirm="onCreateGroup">
             <view class="slot-content">
@@ -82,6 +83,24 @@
 </script>
 
 <style lang="scss" scoped>
+    .group {
+        min-height: 100vh;
+        background-color: $window-color;
+        .title{
+            font-size: $title-size-m;
+            color: $text-gray-m;
+            padding: 10rpx $padding;
+        }
+        .group-count{
+            text-align: center;
+            font-size: $title-size;
+            color: $text-gray;
+            background-color: #fff;
+            padding: 10rpx $padding $padding $padding;
+            font-weight: normal;
+        }
+    }
+
     // 好友列表
     .friend-flex {
         position: relative;
@@ -89,14 +108,17 @@
         display: flex;
         flex-direction: row;
         align-items: center;
+        background-color: #fff;
+
 
         .info {
             flex: 1;
-            margin-left: $padding;
+            margin-left: $padding + 10;
+            border-bottom: solid 1rpx #f9f9f9;
+            padding-bottom: $padding;
 
             .name {
-                font-size: $title-size + 2;
-                font-size: $title-size + 2;
+                font-size: $title-size + 1;
                 color: #454545 !important;
             }
 
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 50cdd88..b8723eb 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -260,7 +260,9 @@
                     success: function() {
                         uni.showToast({
                             title: '复制成功',
-                            icon: 'none'
+                            icon: 'none',
+                            mask:true,
+                            duration:2000
                         })
                     }
                 });
diff --git a/static/imgs/copy-333.png b/static/imgs/copy-333.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1fd645d037eac4d65f08a8da1782b6f04699809
GIT binary patch
literal 2739
zcmbtW4Nwzj8r}p#AV`6c7JsNLL3%1~b`$cqTOw#e0U;DHcc4PaW_JS%Nj4^dgrE|%
zC^z2q^z2wvK%MdDdeaKtX|Zy1rq>fYQ$ei7a#K#z9{4vE=!jlhL2kp}(GInpyPetH
zZ@=&Pp7(iwzIXQ5xjE@!f+Yd~0KzgeH2Lh?<G+K0*yo39@Q>M7h&5xQ9RNZX`fm<!
zsA&-Z@V=&Xg^ogPHbyXJ5l%7&O5`$ISu_A7r?{**Q9(IC164{}RKnqoi$ahlRl)+9
z7SUSOR2iM&wox10IXc2!L7=2CWeu3@!dL<`<-kFg*<`U}E|qYS7h}i%X;=tOLL3z;
z;aa~zuuz)|su>#v%0zOA5KEPy0u_nnQY1;f8k8Vn6h@S=I0-_;7$V1H3UK-oves;*
z5zE)SGHr|fQVGi(4l4%3PN!4kOcF7+Qdo?lEQbV^NFWvg*{dxM+yz<e@iPn>%1+p5
ztAl1Npq~*pFqICKkX1V6g4sGtYq3v<i47R+!mY4ag!o;W1d_xo&RS_RO&TW&m@-jj
z%HpuISn({@TE;jSdl~a1)U(UqGr)#ctDUtmuNJd;)`Z=WR>it89gum^c3riVg7Yam
zQ)wfpv?^9+yx$uurnXVIgR$ut#x#?t+!@KBg!LL+Q9xTr#%W(UX9K0d9h6EaLD*O$
zVn`y@i4~YM36n_@5haEoQ&25K(#Gn!PzfYf=)@8XVWHCRLD`ZaaR>gBV3NR$jLnR*
z4%245l!C36QXx1SMoi6^7#nMtRhKk(K2xpEwJ}E8#4gzL)7OESX==F`mCGTCNIWT5
ztHm-cb_Z@Ds7#GY$OcD5(<Ejv$|Od)9D$T#BMOmHDGH%7N(_-`5<4$85(HtG*{@-U
zN`DFX_fMS$k|9`*|H?yf0#QiiC`3q&2xKrw5eQWf1Vj=_rC5O&q!OuehV4}w%^pbH
zG?&${iewo{gAqq1QVB#D6f%e)r3y$Xll#M~P{;_mTp>jz{<5E}BrJorvpKGwK1ds=
zEz=_t4Nevhh7<lnp%N1QYM@Br^fWzBJbsqt>HW?!iY0wUl}uT;Ge(CKw^3_L+1UML
z6~aFz-i}v2Tl&vS<&>tm(&w$(|3&(ASco#*QcAHM78d%Qf&IN`Dk<;}^EJ6Pr*F-`
z*=Fb;&URt;W44b|7M9w^cIok7aIyd(uq;!vR_AJZ@XuEpeo4i2em(rU&sY|>*7wKy
z%m(FtW9XBedm@U;_JG0aP1q=363qQz2Z(g0t-QY}Eq8N9F35wj8{0lD6WH*>fswCd
zMDs40w^)#{e{CE7%W%!rnww9OW6vLLLE)6!+nZ~;n`?%e?>=%jp5DDaTu-6EmgiEN
z0wV4Jf1hXAzRGw?eYty}CBE||y}-4kuh4ZMuY-Su^I2WB@3yUEbm&TA;%mxPp1)Ob
z`5yBLKK+l=X|-!YuK=NM@44|fVkBgQ=XO5LhXdN{RBwm&MtN6{81Kbl<nva6OHS?E
z#O(|E3RY>-xAC$&hl<p|e(&WIyYII3F5g;P9_&jPYmEI<cwzLPi7-y`Mz?2u_T{g1
zAJY02o;}`l^Md>yw@>4%IO%zqSbTmLAm_h#F>I{A6Xb0R=s$r@)b734SYP1^4u0{A
zH=Z<49C^9!L0&0W7O0OOnAh2PLQvFQ5cuw~_sdJ;N20nCHiw6wxdr(IBZkh6ri}Nw
zeE~6n%YN7AgxZ$g<t#jS`%K)RD_Gfk@lyY{Sz+$3!@o@}2U_=k@!i?9maFFvgvBLz
zwBCJ1J4eU&SF1uZLiAB@RTMA&;E+7k1Z?)ai1P0}Jec}%KKG+Rx%IgtoT$i}C5r?;
zyASfUfAr|xgfl6e8~pcTJDuB~AJerd`CvDv!47;G<N5!G=a+E5S=lx|F5k7n6fp9d
zuVUS;Q&ew+x4rHGpT23ZG%*ifzqN0$!~57jd+w6}-IwkwIkG^6Keo}`@J7diu|@tA
z74eK&;n%jrb`BM)0f6r*Ss#8a?+CYq&1@FX6BANf%!1MEhsL67<pRLR)5F%*QLw%^
zsD*Pgvv|dw&o8wPF7JvQuF@xVZN8q8XFK{rKY#mCblC;L)*BP;q$~*Niex^`YaK5!
zhjR`boT^&SRuORV-%PaNs^sjZaBj!R_JQHvtwF!9<sM%;il#SDELhIpYw5WYQ~5M$
zZ%pci^!WD59rG4^kqJ2V7FoZhz*?02Lf_N$rRw7i<5W*fTZQ-WLT|AzXW+YYeX)JZ
zD$nH{HUuoXz3R>G3E^>G^MrJ?Z@1^$cQ*W{^$(%)&!d)lwPPvC13@9trn3oytMx(O
zy!;tR+zrql8;yut$yp7wQiq8CrlDIH{HWS<-D~%jEH*BVW`NcM%M68ROYnujWNysW
zwqJFLxEs9JKH2$>=5%!Z%~R-0jl7feUn8%3$&-&d?icu;q_yAA9(8Ax^pvk3>v-l#
dW{Z0~bl}Z1y9Sk`b^hPV%(NWM>2>-Y{{iIp+&=&S

literal 0
HcmV?d00001

diff --git a/uni.scss b/uni.scss
index 45042d6..6cdda50 100644
--- a/uni.scss
+++ b/uni.scss
@@ -37,7 +37,7 @@ $uni-bg-color-hover:#f1f1f1;//点击状态颜色
 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
 
 /* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color:#f9f9f9;
 
 /* 尺寸变量 */
 

From d42c18577070c172820ea6e999fa3de29526df6a Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 13:17:57 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E8=A7=A3=E6=95=A3?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=93=8D=E4=BD=9C=EF=BC=8C=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue |  6 +++---
 pages/im/group/chat.nvue              |  5 +++++
 pages/im/group/index.vue              |  7 ++++---
 utils/im/index.js                     | 11 ++++-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 20d07e2..9f8ccd3 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -1,12 +1,12 @@
 <template>
     <view class="member--list">
         <view class="users">
-            <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
+            <view :class="['user', {'active': item.targetId === currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
                 <view class="avatar">
                     <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
-                    <view class="admin" v-if="item.is_admin">管理</view>
-                    <view class="owner" v-if="item.targetId === adminUid">群主</view>
+                    <view class="admin" v-if="item.is_admin === 1">管理</view>
+                    <view class="owner" v-if="item.is_admin === 2">群主</view>
                 </view>
                 <view class="name">{{ item.name }}</view>
             </view>
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index ee6d940..f1843f5 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -95,6 +95,11 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
+            uni.$on('onGroupDismiss', () => {
+                uni.switchTab({
+                    url: '/pages/im/index'
+                })
+            })
         },
         onNavigationBarButtonTap() {
             uni.navigateTo({
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index 97bbad8..058835a 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -42,6 +42,7 @@
         },
         onLoad() {
             this.initData()
+            uni.$on('onGroupDismiss', this.initData)
         },
         methods: {
             initData() {
@@ -68,9 +69,9 @@
                         icon: 'none',
                         title: err.message
                     })
-                }).finally(() => {
-                    this.initData()
-                    this.onHideModal()
+                }).finally(() => {
+                    this.initData()
+                    this.onHideModal()
                 })
             },
             toGroup(targetId) {
diff --git a/utils/im/index.js b/utils/im/index.js
index 5cd6fab..2984b38 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -166,13 +166,10 @@ const addListeners = () => {
             // 解散群
             if (message.content.operation === 'Dismiss') {
                 RongIMLib.cleanHistoryMessages(message.conversationType, message.targetId,
-                    message.sentTime - 1, false, ({
-                        code
-                    }) => {
-                        if (code == 0) {
-                            uni.$emit('onGroupDismiss', message.targetId)
-                        }
-                    })
+                    message.sentTime - 1, false, () => {})
+                // 解散了就删了吧
+                RongIMLib.removeConversation(message.conversationType, message.targetId, () => {})
+                uni.$emit('onGroupDismiss', message.targetId)
             }
             uni.$emit('onReceiveMessage', message)
         }

From b4e4ee54582deb901e798452f907d5911d9d1f2a Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 14:21:53 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.nvue |   6 --
 pages/im/index.vue       |   2 -
 store/modules/im.js      |   7 +-
 utils/im/index.js        | 146 ++-------------------------------------
 utils/im/listeners.js    | 138 ++++++++++++++++++++++++++++++++++++
 utils/index.js           |   8 +++
 6 files changed, 156 insertions(+), 151 deletions(-)

diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index f1843f5..e53837f 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -95,11 +95,6 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
-            uni.$on('onGroupDismiss', () => {
-                uni.switchTab({
-                    url: '/pages/im/index'
-                })
-            })
         },
         onNavigationBarButtonTap() {
             uni.navigateTo({
@@ -143,7 +138,6 @@
                     100,
                     true,
                     (messages) => {
-                        console.log(messages);
                         this.messages = messages.reverse()
                         this.scrollBottom()
                     })
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 47c6d00..3701d17 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -77,7 +77,6 @@
         methods: {
             checkNewFriendPending() {
                 im.getPendingList((pendings) => {
-                    console.log(pendings);
                     this.hasNewFriends = pendings.length
                 })
             },
@@ -98,7 +97,6 @@
                     code,
                     conversations
                 }) => {
-                    console.log(conversations);
                     if (code === 0) {
                         this.conversations = conversations
                     }
diff --git a/store/modules/im.js b/store/modules/im.js
index 211f93a..fdc88d5 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -9,9 +9,10 @@ export default {
         contacts(state) {
             return state.contacts
         },
-        contactInfo: (state) => (targetId) => {
+        contactInfo: (state) => (targetId) => {
             if (state.contacts[targetId]) {
                 const info = state.contacts[targetId]
+                
                 return {
                     name: info.name,
                     hash: info.hash,
@@ -37,7 +38,7 @@ export default {
         updateContactInfo(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         },
-        setSenderInfo(state, contactInfo) {
+        setSenderInfo(state, contactInfo) {
             state.myInfo = {
                 userId: contactInfo.targetId,
                 name: contactInfo.name,
@@ -49,7 +50,7 @@ export default {
         setSenderInfo({
             commit
         }, contactInfo) {
-            commit('setSenderInfo', contactInfo)
+            commit('setSenderInfo', contactInfo)
         },
         // 载入好友信息
         launchContact({
diff --git a/utils/im/index.js b/utils/im/index.js
index 2984b38..cc8e9ac 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -12,8 +12,9 @@ import {
 
 const initIm = (KEY) => {
     RongIMLib.init(KEY)
-    // CallLib.init()
-    addListeners()
+    CallLib.init()
+    listeners.imLibListeners()
+    listeners.callLibListeners()
     // 初始化的时候 自动链接
     if (store.getters.getToken !== '') {
         getImToken().then(res => {
@@ -59,7 +60,7 @@ const connect = (token, userInfo, callback) => {
         // 设置未读消息数量
         setNotifyBadge()
         // 首次运行获取好友列表
-        const FK = 'ZHK_' + userInfo.targetId
+        const FK = 'ZHKD_' + userInfo.targetId
 
         uni.getStorage({
             key: FK,
@@ -100,142 +101,6 @@ const disconnect = () => {
     })
 }
 
-// 允许通知的消息类型，触发更新消息列表操作
-const notifyMsgTypes = [
-    'RC:TxtMsg',
-    'RC:VcMsg',
-    'RC:HQVCMsg',
-    'RC:ImgMsg',
-    'RC:GIFMsg',
-    'RC:ImgTextMsg',
-    'RC:FileMsg',
-    'RC:LBSMsg',
-    'RC:SightMsg',
-    'RC:ReferenceMsg',
-    'RC:CombineMsg',
-]
-
-function inArray(search, array) {
-    for (var i in array) {
-        if (array[i] == search) {
-            return true
-        }
-    }
-    return false
-}
-
-const addListeners = () => {
-    // 添加连接状态监听函数 
-    RongIMLib.addConnectionStatusListener((res) => {
-        console.log('连接状态监听', res.data.status)
-        uni.$emit('onConnectionStatusChange', res.data.status)
-    })
-    // 添加消息监听函数
-    RongIMLib.addReceiveMessageListener((res) => {
-        const message = res.data.message
-        console.log('收到消息', message)
-        if (inArray(message.objectName, notifyMsgTypes)) {
-            if (!store.getters.contactIsExist(message.targetId)) {
-                getUserInfo(message.targetId).then(res => {
-                    store.dispatch('initContact', res)
-                }).catch(err => {
-                    console.log('ERR', err)
-                })
-            }
-            if (!store.getters.contactIsExist(message.senderUserId)) {
-                getUserInfo(message.senderUserId).then(res => {
-                    store.dispatch('initContact', res)
-                }).catch(err => {
-                    console.log('ERR', err)
-                })
-            }
-            newMessage(message)
-        } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {
-            // 更新会话信息
-            store.dispatch('updateContact', JSON.parse(message.content.data))
-            // 调用完更新之后，删除这条消息
-            RongIMLib.deleteMessagesByIds([message.messageId], ({
-                code
-            }) => {
-                console.log('消息删除结果', code)
-            })
-        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
-            // 触发一个新好友的通知事件
-            uni.$emit('onContactNotification', message)
-        } else if (message.objectName === RongIMLib.ObjectName.GroupNotification) {
-            // 解散群
-            if (message.content.operation === 'Dismiss') {
-                RongIMLib.cleanHistoryMessages(message.conversationType, message.targetId,
-                    message.sentTime - 1, false, () => {})
-                // 解散了就删了吧
-                RongIMLib.removeConversation(message.conversationType, message.targetId, () => {})
-                uni.$emit('onGroupDismiss', message.targetId)
-            }
-            uni.$emit('onReceiveMessage', message)
-        }
-    })
-
-    // 监听消息回执
-    RongIMLib.addReadReceiptReceivedListener(({
-        data
-    }) => {
-        uni.$emit('onReadReceiptReceived', data)
-    })
-
-    // 音视频通话相关的
-    // 监听通话呼入
-    // CallLib.onCallReceived(({
-    //     data
-    // }) => {
-    //     uni.navigateTo({
-    //         url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
-    //             data.mediaType
-    //     })
-    // })
-    // // 通话建立成功
-    // CallLib.onCallConnected(() => {
-    //     uni.$emit('onCallConnected')
-    // })
-    // // 外呼
-    // CallLib.onCallOutgoing((res) => {
-    //     uni.$emit('onCallOutgoing')
-    // })
-    // // 远端响铃
-    // CallLib.onRemoteUserRinging((res) => {
-    //     uni.$emit('onRemoteUserRinging')
-    // })
-    // // 远端加入
-    // CallLib.onRemoteUserJoined((res) => {
-    //     uni.$emit('onRemoteUserJoined')
-    // })
-    // // 断开链接
-    // CallLib.onCallDisconnected((res) => {
-    //     console.log('断开链接', res)
-    //     uni.$emit('onCallDisconnected')
-    // })
-    // // 远端挂断
-    // CallLib.onRemoteUserLeft((res) => {
-    //     console.log('远端离开', res)
-    //     uni.$emit('onRemoteUserLeft')
-    // })
-}
-
-// 维护消息列表，检查是否需要通知声音，设置新消息提醒的数量
-const newMessage = (msg) => {
-    RongIMLib.getConversationNotificationStatus(msg.conversationType, msg.targetId, ({
-        code,
-        status
-    }) => {
-        if (code === 0) {
-            if (status) {
-                triTone()
-            }
-        }
-    })
-    setNotifyBadge()
-    uni.$emit('onReceiveMessage', msg)
-}
-
 // 播放状态
 let tipState = false
 
@@ -256,7 +121,8 @@ const triTone = () => {
 
 export default {
     initIm,
-    connect,
+    connect,
+    disconnect,
     setNotifyBadge,
     ...message
 }
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index e69de29..9aba0a1 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -0,0 +1,138 @@
+import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+import store from '@/store/index.js'
+import im from "@/utils/im/index.js"
+import utils from '../index.js'
+import {
+    getUserInfo
+} from '@/apis/interfaces/im.js'
+
+// 维护消息列表，检查是否需要通知声音，设置新消息提醒的数量
+const onReceiveMessage = (message) => {
+    IMLib.getConversationNotificationStatus(message.conversationType, message.targetId, ({
+        code,
+        status
+    }) => {
+        if (code === 0) {
+            if (status) {
+                // triTone()
+            }
+        }
+    })
+    im.setNotifyBadge()
+    uni.$emit('onReceiveMessage', message)
+}
+
+// 允许通知的消息类型，触发更新消息列表操作,提示音
+const notifyMsgTypes = [
+    IMLib.ObjectName.Text,
+    IMLib.ObjectName.File,
+    IMLib.ObjectName.Image,
+    IMLib.ObjectName.GIF,
+    IMLib.ObjectName.Location,
+    IMLib.ObjectName.Voice,
+    IMLib.ObjectName.HQVoice,
+    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.Text,
+    IMLib.ObjectName.Text,
+    IMLib.ObjectName.Text
+]
+
+const imLibListeners = () => {
+    console.log('添加监听');
+    // 添加连接状态监听函数 
+    IMLib.addConnectionStatusListener((res) => {
+        console.log('连接状态监听', res.data.status)
+        uni.$emit('onConnectionStatusChange', res.data.status)
+    })
+    // 添加消息监听函数
+    IMLib.addReceiveMessageListener((res) => {
+        const message = res.data.message
+        console.error('[收到消息]', message)
+        if (utils.inArray(message.objectName, notifyMsgTypes)) {
+            if (!store.getters.contactIsExist(message.targetId)) {
+                getUserInfo(message.targetId).then(res => {
+                    store.dispatch('initContact', res)
+                }).catch(err => {
+                    console.error('getUserInfo ERR', err)
+                })
+            }
+            if (!store.getters.contactIsExist(message.senderUserId)) {
+                getUserInfo(message.senderUserId).then(res => {
+                    store.dispatch('initContact', res)
+                }).catch(err => {
+                    console.error('getUserInfo ERR', err)
+                })
+            }
+            onReceiveMessage(message)
+        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
+            // 更新会话信息
+            store.dispatch('updateContact', JSON.parse(message.content.data))
+            // 调用完更新之后，删除这条消息
+            IMLib.deleteMessagesByIds([message.messageId])
+        } else if (message.objectName === IMLib.ObjectName.ContactNotification) {
+            // 触发一个新好友的通知事件
+            uni.$emit('onContactNotification', message)
+        } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+            // 解散群
+            if (message.content.operation === 'Dismiss') {
+                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime, false)
+                // 解散了就删了吧
+                IMLib.removeConversation(message.conversationType, message.targetId)
+                uni.$emit('onGroupDismiss', message.targetId)
+            }
+            uni.$emit('onReceiveMessage', message)
+        }
+    })
+
+    // 监听消息回执
+    IMLib.addReadReceiptReceivedListener(({
+        data
+    }) => {
+        uni.$emit('onReadReceiptReceived', data)
+    })
+}
+
+const callLibListeners = () => {
+    // 音视频通话相关的
+    // 监听通话呼入
+    CallLib.onCallReceived(({
+        data
+    }) => {
+        uni.navigateTo({
+            url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
+                data.mediaType
+        })
+    })
+    // 通话建立成功
+    CallLib.onCallConnected(() => {
+        uni.$emit('onCallConnected')
+    })
+    // 外呼
+    CallLib.onCallOutgoing((res) => {
+        uni.$emit('onCallOutgoing')
+    })
+    // 远端响铃
+    CallLib.onRemoteUserRinging((res) => {
+        uni.$emit('onRemoteUserRinging')
+    })
+    // 远端加入
+    CallLib.onRemoteUserJoined((res) => {
+        uni.$emit('onRemoteUserJoined')
+    })
+    // 断开链接
+    CallLib.onCallDisconnected((res) => {
+        console.log('断开链接', res)
+        uni.$emit('onCallDisconnected')
+    })
+    // 远端挂断
+    CallLib.onRemoteUserLeft((res) => {
+        console.log('远端离开', res)
+        uni.$emit('onRemoteUserLeft')
+    })
+}
+
+export default {
+    imLibListeners,
+    callLibListeners
+}
diff --git a/utils/index.js b/utils/index.js
index 665e4d5..b772318 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,6 +1,14 @@
 import env from './conf/env.js'
 
 export default {
+    inArray: (search, array) => {
+        for (var i in array) {
+            if (array[i] == search) {
+                return true
+            }
+        }
+        return false
+    },
     checkPhone: (phone) => {
         let re = /^[0-9]+.?[0-9]*/;
         if (phone.length === 11) {

From ab6ecab23a2c24fd4c423832bcfa379e6022a948 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 17 Feb 2022 14:31:22 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E7=BE=A4=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/friendApplyCell.vue | 47 ++++++++++++++-----------
 pages/im/components/friendApplyList.vue |  3 +-
 pages/im/components/groupUserList.vue   |  9 ++++-
 pages/im/components/sentMessageBar.nvue | 19 ++++------
 pages/im/group/chat.nvue                | 14 +++-----
 pages/im/group/info.vue                 | 40 +++++++++++----------
 pages/im/private/chat.nvue              | 18 ++++------
 7 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index e9ed0a2..74ecf13 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,20 +1,15 @@
 <template>
-    <view class="apply--cell u-border-bottom">
+    <view class="apply--cell">
         <view class="avatar">
             <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
         </view>
         <view class="info">
-            <view class="name">
-                {{ user.name }}
-            </view>
-            <view class="message">
-                {{ message.message }}
-            </view>
+            <view class="name"> {{ user.name }}</view>
+            <view class="message"> {{ message.message!=='null' ? message.message : '听说你很优秀，想认识下你~' }} </view>
         </view>
-
         <view class="action">
-            <u-button type="success" size="mini" @click="resolve">通过</u-button>
-            <u-button type="warning" size="mini" @click="reject">拒绝</u-button>
+            <u-button class="u-button" size="default" type="success" @click="resolve">通过</u-button>
+            <u-button class="u-button" size="default" type="warning" @click="reject">拒绝</u-button>
         </view>
     </view>
 </template>
@@ -41,15 +36,16 @@
         methods: {
             resolve() {
                 resolveFriend(this.message.sourceUserId).then(res => {
-                    this.clearMessages()
-                    uni.showToast({
-                        icon: 'none',
-                        title: '通过好友申请'
+                    this.clearMessages()
+                    uni.showToast({
+                        icon: 'none',
+                        title: '通过好友申请'
                     })
-                }).catch(err => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: err.message
+                    uni.navigateBack({})
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
                     })
                 })
             },
@@ -73,7 +69,7 @@
             // 不管是通过还是拒绝，都要把相关的信息清理
             clearMessages() {
                 RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
-                this.$emit('success')
+                this.$emit('success')
                 uni.$emit('onContactNotification')
             }
         }
@@ -85,6 +81,7 @@
         display: flex;
         padding: $padding;
         align-items: center;
+        border-bottom: solid 1rpx #f9f9f9;
 
         .info {
             flex: 1;
@@ -103,9 +100,19 @@
 
         .action {
             justify-content: space-between;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            box-sizing: border-box;
+
+            .u-button {
+                padding: 10rpx 20rpx !important;
+                font-size: $title-size-m;
+                height: 60rpx !important;
+            }
 
             .u-button+.u-button {
-                margin-top: 10rpx;
+                margin-left: 10rpx;
             }
         }
     }
diff --git a/pages/im/components/friendApplyList.vue b/pages/im/components/friendApplyList.vue
index 10e2762..4fa31b6 100644
--- a/pages/im/components/friendApplyList.vue
+++ b/pages/im/components/friendApplyList.vue
@@ -8,7 +8,7 @@
                 <view class="right">
                     <view class="title">
                         <view class="name">{{ item.name }}</view>
-                        <view class="des">{{ item.latestMessage.message }}</view>
+                        <view class="des">{{ item.latestMessage.message || '--' }}</view>
                     </view>
                     <view class="agress-btn">
                         <span v-if="isAgree" @click="action('agree', item)">通过</span>
@@ -105,6 +105,7 @@ export default {
         .agress-btn {
             display: flex;
             color: #fff;
+            font-size: $title-size-m;
             span {
                 display: inline-block;
                 padding: 6rpx 14rpx;
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 20d07e2..c6ac887 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -18,7 +18,9 @@
             </view>
         </view>
 
-        <view @click="loadMore" v-if="members > users.length" class="loadmore">查看更多群成员 ></view>
+       <view class="loadmore">
+            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999" label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
+       </view>
 
         <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
             @select="handleAction" :show="actionShow">
@@ -316,5 +318,10 @@
         font-size: 26rpx;
         color: $text-gray-m;
         text-align: center;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
     }
 </style>
diff --git a/pages/im/components/sentMessageBar.nvue b/pages/im/components/sentMessageBar.nvue
index b09be2e..5e4bc93 100644
--- a/pages/im/components/sentMessageBar.nvue
+++ b/pages/im/components/sentMessageBar.nvue
@@ -3,22 +3,15 @@
         <!-- footer -->
         <view class="footer">
             <view class="msg-type" @click="changeMessageType">
-                <image class="icon" src="@/static/icon/key-icon.png" v-if="chatType === 0" mode="widthFix">
-                </image>
-                <image class="icon" src="@/static/icon/msg-icon.png" v-if="chatType === 1" mode="widthFix">
-                </image>
-            </view>
-            <sent-voice v-if="chatType === 0" :conversationType="conversationType" :targetId="targetId"
-                @success="onSuccess" />
-            <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId"
-                @success="onSuccess" />
-            <view class="msg-type msg-popups" @click="showPopups = !showPopups">
-                <image class="icon" src="@/static/icon/popups-icon.png"></image>
+                <image class="icon" src="@/static/icon/key-icon.png" v-if="chatType === 0" mode="widthFix" />
+                <image class="icon" src="@/static/icon/msg-icon.png" v-if="chatType === 1" mode="widthFix" />
             </view>
+            <sent-voice v-if="chatType === 0" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
+            <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
+            <view class="msg-type msg-popups" @click="showPopups = !showPopups"> <image class="icon" src="@/static/icon/popups-icon.png" /> </view>
         </view>
         <!-- 弹出层 -->
-        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId"
-            @success="() => {showPopups = false, onSuccess()}"></sent-popups>
+        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId" @success="() => {showPopups = false, onSuccess()}" />
     </view>
 </template>
 
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index ee6d940..65f1fb1 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -6,19 +6,15 @@
                     <text class="text">{{ item.content.message }}</text>
                 </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
-                        :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
-            <cell class="cell-footer" ref="chatBottom"></cell>
+            <cell class="cell-footer" ref="chatBottom" />
         </list>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index 78432ad..fc10f13 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -4,35 +4,34 @@
             <group-user-list :targetId="targetId" :count="14" />
         </view>
 
-        <u-cell-group class="cells">
-            <u-cell isLink title="群公告" :label="announcement" @click="toAnnouncement"></u-cell>
-            <u-cell isLink title="二维码" @click="showGroupQrCode"></u-cell>
-            <u-cell title="聊天置顶">
-                <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop"></u-switch>
+        <u-cell-group class="cells" :border="false" >
+            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" :label="announcement" @click="toAnnouncement" />
+            <u-cell :border="false" class="u-border-bottom" isLink title="二维码" @click="showGroupQrCode" />
+            <u-cell :border="false" class="u-border-bottom" title="聊天置顶">
+                <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop" />
             </u-cell>
-            <u-cell title="免打扰">
-                <u-switch slot="value" size="20" v-model="status" activeColor="#34CE98" @change="setStatus"></u-switch>
+            <u-cell class="u-border-bottom" :border="false" title="免打扰">
+                <u-switch slot="value" size="20" v-model="status" activeColor="#34CE98" @change="setStatus" />
             </u-cell>
         </u-cell-group>
 
-        <u-cell-group class="cells" v-if="group.is_admin">
-            <u-cell isLink title="修改群聊名称" :value="groupName" @click="onGroupName"></u-cell>
-            <u-cell isLink title="修改群头像" @click="onGroupAvatar">
-                <u-avatar slot="value" size="25" shape="square" :src="group.cover"></u-avatar>
+        <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-avatar slot="value" size="25" shape="square" :src="group.cover" />
             </u-cell>
-            <u-cell isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType"></u-cell>
+            <u-cell :border="false" class="u-border-bottom" isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType" />
         </u-cell-group>
 
-        <view class="cells actions u-border-top" v-if="loaded">
+        <view class="cells actions" v-if="loaded">
             <view class="action u-border-bottom" @click="onClean">清空聊天记录</view>
             <view class="action u-border-bottom" v-if="group.is_owner" @click="onDismiss">解散群聊</view>
             <view class="action u-border-bottom" v-else @click="onQuite">删除并退出</view>
         </view>
 
-        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal"
-            @confirm="onChangeGroupName">
+        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal" @confirm="onChangeGroupName">
             <view class="slot-content">
-                <u--input placeholder="群名称" border="surround" focus v-model="groupName"></u--input>
+                <u--input placeholder="群名称" border="surround" focus v-model="groupName" />
             </view>
         </u-modal>
 
@@ -42,9 +41,7 @@
             </view>
         </u-modal>
 
-        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions"
-            @close="showActions=false">
-        </u-action-sheet>
+        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions" @close="showActions=false" />
     </view>
 </template>
 
@@ -339,4 +336,9 @@
             justify-content: center;
         }
     }
+
+    .u-border-bottom {
+        border-bottom: solid 1rpx #f9f9f9 !important;
+    }
+    
 </style>
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index ddbb87a..87d0922 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -3,26 +3,20 @@
         <!-- chat -->
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time">
-                    <text class="text">{{ customCN(item.sentTime) }}</text>
-                </view>
+                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)"
-                        :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)" :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
                             <text class="state-text">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
             </cell>
-            <cell class="cell-footer" ref="chatBottom"></cell>
+            <cell class="cell-footer" ref="chatBottom" />
         </list>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>

From 0270de8490c8de0185696924347342ae85f81b78 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 14:43:45 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E8=A7=A3=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/connectionStatus.vue | 67 ++++++++++++++++++++++++
 pages/im/index.vue                       | 14 ++---
 2 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 pages/im/components/connectionStatus.vue

diff --git a/pages/im/components/connectionStatus.vue b/pages/im/components/connectionStatus.vue
new file mode 100644
index 0000000..3009e43
--- /dev/null
+++ b/pages/im/components/connectionStatus.vue
@@ -0,0 +1,67 @@
+<template>
+        <u-alert type="warning" v-if="connection != 0" :description="description" show-icon />
+</template>
+
+<script>
+    export default {
+        props: {
+            connection: {
+                type: Number,
+                default: 0
+            }
+        },
+        computed: {
+            description() {
+                return this.connectionStatusMap.filter(item => item.index == this.connection)[0].text
+            }
+        },
+        data() {
+            return {
+                connectionStatusMap: [{
+                        index: -1,
+                        text: '网络不可用'
+                    },
+                    {
+                        index: 0,
+                        text: '连接成功'
+                    },
+                    {
+                        index: 1,
+                        text: '连接中'
+                    },
+                    {
+                        index: 2,
+                        text: '未连接'
+                    },
+                    {
+                        index: 3,
+                        text: '用户账号在其它设备登录'
+                    },
+                    {
+                        index: 4,
+                        text: 'TOKEN过期'
+                    },
+                    {
+                        index: 6,
+                        text: '用户被禁用'
+                    },
+                    {
+                        index: 12,
+                        text: '退出登录'
+                    },
+                    {
+                        index: 13,
+                        text: '连接暂时被挂起'
+                    },
+                    {
+                        index: 14,
+                        text: '连接超时'
+                    },
+                ],
+            }
+        }
+    }
+</script>
+
+<style>
+</style>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 3701d17..b4b715d 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -17,10 +17,10 @@
                     </view>
                 </view>
             </view>
-        </view>
-        <u-alert type="warning" v-if="connection != 0" description="网络似乎断开了,请检查网络" :show-icon="true" />
+        </view>
         <!-- content -->
-        <view v-if="$store.state.token !== ''">
+        <view v-if="$store.state.token !== ''">
+            <connection-status :connection="connection" />
             <conversation-list @refresh="getConversationList()" :conversations="conversations" />
         </view>
         <!-- 未登录 -->
@@ -38,7 +38,8 @@
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
-    import conversationList from './components/conversationList'
+    import conversationList from './components/conversationList'
+    import connectionStatus from './components/connectionStatus'
 
     export default {
         data() {
@@ -49,7 +50,8 @@
             }
         },
         components: {
-            conversationList
+            conversationList,
+            connectionStatus
         },
         onLoad() {
             // 好友申请数量
@@ -96,7 +98,7 @@
                 RongIMLib.getConversationList([1, 3], count, timestamp, ({
                     code,
                     conversations
-                }) => {
+                }) => {
                     if (code === 0) {
                         this.conversations = conversations
                     }

From 1c5d6d9f4c5139667002307251b5d9dcadfb0df8 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 17 Feb 2022 15:27:52 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |  2 +-
 pages/im/components/groupUserList.vue | 26 ++++-----
 pages/im/components/messageCell.vue   |  7 +--
 pages/im/group/chat.nvue              |  6 +--
 pages/im/private/chat.nvue            | 77 +++++++++++++++------------
 5 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/pages.json b/pages.json
index 36e7ed8..a7aaca0 100644
--- a/pages.json
+++ b/pages.json
@@ -636,7 +636,7 @@
         }
     ],
     "tabBar": {
-        "borderStyle": "black",
+        "borderStyle": "white",
         "selectedColor": "#34CE98",
         "list": [{
                 "iconPath": "static/tabBar/tabBar_00.png",
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index f4f2711..e599250 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -4,27 +4,25 @@
             <view :class="['user', {'active': item.targetId === currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
                 <view class="avatar">
-                    <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
+                    <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl" />
                     <view class="admin" v-if="item.is_admin === 1">管理</view>
                     <view class="owner" v-if="item.is_admin === 2">群主</view>
                 </view>
                 <view class="name">{{ item.name }}</view>
             </view>
             <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bg-color="#eeeeee"
-                    color="#999999">
-                </u-avatar>
+                <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bgColor="#f9f9f9" color="#c7c7c7" />
                 <view class="name">邀请好友</view>
             </view>
         </view>
 
-       <view class="loadmore">
-            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999" label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
-       </view>
+        <view class="loadmore">
+            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999"
+                label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
+        </view>
 
         <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
-            @select="handleAction" :show="actionShow">
-        </u-action-sheet>
+            @select="handleAction" :show="actionShow" />
     </view>
 </template>
 
@@ -277,7 +275,7 @@
                     background-color: $main-color;
                     transform: rotate(45deg);
                     color: #ffffff;
-                    font-size: 12rpx;
+                    font-size: 16rpx;
                     width: 100rpx;
                     padding-top: 30rpx;
                     text-align: center;
@@ -290,7 +288,7 @@
                     background-color: $text-price;
                     transform: rotate(45deg);
                     color: #ffffff;
-                    font-size: 12rpx;
+                    font-size: 16rpx;
                     width: 100rpx;
                     padding-top: 30rpx;
                     text-align: center;
@@ -301,14 +299,16 @@
             }
 
             .name {
-                color: $text-gray-m;
+                color: 20rpx;
                 width: 126rpx;
+                padding-top: 6rpx;
                 text-align: center;
-                font-size: 26rpx;
+                font-size: 22rpx !important;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 word-break: break-word;
+                color: $text-gray-m !important;
             }
 
         }
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 4e37bcc..60cc614 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,8 +6,7 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
-                        class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
             <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
@@ -77,8 +76,10 @@
 
                     .qun {
                         color: $main-color;
-                        font-size: $title-size-m;
+                        font-size: $title-size-m - 4;
                         margin-left: 4px;
+                        position: relative;
+                        top: -4rpx;
                     }
                 }
 
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index a0da1bf..c62d24e 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -2,9 +2,7 @@
     <view class="group--chat">
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-system" v-if="item.senderUserId === '__system__'">
-                    <text class="text">{{ item.content.message }}</text>
-                </view>
+                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text class="text">{{ item.content.message }}</text> </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
@@ -168,8 +166,8 @@
         flex: 1;
 
         .body {
-            flex: 1;
 
+            flex: 1;
             .cell {
                 padding: 10rpx 30rpx;
 
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index 87d0922..ea795d3 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -3,15 +3,19 @@
         <!-- chat -->
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
+                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)" :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
-                            <text class="state-text">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
+                            <text :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
@@ -55,19 +59,19 @@
             }
         },
         computed: {
-            latestMessage() {
-                if (this.messages.length) {
-                    return this.messages[this.messages.length - 1]
-                } else {
-                    return {
-                        sentTime: 0
-                    }
+            latestMessage() {
+                if (this.messages.length) {
+                    return this.messages[this.messages.length - 1]
+                } else {
+                    return {
+                        sentTime: 0
+                    }
+                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
                 }
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         onLoad(e) {
@@ -104,18 +108,18 @@
             customCN(val) {
                 return timeCustomCN(val)
             },
-            getNewMessage() {
-                im.getMessageList(
-                    this.conversationType,
-                    this.targetId,
-                    this.latestMessage.sentTime || 0,
-                    1,
-                    false,
-                    (messages) => {
-                        console.log(messages);
-                        this.messages = this.messages.concat(messages)
-                        this.scrollBottom()
-                    })
+            getNewMessage() {
+                im.getMessageList(
+                    this.conversationType,
+                    this.targetId,
+                    this.latestMessage.sentTime || 0,
+                    1,
+                    false,
+                    (messages) => {
+                        console.log(messages);
+                        this.messages = this.messages.concat(messages)
+                        this.scrollBottom()
+                    })
             },
             // 获取消息列表
             getMessageList() {
@@ -125,7 +129,7 @@
                     0,
                     100,
                     true,
-                    (messages) => {
+                    (messages) => {
                         console.log(messages);
                         this.messages = messages.reverse()
                         this.scrollBottom()
@@ -167,6 +171,7 @@
         background: $window-color;
         flex: 1;
 
+
         .body {
             flex: 1;
 
@@ -192,7 +197,6 @@
                     width: 690rpx;
                     justify-content: flex-start;
 
-
                     &.left {
                         flex-direction: row;
                     }
@@ -213,8 +217,13 @@
                             padding-top: 10rpx;
 
                             .state-text {
-                                font-size: 24rpx;
-                                color: #666;
+                                font-size: $title-size-m - 2;
+                                color: rgba($color: $main-color, $alpha: 0.3)
+                            }
+
+                            .state-text-active {
+                                font-size: $title-size-m - 2;
+                               color: #cecece;
                             }
                         }
                     }

From 77b0905895b994fbd8524a70e17c643e1d936c57 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 17:05:38 +0800
Subject: [PATCH 21/25] stash

---
 manifest.json                         |  4 ++--
 pages/im/components/groupUserList.vue | 19 ++++++++++------
 pages/im/components/sentPopups.nvue   | 12 ++++-------
 pages/im/private/call.nvue            | 31 ++++++++++++++-------------
 utils/im/index.js                     |  2 +-
 utils/im/listeners.js                 |  7 ++++--
 utils/index.js                        |  4 +++-
 7 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/manifest.json b/manifest.json
index c65cec7..b375e89 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.10",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index f4f2711..3f6b4b7 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -18,9 +18,10 @@
             </view>
         </view>
 
-       <view class="loadmore">
-            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999" label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
-       </view>
+        <view class="loadmore">
+            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999"
+                label="查看更多群成员" labelPos="left" :labelSize="labelSize" :size="iconSize" />
+        </view>
 
         <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
             @select="handleAction" :show="actionShow">
@@ -32,12 +33,12 @@
     import {
         getGroupUsers,
         getGroupBase,
-
         removeGroupUser,
         setGroupAdmin,
         removeGroupAdmin,
         transferGroupOwner
     } from '@/apis/interfaces/im.js'
+    import utils from '@/utils/index.js'
 
     export default {
         props: {
@@ -61,7 +62,9 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
-                avatarSize: 40
+                avatarSize: 45,
+                labelSize: 14,
+                iconSize: 14
             }
         },
         computed: {
@@ -71,8 +74,10 @@
                 }
             }
         },
-        created() {
-            this.avatarSize = 90 / 750 * wx.getSystemInfoSync().windowWidth
+        created() {
+            this.avatarSize = utils.rpx2px(90)
+            this.labelSize = utils.rpx2px(24)
+            this.iconSize = utils.rpx2px(26)
         },
         mounted() {
             this.initGroupInfo()
diff --git a/pages/im/components/sentPopups.nvue b/pages/im/components/sentPopups.nvue
index a91ba04..36d7647 100644
--- a/pages/im/components/sentPopups.nvue
+++ b/pages/im/components/sentPopups.nvue
@@ -8,7 +8,7 @@
             <image class="icon" src="@/static/icon/popups-icon-01.png" mode="widthFix"></image>
             <text class="text">拍摄</text>
         </view>
-        <view class="item" @click="onPopupsItem('video')">
+        <view class="item" @click="onPopupsItem('video')" v-if="conversationType == 1">
             <image class="icon" src="@/static/icon/popups-icon-02.png" mode="widthFix"></image>
             <text class="text">视频通话</text>
         </view>
@@ -33,6 +33,7 @@
 
 <script>
     import im from '@/utils/im/index.js'
+    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
 
     export default {
         data() {
@@ -70,14 +71,9 @@
         },
         methods: {
             singleCall(e) {
-                uni.showToast({
-                    icon: 'none',
-                    title: '功能正在开发中'
+                uni.navigateTo({
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
                 })
-                // CallLib.startSingleCall(this.targetId, e.type, '');
-                // uni.redirectTo({
-                //     url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
-                // })
             },
             onPopupsItem(type) {
                 switch (type) {
diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index 464a048..f4be96d 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -10,11 +10,9 @@
 
         <view class="status" v-if="!connected || mediaType == 0">
             <view class="remote">
-                <u-avatar v-if="userInfo.portraitUrl" :src="userInfo.portraitUrl" shape="square" size="96"
+                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96"
                     bgColor="#fff" />
-                <u-avatar size="80" v-if="!userInfo.portraitUrl" shape="square"
-                    :text="userInfo.name ? userInfo.name.substring(0,1) : '未'" font-size="44" randomBgColor />
-                <view><text class="nickname">{{userInfo.name}}</text></view>
+                <view><text class="nickname">{{ contact(targetId).name }}</text></view>
                 <view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view>
                 <view v-if="connected"><text class="mediaType">已接通</text></view>
                 <view v-else><text class="mediaType">{{ mediaType == 0 ? '邀请您语音通话' : '邀请您视频通话' }}</text></view>
@@ -52,17 +50,14 @@
 </template>
 
 <script>
-    import {
-        getFriendInfo
-    } from '@/apis/interfaces/im.js'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
 
     export default {
         data() {
             return {
                 targetId: '',
                 mediaType: 0, // 0 语音  1 视频
-                userInfo: {},
                 isOut: false,
                 connected: false,
                 micStatus: false,
@@ -73,10 +68,10 @@
         },
         onLoad(e) {
             this.targetId = e.targetId
-            this.mediaType = e.mediaType
-            getFriendInfo(this.targetId).then(res => {
-                this.userInfo = res
-            })
+            this.mediaType = e.mediaType
+            // 进入页面开启外呼
+            CallLib.startSingleCall(this.targetId, this.mediaType, '');
+            
             this.startRing()
             // 监听通话链接状态
             uni.$once('onCallConnected', this.onCallConnected)
@@ -87,6 +82,9 @@
             uni.$once('onRemoteUserJoined', () => {
                 this.remoteRinging = false
             })
+        },
+        beforeDestroy() {
+
         },
         computed: {
             windowWidth() {
@@ -94,6 +92,11 @@
             },
             windowHeight() {
                 return uni.getSystemInfoSync().windowHeight
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         methods: {
@@ -130,9 +133,7 @@
 
                 setTimeout(() => {
                     this.downRing()
-                    uni.switchTab({
-                        url: '/pages/im/index'
-                    })
+                    uni.navigateBack()
                 }, 200);
             },
             toHome() {
diff --git a/utils/im/index.js b/utils/im/index.js
index cc8e9ac..d969209 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -121,7 +121,7 @@ const triTone = () => {
 
 export default {
     initIm,
-    connect,
+    connect,
     disconnect,
     setNotifyBadge,
     ...message
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index 9aba0a1..e2086c6 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -39,7 +39,6 @@ const notifyMsgTypes = [
 ]
 
 const imLibListeners = () => {
-    console.log('添加监听');
     // 添加连接状态监听函数 
     IMLib.addConnectionStatusListener((res) => {
         console.log('连接状态监听', res.data.status)
@@ -76,7 +75,8 @@ const imLibListeners = () => {
         } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
             // 解散群
             if (message.content.operation === 'Dismiss') {
-                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime, false)
+                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
+                    false)
                 // 解散了就删了吧
                 IMLib.removeConversation(message.conversationType, message.targetId)
                 uni.$emit('onGroupDismiss', message.targetId)
@@ -99,6 +99,7 @@ const callLibListeners = () => {
     CallLib.onCallReceived(({
         data
     }) => {
+        console.log('onCallReceived');
         uni.navigateTo({
             url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
                 data.mediaType
@@ -110,6 +111,7 @@ const callLibListeners = () => {
     })
     // 外呼
     CallLib.onCallOutgoing((res) => {
+        console.log('onCallOutgoing', res);
         uni.$emit('onCallOutgoing')
     })
     // 远端响铃
@@ -118,6 +120,7 @@ const callLibListeners = () => {
     })
     // 远端加入
     CallLib.onRemoteUserJoined((res) => {
+        console.log('远端接听');
         uni.$emit('onRemoteUserJoined')
     })
     // 断开链接
diff --git a/utils/index.js b/utils/index.js
index b772318..9a13645 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -9,6 +9,9 @@ export default {
         }
         return false
     },
+    rpx2px: (rpx) => {
+        return rpx / 750 * uni.getSystemInfoSync().windowWidth
+    },
     checkPhone: (phone) => {
         let re = /^[0-9]+.?[0-9]*/;
         if (phone.length === 11) {
@@ -81,7 +84,6 @@ export default {
                 let days = Math.abs(currentDate.getTime() - valDate.getTime()) / (1000 * 60 * 60 * 24);
                 return Math.ceil(days) + '天前';
             }
-
         }
     },
     timeStamp(timestamp, formats) {

From 0c817607d8e8f9dc3c344ab547cdb973f76a9a2c Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 17:46:24 +0800
Subject: [PATCH 22/25] CALL-test

---
 pages/im/private/call.nvue | 27 ++++++++++++---------------
 utils/im/index.js          |  4 +++-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index f4be96d..e92287c 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -10,8 +10,7 @@
 
         <view class="status" v-if="!connected || mediaType == 0">
             <view class="remote">
-                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96"
-                    bgColor="#fff" />
+                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96" bgColor="#fff" />
                 <view><text class="nickname">{{ contact(targetId).name }}</text></view>
                 <view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view>
                 <view v-if="connected"><text class="mediaType">已接通</text></view>
@@ -68,10 +67,10 @@
         },
         onLoad(e) {
             this.targetId = e.targetId
-            this.mediaType = e.mediaType
-            // 进入页面开启外呼
-            CallLib.startSingleCall(this.targetId, this.mediaType, '');
-            
+            this.mediaType = e.mediaType
+            // 进入页面开启外呼
+            CallLib.startSingleCall(this.targetId, this.mediaType, '');
+            // 响铃
             this.startRing()
             // 监听通话链接状态
             uni.$once('onCallConnected', this.onCallConnected)
@@ -92,11 +91,11 @@
             },
             windowHeight() {
                 return uni.getSystemInfoSync().windowHeight
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         methods: {
@@ -120,10 +119,8 @@
                 if (this.mediaType == 1) {
                     const session = CallLib.getCurrentCallSession()
                     setTimeout(() => {
-                        CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0,
-                            false)
-                        CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0,
-                            true)
+                        CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false)
+                        CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, true)
                     }, 200)
                 }
             },
diff --git a/utils/im/index.js b/utils/im/index.js
index d969209..320af90 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -18,7 +18,9 @@ const initIm = (KEY) => {
     // 初始化的时候 自动链接
     if (store.getters.getToken !== '') {
         getImToken().then(res => {
-            connect(res.token, res.userInfo, () => {})
+            connect(res.token, res.userInfo, (res) => {
+                console.log('IM.CONNECT', res);
+            })
         })
     }
 }

From 1e7e589bab15b2b1c9f198f7242d4b1f7a71d66d Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 09:46:17 +0800
Subject: [PATCH 23/25] nvue-vue

---
 ...messagePreview.nvue => messagePreview.vue} |   0
 ...sentMessageBar.nvue => sentMessageBar.vue} |   0
 .../{sentPopups.nvue => sentPopups.vue}       |   0
 .../{sentText.nvue => sentText.vue}           |   0
 .../{sentVoice.nvue => sentVoice.vue}         |   0
 .../{showImage.nvue => showImage.vue}         |   0
 .../{showText.nvue => showText.vue}           |   0
 .../{showVoice.nvue => showVoice.vue}         |   0
 pages/im/group/{chat.nvue => chat.vue}        |   0
 pages/im/group/invite.vue                     | 124 +++++++++++++++++-
 pages/im/private/{chat.nvue => chat.vue}      |   0
 11 files changed, 120 insertions(+), 4 deletions(-)
 rename pages/im/components/{messagePreview.nvue => messagePreview.vue} (100%)
 rename pages/im/components/{sentMessageBar.nvue => sentMessageBar.vue} (100%)
 rename pages/im/components/{sentPopups.nvue => sentPopups.vue} (100%)
 rename pages/im/components/{sentText.nvue => sentText.vue} (100%)
 rename pages/im/components/{sentVoice.nvue => sentVoice.vue} (100%)
 rename pages/im/components/{showImage.nvue => showImage.vue} (100%)
 rename pages/im/components/{showText.nvue => showText.vue} (100%)
 rename pages/im/components/{showVoice.nvue => showVoice.vue} (100%)
 rename pages/im/group/{chat.nvue => chat.vue} (100%)
 rename pages/im/private/{chat.nvue => chat.vue} (100%)

diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.vue
similarity index 100%
rename from pages/im/components/messagePreview.nvue
rename to pages/im/components/messagePreview.vue
diff --git a/pages/im/components/sentMessageBar.nvue b/pages/im/components/sentMessageBar.vue
similarity index 100%
rename from pages/im/components/sentMessageBar.nvue
rename to pages/im/components/sentMessageBar.vue
diff --git a/pages/im/components/sentPopups.nvue b/pages/im/components/sentPopups.vue
similarity index 100%
rename from pages/im/components/sentPopups.nvue
rename to pages/im/components/sentPopups.vue
diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.vue
similarity index 100%
rename from pages/im/components/sentText.nvue
rename to pages/im/components/sentText.vue
diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.vue
similarity index 100%
rename from pages/im/components/sentVoice.nvue
rename to pages/im/components/sentVoice.vue
diff --git a/pages/im/components/showImage.nvue b/pages/im/components/showImage.vue
similarity index 100%
rename from pages/im/components/showImage.nvue
rename to pages/im/components/showImage.vue
diff --git a/pages/im/components/showText.nvue b/pages/im/components/showText.vue
similarity index 100%
rename from pages/im/components/showText.nvue
rename to pages/im/components/showText.vue
diff --git a/pages/im/components/showVoice.nvue b/pages/im/components/showVoice.vue
similarity index 100%
rename from pages/im/components/showVoice.nvue
rename to pages/im/components/showVoice.vue
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.vue
similarity index 100%
rename from pages/im/group/chat.nvue
rename to pages/im/group/chat.vue
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index fa5fb59..91649aa 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -1,21 +1,137 @@
 <template>
-    <view class="">
-
+    <view>
+        <button type="default" @click="onInvite">确定</button>
+        <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
+            <u-checkbox-group v-if="friends.length > 0" v-model="checkboxValue" placement="column">
+                <u-index-item v-for="(item, fkey) in friends" :key="fkey">
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
+                        style="padding:10rpx 30rpx" />
+                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
+                        @click="addContact(friendItem.targetId)">
+                        <u-checkbox :name="friendItem.targetId" shape="circle" />
+                        <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 class="address">Hash:{{ friendItem.address }}</view> -->
+                        </view>
+                    </view>
+                </u-index-item>
+            </u-checkbox-group>
+        </u-index-list>
     </view>
 </template>
 
 <script>
+    import {
+        getFriendsLetter,
+        inviteGroupUser
+    } from '@/apis/interfaces/im';
+    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+
     export default {
         data() {
             return {
-                targetId: ''
+                targetId: '',
+                indexs: [],
+                friends: [],
+                checkboxValue: []
+            };
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
+            this.getFriendList()
+        },
+        methods: {
+            getFriendList() {
+                getFriendsLetter().then(res => {
+                    this.indexs = res.indexList
+                    this.friends = res.itemArr
+                })
+            },
+            addContact(targetId) {
+                if (!this.checkboxValue.find(item => item == targetId)) {
+                    this.checkboxValue.push(targetId)
+                } else {
+                    const index = this.checkboxValue.findIndex(item => item == targetId)
+                    this.checkboxValue = this.checkboxValue.splice(index, 1)
+                }
+            },
+            onInvite() {
+                inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
+                    uni.navigateBack()
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            }
         }
     }
 </script>
 
-<style>
+<style lang="scss" scoped>
+    // 页面空
+    .pages-null {
+        height: 70vh;
+    }
+
+    // 好友列表
+    .friend-flex {
+        position: relative;
+        padding: 0 $padding 0 $padding;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        box-sizing: border-box;
+
+        .avatar-img {
+            box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
+        }
+
+        .info {
+            flex: 1;
+            margin-left: $padding;
+            border-bottom: solid 1rpx #f9f9f9;
+            height: 120rpx;
+            line-height: 120rpx;
+
+            .name {
+                font-size: $title-size;
+                color: #454545 !important;
+                @extend .nowrap;
+            }
+
+            .address {
+                color: $text-gray-m;
+                font-size: $title-size-m - 3;
+                padding-top: 10rpx;
+                word-break: break-word;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 600rpx;
+            }
+        }
+    }
+
+    .list-cell {
+        display: flex;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 10px 24rpx;
+        overflow: hidden;
+        color: #323233;
+        font-size: 14px;
+        line-height: 24px;
+        background-color: #fff;
+    }
 </style>
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.vue
similarity index 100%
rename from pages/im/private/chat.nvue
rename to pages/im/private/chat.vue

From 08971f256dc5cd2e51832d61f4a02066f71a9745 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 09:58:15 +0800
Subject: [PATCH 24/25] =?UTF-8?q?chat=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 21 ++++++++++++++-------
 pages/im/index.vue        |  2 +-
 pages/im/private/chat.vue | 10 ++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index c62d24e..3126049 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -2,13 +2,18 @@
     <view class="group--chat">
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text class="text">{{ item.content.message }}</text> </view>
+                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text
+                        class="text">{{ item.content.message }}</text> </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
@@ -163,11 +168,13 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        flex: 1;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
-
             flex: 1;
+
             .cell {
                 padding: 10rpx 30rpx;
 
diff --git a/pages/im/index.vue b/pages/im/index.vue
index b4b715d..0555e65 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -99,7 +99,7 @@
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
+                    if (code === 0) {
                         this.conversations = conversations
                     }
                 })
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index ea795d3..a049abb 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -15,7 +15,8 @@
                         <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
-                            <text :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
+                            <text
+                                :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
@@ -169,8 +170,9 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        flex: 1;
-
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
             flex: 1;
@@ -223,7 +225,7 @@
 
                             .state-text-active {
                                 font-size: $title-size-m - 2;
-                               color: #cecece;
+                                color: #cecece;
                             }
                         }
                     }

From 6c0feb9cb60e7c756df3bbe34e36fbe467b90d27 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 10:16:13 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 29 +++++++++++++----------------
 pages/im/private/chat.vue | 35 ++++++++++++++---------------------
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 3126049..73ef8b0 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -1,9 +1,8 @@
 <template>
     <view class="group--chat">
-        <list class="body" :show-scrollbar="false">
-            <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text
-                        class="text">{{ item.content.message }}</text> </view>
+        <scroll-view class="body" :show-scrollbar="false">
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="cell-system" v-if="item.senderUserId === '__system__'">{{ item.content.message }}</view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -16,9 +15,9 @@
                             :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -168,26 +167,24 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
-        .body {
+        .body {
+            overflow: scroll;
             flex: 1;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .cell-system {
-                    align-items: center;
-
-                    .text {
-                        font-size: 24rpx;
-                        color: $text-gray-m;
-                    }
+                    text-align: center;
                 }
 
                 .cell-item {
+                    display: flex;
+                    flex-direction: row;
                     width: 690rpx;
                     justify-content: flex-start;
                     align-items: flex-start;
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index a049abb..1175f79 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="chat">
         <!-- chat -->
-        <list class="body" :show-scrollbar="false">
-            <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
+        <scroll-view class="body" scroll-y>
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="time">{{ customCN(item.sentTime) }}</view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -20,9 +20,9 @@
                         </view>
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -79,7 +79,7 @@
             this.targetId = e.targetId
             this.userInfo = this.$store.getters.contactInfo(this.targetId)
             uni.setNavigationBarTitle({
-                title: this.userInfo.name
+                title: this.contact(this.targetId).name
             })
             // 获取消息列表
             this.getMessageList()
@@ -170,32 +170,25 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
         .body {
             flex: 1;
+            overflow: scroll;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .time {
-                    justify-content: center;
-                    align-items: center;
-                    padding-bottom: 20rpx;
-
-                    .text {
-                        background: #fff;
-                        font-size: 24rpx;
-                        color: #666;
-                        line-height: 40rpx;
-                        padding: 0 20rpx;
-                        border-radius: 10rpx;
-                    }
+                    text-align: center;
+                    font-size: 24rpx;
+                    color: #666;
                 }
 
                 .cell-item {
+                    display: flex;
                     width: 690rpx;
                     justify-content: flex-start;