From b92fc0fc7e88daec3ff8ea29248fcd54fcd12211 Mon Sep 17 00:00:00 2001
From: Z <zhangmanman@zhangmanmandeiMac.local>
Date: Tue, 22 Feb 2022 15:00:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue | 23 +++++----------
 pages/im/friends/index.vue            | 22 +++++++++-----
 pages/im/group/announcement.vue       | 14 +++++----
 pages/im/group/index.vue              |  2 +-
 pages/im/group/info.vue               | 41 ++++++++++++++-------------
 pages/im/group/invite.vue             | 14 +++++++--
 pages/im/group/reviewed.vue           |  4 ---
 pages/user/index.vue                  |  7 ++++-
 8 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 4cdfacb..ee804a2 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -11,7 +11,7 @@
                 </view>
                 <view class="name">{{ item.name }}</view>
             </view>
-            <view class="user" v-if="isAdmin">
+            <view class="user" v-if="canInvite">
                 <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bgColor="#f9f9f9"
                     color="#c7c7c7" />
                 <view class="name">邀请好友</view>
@@ -54,20 +54,16 @@
             return {
                 users: [],
                 isOwner: false,
-                isAdmin: false,
+                isAdmin: false,
+                canInvite:false,//  是否可以开启邀请
                 adminUid: 0,
                 members: 0,
                 actionShow: false,
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
-<<<<<<< HEAD
                 avatarSize: 45,
                 labelSize: 14,
-=======
-                avatarSize: 84,
-                labelSize: 14,
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
                 iconSize: 14
             }
         },
@@ -78,21 +74,15 @@
                 }
             }
         },
