From ed9fe0ff9c0c26fb6bf404e597c65fb0789469f9 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 14 Feb 2022 10:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=B4=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/im.js               |  12 ++-
 pages/im/components/messageCell.vue |  27 +++---
 pages/im/friends/search.vue         |   2 +-
 pages/im/group/announceCreate.vue   |   3 +-
 pages/im/group/announcement.vue     |   7 +-
 pages/im/group/chat.nvue            |   6 +-
 pages/im/group/info.vue             |  52 +++++++----
 pages/im/group/users.vue            | 140 +++++++++++++++++++++++-----
 8 files changed, 185 insertions(+), 64 deletions(-)

diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js
index 63bc538..0b2cb7e 100644
--- a/apis/interfaces/im.js
+++ b/apis/interfaces/im.js
@@ -107,6 +107,15 @@ const getGroupInfo = (groupId) => {
         url: 'im/groups/' + groupId
     })
 }
+
+/**
+ * 群组基础信息
+ */
+const getGroupBase = (groupId) => {
+    return request({
+        url: 'im/groups/' + groupId+ '/base'
+    })
+}
 
 const getGroupUsers = (groupId) => {
     return request({
@@ -194,7 +203,8 @@ export {
     getMyGroups,
     createGroup,
     updateGroup,
-    getGroupInfo,
+    getGroupInfo,
+    getGroupBase,
     getGroupUsers,
     getGroupAnnouncements,
     createGroupAnnouncement,
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 16773e0..3c6563c 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -1,12 +1,13 @@
 <template>
     <view class="message--cell">
         <view class="avatar">
-            <u-badge max="99" shape="horn" absolute :offset="[-5, -8]" :value="item.unreadMessageCount" />
+            <u-badge max="99" shape="horn" absolute :offset="[-5, -8]" :value="item.unreadMessageCount" />
             <u-avatar :src="contact(item.targetId).portraitUrl" shape="square" size="44" />
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <span v-if="item.conversationType === 3" class='qun'>[群]</span></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"
@@ -41,22 +42,22 @@
 </script>
 
 <style lang="scss" scoped>
-    .message--cell {
-        display: flex;
-        padding: 20rpx 0 0 20rpx;
-        
+    .message--cell {
+        display: flex;
+        padding: 20rpx 0 0 20rpx;
+
         .avatar {
             position: relative;
 
             .u-badge {
                 z-index: 998;
-            }
+            }
         }
 
-        .content {
+        .content {
             margin-left: 30rpx;
             box-sizing: border-box;
-            position: relative;
+            position: relative;
             flex: 1;
 
             border-bottom-width: 0.5px !important;
@@ -69,9 +70,11 @@
 
                 .name {
                     font-size: $title-size + 2;
-                    color: #454545;
-                    color: #454545;
-                    .qun{
+                    color: #454545;
+                    display: flex;
+                    align-items: center;
+
+                    .qun {
                         color: $main-color;
                         font-size: $title-size-m;
                         margin-left: 4px;
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index 20ff4f7..a0d26f8 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -12,7 +12,7 @@
         <u-sticky>
             <view class="header-search">
                 <u-search placeholder="输入用户账号、手机号" height="74" searchIcon="search" @custom="search"
-                    v-model="searchValue" @search="search" inputAlign="center" bgColor="#f9f9f9" :focus="focused" />
+                    v-model="searchValue" @search="search" bgColor="#f9f9f9" :focus="focused" />
             </view>
         </u-sticky>
         <block v-if="searchResult.length > 0">
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index 3d3ee9d..4a428f9 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -23,7 +23,8 @@
         },
         methods: {
             onCreate() {
-                createGroupAnnouncement(this.targetId, this.content).then(res => {
+                createGroupAnnouncement(this.targetId, this.content).then(res => {
+                    uni.$emit('groupAnnouncementCreated')
                     uni.showToast({
                         title: '发布成功',
                         success: () => {
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 14619f3..18d3906 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -38,11 +38,15 @@
                 this.isAdmin = res.group.is_admin
             })
             this.initData()
+            uni.$on('groupAnnouncementCreated', this.initData)
+        },
+        onUnload() {
+            uni.$off('groupAnnouncementCreated')
         },
         onNavigationBarButtonTap() {
             if (this.isAdmin) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                    url: '/pages/im/group/announceCreate?targetId=' + this.targetId
                 })
             } else {
                 uni.showToast({
@@ -55,7 +59,6 @@
             initData() {
                 getGroupAnnouncements(this.targetId).then(res => {
                     this.announcements = res
-                    console.log(res);
                     this.loading = false
                 })
             },
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index 332a9ec..2c50d0c 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -61,10 +61,12 @@
                 if (msg.targetId == this.targetId) {
                     this.getMessageList()
                 }
-            })
+            })
+            uni.$once('cleanGroupMessage', this.getMessageList)
         },
         onBackPress() {
-            uni.$off('onReceiveMessage')
+            uni.$off('onReceiveMessage')
+            console.log('Off onReceiveMessage');
         },
         onNavigationBarButtonTap() {
             uni.navigateTo({
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index b846522..b591bce 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -11,9 +11,9 @@
                         color="#999999"></u-avatar>
                     <view class="name">邀请用户</view>
                 </view>
-            </view>
-            
-            <view @click="loadMore" class="loadmore">查看更多群成员</view>
+            </view>
+
+            <view @click="loadMore" class="loadmore">查看更多群成员 ></view>
         </view>
 
         <u-cell-group class="cells">
@@ -26,19 +26,19 @@
             </u-cell>
         </u-cell-group>
 
-        <u-cell-group class="cells" v-if="group.is_owner">
+        <u-cell-group class="cells" v-if="group.is_admin">
             <u-cell isLink title="修改群聊名称" :value="group.name" @click="onGroupName"></u-cell>
             <u-cell isLink title="修改群头像">
                 <u-avatar slot="value" size="24" shape="square" :src="group.cover"></u-avatar>
             </u-cell>
         </u-cell-group>
 
-        <view class="cells actions u-border-top">
+        <view class="cells actions u-border-top" 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>
-        
+        </view>
+
     </view>
 </template>
 
@@ -58,16 +58,11 @@
                 members: [],
                 status: false,
                 isTop: false,
+                loaded: false
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
-            getGroupInfo(this.targetId).then(res => {
-                this.group = res.group
-                console.log(this.group);
-                this.announcement = res.announcement
-                this.members = res.members
-            })
             RongIMLib.getConversationNotificationStatus(this.conversationType, this.targetId, ({
                 status
             }) => {
@@ -80,9 +75,22 @@
                 if (code == 0) {
                     this.isTop = conversation.isTop
                 }
-            })
+            })
+            this.initData()
+            uni.$on('groupAnnouncementCreated', this.initData)
+        },
+        onUnload() {
+            uni.$off('groupAnnouncementCreated')
         },
         methods: {
+            initData() {
+                getGroupInfo(this.targetId).then(res => {
+                    this.group = res.group
+                    this.announcement = res.announcement
+                    this.members = res.members
+                    this.loaded = true
+                })
+            },
             setStatus() {
                 RongIMLib.setConversationNotificationStatus(this.conversationType, this.targetId, this.status,
                     ({
@@ -132,6 +140,7 @@
                                     icon: 'none',
                                     title: '清空成功'
                                 })
+                                uni.$emit('cleanGroupMessage')
                             })
                         }
                     }
@@ -178,23 +187,26 @@
                 width: 126rpx;
                 margin-left: 20rpx;
                 margin-bottom: 20rpx;
+                display: flex;
+                flex-direction: column;
                 justify-content: center;
                 align-items: center;
 
-                .name {
+                .name {
+                    color: $text-gray-m;
                     width: 126rpx;
                     text-align: center;
-                    font-size: 28rpx;
+                    font-size: 26rpx;
                     overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    word-break: break-word;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    word-break: break-word;
                 }
             }
         }
 
         .loadmore {
-            font-size: 28rpx;
+            font-size: 26rpx;
             color: $text-gray-m;
             text-align: center;
         }
diff --git a/pages/im/group/users.vue b/pages/im/group/users.vue
index 5aa822a..dd15874 100644
--- a/pages/im/group/users.vue
+++ b/pages/im/group/users.vue
@@ -1,17 +1,28 @@
 <template>
     <view class="members">
         <view class="users">
-            <view class="user" v-for="(item, index) in members" :key="index" @click="toUser(item)">
+            <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>
 </template>
 
 <script>
-    import {
-        getGroupInfo,
+    import {
+        getGroupBase,
         getGroupUsers
     } from '@/apis/interfaces/im.js'
 
@@ -19,24 +30,90 @@
         data() {
             return {
                 targetId: '',
-                members: []
+                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
-            getGroupInfo(this.targetId).then(res => {
-            
-            })
-            getGroupUsers(this.targetId).then(res => {
-                this.members = res
+            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
+                    })
+                }
             })
-        },
-        methods: {
-            toUser(item) {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + item.targetId
-                })
-            }
+            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>
@@ -56,19 +133,32 @@
                 width: 126rpx;
                 margin-left: 20rpx;
                 margin-bottom: 20rpx;
+                display: flex;
+                flex-direction: column;
                 justify-content: center;
                 align-items: center;
 
-                .name {
-                    width: 126rpx;
-                    text-align: center;
-                    font-size: 28rpx;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    word-break: break-word;
+                &.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>