-<<<<<<< HEAD
         created() {
             this.avatarSize = utils.rpx2px(90)
             this.labelSize = utils.rpx2px(24)
             this.iconSize = utils.rpx2px(26)
-=======
-        created() {
-            this.avatarSize = utils.rpx2px(84)
-            this.labelSize = utils.rpx2px(24)
-            this.iconSize = utils.rpx2px(26)
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
         },
         mounted() {
             this.initGroupInfo()
-            getGroupUsers(this.targetId, this.count).then(res => {
+            getGroupUsers(this.targetId, this.count).then(res => {
+                console.log("res..",res)
                 this.users = res
                 res.map(item => {
                     this.$store.dispatch('updateContact', item)
@@ -105,7 +95,8 @@
                     this.isOwner = res.is_owner
                     this.isAdmin = res.is_admin
                     this.adminUid = res.user_id
-                    this.members = res.members
+                    this.members = res.members
+                    this.canInvite = res.can_invite
                 })
             },
             initUsers() {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index a1cf547..ec32d5a 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -12,8 +12,8 @@
             </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="#ededed" height="20" size="12" color="#666"
-                        style="padding:10rpx 30rpx" />
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#f9f9f9" height="20" size="12" color="#666"
+                        class="anchor" />
                     <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
                         @click="toFriend(friendItem.targetId)">
                         <u-avatar class="avatar-img" size="40" shape="square"
@@ -37,8 +37,8 @@
         getFriendsLetter
     } from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import im from '@/utils/im/index.js'
-    
+    import im from '@/utils/im/index.js'
+
     export default {
         data() {
             return {
@@ -87,9 +87,9 @@
             // 新朋友
             toPending() {
                 // if (this.pendingCount > 0) {
-                    uni.navigateTo({
-                        url: '/pages/im/friends/pending'
-                    });
+                uni.navigateTo({
+                    url: '/pages/im/friends/pending'
+                });
                 // } else {
                 //     uni.showToast({
                 //         title: ` 暂无好友申请 ~ `,
@@ -114,6 +114,12 @@
         height: 70vh;
     }
 
+    .anchor {
+        background-color: #f9f9f9 !important;
+        padding: 10rpx 30rpx;
+        border-bottom: none !important;
+    }
+
     // 好友列表
     .friend-flex {
         position: relative;
@@ -127,6 +133,8 @@
             box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
         }
 
+
+
         .info {
             flex: 1;
             margin-left: $padding;
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index a8f6eb1..adceb9d 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -182,8 +182,9 @@
 
         .item {
             background-color: #fff;
-            padding: $padding $padding + 10;
-            border-bottom: $padding solid #f9f9f9;
+            padding: $padding $padding + 10 10rpx $padding + 10;
+            border-bottom: $padding solid #f9f9f9;
+            
 
             .user {
                 display: flex;
@@ -192,7 +193,8 @@
                 align-items: center;
                 box-sizing: border-box;
                 font-size: $title-size-m;
-                color: $text-gray-m;
+                color: $text-gray-m;
+                padding: 10rpx;
 
                 .name {
                     padding-left: 10rpx;
@@ -207,12 +209,14 @@
                 font-size: $title-size;
                 color: $text-color;
                 max-width: 100%;
-                margin-bottom: $padding;
+                margin-bottom: 10rpx;
                 display: -webkit-box;
                 -webkit-box-orient: vertical;
                 -webkit-line-clamp: 3;
                 overflow: hidden;
-                line-height: 1.5;
+                line-height: 1.5;
+                border-bottom: solid 1rpx  #F9F9F9;
+                padding-bottom: 20rpx;
 
                 span {
                     color: #fff;
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index 6437999..9b94858 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -98,7 +98,7 @@
             font-size: $title-size;
             color: $text-gray;
             background-color: #fff;
-            padding: 10rpx $padding $padding $padding;
+            padding: 10rpx $padding 20rpx $padding;
             font-weight: normal;
         }
     }
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index f8db425..47d99e3 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -5,9 +5,8 @@
         </view>
 
         <u-cell-group class="cells" :border="false">
-            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" 
-                @click="toAnnouncement" >
-                <view slot="label" class="announcement-label "> {{announcement}} </view>
+            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" @click="toAnnouncement">
+                <view slot="label" class="announcement-label "> {{announcement}} </view>
             </u-cell>
             <u-cell :border="false" class="u-border-bottom" isLink title="二维码" @click="showGroupQrCode" />
             <u-cell :border="false" class="u-border-bottom" v-if="group.can_makesure" isLink title="群聊邀请确认"
@@ -107,8 +106,8 @@
             })
             this.initData()
             uni.$on('groupAnnouncementCreated', this.initData)
-            uni.$on('groupInvitedUser', this.updateUserList)
-            uni.$on('updateAnnouncement',this.initData)
+            uni.$on('groupInvitedUser', this.updateUserList)
+            uni.$on('updateAnnouncement', this.initData)
         },
         onUnload() {
             uni.$off('groupAnnouncementCreated')
@@ -258,8 +257,11 @@
                         }
                         return item
                     })
-                    this.initData()
                     this.joinType = e.name
+                    this.$nextTick(() => {
+                        this.$refs.userList.initGroupInfo()
+                        this.initData()
+                    })
                     this.showActions = false
                 }).catch(err => {
                     console.log(err);
@@ -340,19 +342,20 @@
 
     .cells {
         margin-top: $padding;
-        background-color: white;
-        .announcement-label{
-            font-size: $title-size-m + 2;
-            padding-top: 10rpx;
-            color: $text-gray-m;
-            overflow: hidden;
-            width: 620rpx;
-            display: inline-block;
-            overflow:hidden; 
-            text-overflow:ellipsis;
-            display:-webkit-box; 
-            -webkit-box-orient:vertical;
-            -webkit-line-clamp:3; 
+        background-color: white;
+
+        .announcement-label {
+            font-size: $title-size-m + 2;
+            padding-top: 10rpx;
+            color: $text-gray-m;
+            overflow: hidden;
+            width: 620rpx;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
         }
     }
 
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 0e15481..8ef5a9e 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -101,7 +101,8 @@
                     this.orignalIndexs = res.indexList
                 })
                 getGroupUsers(this.targetId).then(res => {
-                    res.map(res => {
+                    res.map(res => {
+                        console.log(res)
                         this.checkboxValue.push(String(res.targetId))
                         this.selectValue.push(String(res.targetId))
                     })
@@ -121,7 +122,16 @@
                 }
 
             },
-            onInvite() {
+            onInvite() {
+                console.log(this.checkboxValue,'userIds.....')
+                console.log(this.selectValue,'userIds.....')
+                // let userIds = []
+                // this.checkboxValue.filter(item=>{
+                //     if(!utils.inArray(item, this.selectValue)){
+                //         userIds.push(item)
+                //     } 
+                // })
+                // console.log(userIds)
                 inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
                     uni.navigateBack({
                         delta: 1,
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index f3f0b3b..b5ae838 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -138,8 +138,6 @@
         }
 
     }
-<<<<<<< HEAD
-
     .no-lists {
         padding-top: $padding * 5;
         display: flex;
@@ -154,6 +152,4 @@
             padding-top: $padding;
         }
     }
-=======
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
 </style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index b8723eb..848f74b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -4,7 +4,7 @@
         <view class="info-box">
             <image src="@/static/user/user_back.png" mode="aspectFill" />
             <view class="user-flex">
-                <image class="cover" @click="$Router.push({ name: 'Setting' })"
+                <image class="cover" @click="goSetting"
                     :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill" />
                 <view class="user-content">
                     <block v-if="$store.state.token != ''">
@@ -233,6 +233,11 @@
                         params
                     });
                 }
+            },
+            goSetting(){
+                if (this.isLogin()) {
+                    this.$Router.push({ name: 'Setting' })
+                }
             },
             // 检查登录
             isLogin() {

From d92fb30648863bb16dc8748ba0670ee509c037da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 22 Feb 2022 16:38:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/sentVoice.vue |  8 ++---
 pages/im/components/showVoice.vue | 51 +++++++++++++++++++++++--------
 pages/im/group/chat.vue           |  6 +++-
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/pages/im/components/sentVoice.vue b/pages/im/components/sentVoice.vue
index 30a60c1..ae7a66d 100644
--- a/pages/im/components/sentVoice.vue
+++ b/pages/im/components/sentVoice.vue
@@ -100,7 +100,8 @@
 
 <style scoped lang="scss">
     .send--voice {
-        .voice {
+        .voice {
+            display: flex;
             background: $window-color;
             height: 70rpx;
             line-height: 70rpx;
@@ -109,14 +110,14 @@
             width: 500rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
-
             .button {
                 font-size: 30rpx;
                 color: #333;
             }
         }
 
-        .modal {
+        .modal {
+            display: flex;
             background: rgba(0, 0, 0, .6);
             position: fixed;
             height: 200rpx;
@@ -128,7 +129,6 @@
             flex-direction: column;
             align-items: center;
             justify-content: center;
-
             .icon {
                 width: 88rpx;
                 height: 88rpx;
diff --git a/pages/im/components/showVoice.vue b/pages/im/components/showVoice.vue
index c090e9e..7f6fafc 100644
--- a/pages/im/components/showVoice.vue
+++ b/pages/im/components/showVoice.vue
@@ -3,8 +3,8 @@
         <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
         <view class="msg--voice">
             <view :class="['voice', isRemote ? 'left': 'right', {'onPlay': onPlay}]" :style="{width: width + 'rpx'}" @click="startPlay">
-                <image v-if="isRemote" class="icon" src="@/static/icon/audio_green.png" mode="widthFix"></image>
-                <image v-else class="icon" src="@/static/icon/audio_white.png" mode="widthFix"></image>
+                <image v-if="isRemote" class="icon" :class="{ 'videoFlicker' : onPlay && msgId == message.messageId }" src="@/static/icon/audio_green.png" mode="widthFix"></image>
+                <image v-else class="icon" :class="{ 'videoFlicker' : onPlay && msgId == message.messageId }" src="@/static/icon/audio_white.png" mode="widthFix"></image>
                 <text class="duration">{{ duration }}"</text>
             </view>
             <u-badge isDot :show="message.content.local =='' && isRemote" />
@@ -27,12 +27,13 @@
             isGroup: {
                 type: Boolean,
                 default: false
-            }
+            }
         },
         data() {
             return {
                 onPlay: false,
                 innerAC: null,
+                msgId  : null
             }
         },
         computed: {
@@ -62,7 +63,12 @@
                     this.stopPlay()
                 }
             })
-        },
+        },
+        
+        created() {
+            console.log(this.message.messageId)
+        },
+        
         methods: {
             // 播放语音消息
             startPlay() {
@@ -91,15 +97,17 @@
                     })
                 }
             },
-            playVoice(path) {
+            playVoice(path) {
                 console.log('准备播放', this.message.content);
                 this.innerAC = uni.createInnerAudioContext()
                 this.innerAC.src = path
-                this.innerAC.autoplay = false
-                this.innerAC.onCanplay(res => {
+                this.innerAC.autoplay = false
+                this.msgId = this.message.messageId
+                this.innerAC.onCanplay(res => {
                     this.innerAC.play()
-                })
-                this.innerAC.onPlay(res => {
+                })
+                
+                this.innerAC.onPlay(res => {
                     this.onPlay = true
                     uni.$emit('onVoiceMessagePlay', this.message.messageId)
                 })
@@ -109,10 +117,11 @@
                 this.innerAC.onStop(() => {
                     this.onPlay = false
                     this.innerAC.destroy()
-                    this.innerAC = null
+                    this.innerAC = null
+                    this.msgId   = null
                     uni.$emit('onVoiceMessageStop', this.message.messageId)
                 })
-                this.innerAC.onError(err => {
+                this.innerAC.onError(err => {
                     uni.showToast({
                         icon: 'none',
                         title: '语音播放失败'
@@ -127,7 +136,25 @@
             }
         }
     }
-</script>
+</script>
+
+<style>
+    @keyframes playFlicker{
+        0%{
+            opacity: 1;
+        }
+        50%{
+            opacity: .5;
+        }
+        100%{
+            opacity: 1;
+        }
+    }
+    
+    .videoFlicker{
+        animation: playFlicker 1s infinite;
+    }
+</style>
 
 <style scoped lang="scss">
     .name {
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index ab2a2d1..98b5f2c 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -10,7 +10,7 @@
                         <u-avatar class="avatar" @click="toUser(item)" :size="avatarSize" shape="square"
                             :src="contact(item.senderUserId).portraitUrl" />
                         <view class="msg">
-                            <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :message="item" isGroup />
+                            <show-voice ref="voice" v-if="item.objectName === 'RC:HQVCMsg'" :message="item" isGroup />
                             <show-image v-if="item.objectName === 'RC:ImgMsg'" :message="item" isGroup />
                             <show-text v-if="item.objectName === 'RC:TxtMsg'" :message="item" isGroup />
                         </view>
@@ -150,6 +150,10 @@
                     im.setNotifyBadge()
                 }
             }
+        },
+        onHide() {
+            // console.log(JSON.stringify(this.$refs))
+            this.$refs.voice.stopPlay()
         }
     }
 </script>