From a5bd5a898c41f207ab851ef3b1618ac67ba23a8c Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 16:06:41 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8B=E4=BB=B6=E9=80=9A=E7=9F=A5?=
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.vue               | 28 +++++++++++++++------------
 utils/im/listeners.js                 | 18 ++++++++++++++++-
 utils/im/onGroupDismiss.js            | 20 +++++++++++++++++++
 4 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 3f95dfe..5283b15 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -62,10 +62,9 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
-                avatarSize: 45,
+                avatarSize: 40,
                 labelSize: 14,
                 iconSize: 14
-
             }
         },
         computed: {
@@ -76,7 +75,7 @@
             }
         },
         created() {
-            this.avatarSize = utils.rpx2px(90)
+            this.avatarSize = utils.rpx2px(84)
             this.labelSize = utils.rpx2px(24)
             this.iconSize = utils.rpx2px(26)
         },
@@ -277,7 +276,6 @@
                 border-radius: 0 8rpx 0 0;
                 position: relative;
                 width: 84rpx;
-                height: 84rpx;
                 overflow: hidden;
 
                 .admin {
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 1fb05ce..b75f21a 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -21,11 +21,11 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
-    
-    export default {
-        mixins: [
-            onGroupDismiss
+    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+
+    export default {
+        mixins: [
+            onGroupDismiss
         ],
         components: {
             sentMessageBar,
@@ -55,12 +55,7 @@
         },
         onLoad(e) {
             this.targetId = e.targetId
-            // 获取群成员数量
-            getGroupBase(this.targetId).then(res => {
-                uni.setNavigationBarTitle({
-                    title: res.name + `(${res.members})`
-                })
-            })
+            this.initGroupInfo()
             // 获取历史消息列表
             this.getMessageList()
             // 监听新消息
@@ -103,7 +98,8 @@
             })
         },
         onUnload() {
-            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onUpdateProfile_' + this.targetId)
             uni.$off('onRecallMessage')
             uni.$off('onReceiptRequest')
             uni.$off('onReceiptResponse')
@@ -114,6 +110,14 @@
             })
         },
         methods: {
+            initGroupInfo() {
+                // 获取群信息，成员数量，设置标题
+                getGroupBase(this.targetId).then(res => {
+                    uni.setNavigationBarTitle({
+                        title: res.name + `(${res.members})`
+                    })
+                })
+            },
             onScroll(e) {
                 this.$refs.messageBar.onHidePopus()
             },
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index 63e59e6..f9ded27 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -30,6 +30,7 @@ const onReceiveMessage = (message) => {
 const checkContactExists = (message) => {
     if (!store.getters.contactIsExist(message.targetId)) {
         getUserInfo(message.targetId).then(res => {
+            console.log('targetId', res);
             store.dispatch('initContact', res)
         }).catch(err => {
             console.error('getUserInfo ERR', err)
@@ -37,6 +38,7 @@ const checkContactExists = (message) => {
     }
     if (!store.getters.contactIsExist(message.senderUserId)) {
         getUserInfo(message.senderUserId).then(res => {
+            console.log('senderUserId', message.senderUserId, res);
             store.dispatch('initContact', res)
         }).catch(err => {
             console.error('getUserInfo ERR', err)
@@ -69,7 +71,8 @@ const imLibListeners = () => {
         checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
             onReceiveMessage(message)
-        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
+        } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
+            uni.$emit('onUpdateProfile_' + message.targetId)
             // 更新联系人信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
             // 调用完更新之后，删除这条消息
@@ -89,6 +92,19 @@ const imLibListeners = () => {
                 // 发布群解散的消息
                 uni.$emit('onGroupDismiss')
                 uni.$emit('onGroupDismiss_' + message.targetId)
+            } else if (message.content.operation === 'REMOVE') {
+                // 要判断是否当前用户，然后把当前用户踢出到主页去， 删除聊天记录，会话列表
+                if (message.content.extra == store.getters.sender.userId) {
+                    IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
+                        false)
+                    // 解散了就删了吧
+                    IMLib.removeConversation(message.conversationType, message.targetId)
+                    // 为了更新群列表
+                    uni.$emit('onGroupDismiss')
+                    uni.$emit('onGroupRemoveYou_' + message.targetId)
+                }
+                uni.$emit('onReceiveMessage_' + message.targetId, message)
+                // 这个是为了更新消息列表页的
             }
             // 触发刷新会话列表
             uni.$emit('onReceiveMessage', message)
diff --git a/utils/im/onGroupDismiss.js b/utils/im/onGroupDismiss.js
index 4b6b607..1f76c40 100644
--- a/utils/im/onGroupDismiss.js
+++ b/utils/im/onGroupDismiss.js
@@ -1,6 +1,13 @@
 // 监听群解散的消息，直接跳转到会话列表页面
 const onGroupDismiss = {
+    data() {
+        return {
+            currentTargetId: ''
+        }
+    },
     onLoad(e) {
+        this.currentTargetId = e.targetId
+
         uni.$once('onGroupDismiss_' + e.targetId, () => {
             uni.showToast({
                 icon: 'none',
@@ -10,6 +17,19 @@ const onGroupDismiss = {
                 url: '/pages/im/index'
             })
         })
+        uni.$once('onGroupRemoveYou_' + e.targetId, () => {
+            uni.showToast({
+                icon: 'none',
+                title: '您已被移出群聊'
+            })
+            uni.switchTab({
+                url: '/pages/im/index'
+            })
+        })
+    },
+    onUnload() {
+        uni.$off('onGroupDismiss_' + this.currentTargetId)
+        uni.$off('onGroupRemoveYou_' + this.currentTargetId)
     }
 }
 

From 20317cc1df9d141f4634a37369a8bd35fcb9af50 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 16:29:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BE=A4=E5=85=AC=E5=91=8A=E7=9A=84?=
 =?UTF-8?q?=E7=BE=A4=E5=86=85=E6=8F=90=E9=86=92=EF=BC=8C=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/showMessageCell.vue | 24 +++++++++++++++++++++++-
 pages/im/group/announceCreate.vue       |  4 ++--
 pages/im/group/announcement.vue         |  4 ++--
 utils/im/listeners.js                   |  3 ++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index ec41398..f01d07d 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -1,6 +1,10 @@
 <template>
     <view class="">
-        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">{{ message.content.message }}</view>
+        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
+            {{ message.content.message }}
+            <text class="link" @click="toAnnounce(message.content.extra)"
+                v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
+        </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
         </view>
@@ -75,6 +79,19 @@
                     })
                 }
             },
+            // 跳转群公告
+            toAnnounce(targetId) {
+                if (targetId) {
+                    uni.navigateTo({
+                        url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                    })
+                } else {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '旧版本，无链接'
+                    })
+                }
+            },
             // 撤回消息测试
             backMessage() {
                 if (this.$store.getters.sender.userId != this.message.senderUserId) {
@@ -118,6 +135,11 @@
         text-align: center;
         font-size: 24rpx;
         color: #666;
+
+        .link {
+            color: blue;
+            margin-left: 10rpx;
+        }
     }
 
     .cell-item {
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index fd05ae4..30a5a7d 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,11 +1,11 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-        <block v-if="type !== 'cheack'">
+        <block v-if="type !== 'check'">
             <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
             <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
         </block>
-        <block v-if="type === 'cheack'">
+        <block v-if="type === 'check'">
             <view class="content-a"> {{content}} </view>
         </block>
     </view>
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index d45e9ac..3b2a420 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -76,7 +76,7 @@
         onNavigationBarButtonTap() {
             if (this.isAdmin) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
                 })
             } else {
                 uni.showToast({
@@ -119,7 +119,7 @@
             },
             tabA(id) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
                 })
             },
             onTop(aId) {
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index f9ded27..f3d4b04 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,7 +55,8 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight
+    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.GroupNotification
 ]
 
 const imLibListeners = () => {

From 8bb646a52077b1f3af9cfb45d43234f04f03bf18 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 23 Feb 2022 16:30:35 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=BE=A4=E8=81=8A+?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0+=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=B0=8F=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                | Bin 14340 -> 14340 bytes
 pages/im/group/index.vue |  10 +++++-----
 pages/im/group/info.vue  |   2 +-
 static/.DS_Store         | Bin 10244 -> 12292 bytes
 static/user/cover-s.png  | Bin 0 -> 3850 bytes
 5 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 static/user/cover-s.png

diff --git a/.DS_Store b/.DS_Store
index c1a2c05689ed421f0ce5b68a5d14a53025647039..6a740ac20f36d933833be08eea6e868378331ec8 100644
GIT binary patch
delta 277
zcmZoEXerp>Ey!+aW}>5DYCQRsy8Yydg3^rpCa)D#Q<0FAl9GuR5Kc-=&Q34NFU?DF
z&d<p&a>^-9jmS*S&kN41N}VLMt3F<Uzc?em+!H7iP?TDhnOYv5UX+;<T#%TYnU}6?
z|A7GvlpO+K3=IfFfI%6;U|`@7U{rQsf$&1|^7B$TIh7r}p|Ttd+6;~iUJStu84TqN
zeGIc0)-dc~ILdH~;SIw#Mr#&EF-9duZAKGDTSj|E4@OT$Z^jVDNX96}Xovw!j8KDQ
fp){0YOxc_uyntsjw}KqUW;uy_?3>vQ{;~rAnJ_#k

delta 270
zcmZoEXerp>Ey!VLZm6SRWNJ3~wYuHpiGtFMn<uXoRMQoe5R#IP7Z6TLOwLX($}i1J
zan8@lFLKH$O^p}eFV4s>_e{>u3n)r0%S<hw{9SODd_*QtAULxsH9Ea0GbOknF*!3Y
zUD^Hv0~l~lekdefACi}!m&&Q^5C9QWcJPKU7&sWT85|jc8Dba;85$U-Gc0D<%5ae3
z9K&OVuMGbgc^SnRl^C@dbr?+<%^4jS9T}Y&Js3S1gCM$@7@?-fKxrt&7!72wF%&bD
lFeCzTCd1|`;fXvGA8>ExR*>V^Y$9=;ePRRqW_E+W>;MFULKgr4

diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index da337e4..6ff481d 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -3,16 +3,15 @@
         <block v-if="groups.length > 0">
             <view class="title"> 群聊 </view>
             <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
-                <u-avatar size="38" shape="square" :src="contact(item.targetId).portraitUrl" />
+                <u-avatar size="38" shape="square" :src="item.portraitUrl !== ''?contact(item.targetId).portraitUrl :require('@/static/user/cover-s.png')" />
                 <view class="info">
-                    <view class="name">{{item.name}}  <span class="total">共10人</span></view>
+                    <view class="name">{{item.name}}  <span class="total">共{{item.people_count}} 成员</span></view>
                 </view>
             </view>
             <view class="group-count"> {{groups.length}}个群聊 </view>
         </block>
         <view class="no-lists" v-else>
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
-                :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
             <span>空空如也~</span>
         </view>
         <u-modal negativeTop="300" :show="createModal" title="创建群聊" showCancelButton @cancel="onHideModal"
@@ -55,7 +54,8 @@
         },
         methods: {
             initData() {
-                getMyGroups().then((res) => {
+                getMyGroups().then((res) => {
+                    console.log(res,'res...')
                     if (res.length > 0) {
                         this.bg = '#f9f9f9'
                     } else {
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index bfabfe5..be84427 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -34,7 +34,7 @@
         </view>
 
         <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" maxlength="14" /> </view>
+            <view class="slot-content"> <u--input placeholder="群名称" border="surround" focus v-model="groupName" maxlength="12" /> </view>
         </u-modal>
 
         <u-modal :show="qrCodeShow" :title="group.name" @confirm="qrCodeShow = false">
diff --git a/static/.DS_Store b/static/.DS_Store
index d013e42d7c69946f578ea79932051e50aea553fb..c67e41f6d2de71edb512258dfb78cd7c7906da2d 100644
GIT binary patch
delta 172
zcmZn(Xi1P~U|?W$DortDV9)?EIe-{M3-ADifgFX2@&=5~8v}OpGpcOn5je;)S)H+k
z!_>?~N5RzCa+0*{<O_@{oGc8b48;to3`Lv0q{A4Qf)7kyBvZb5wrBy<W&x(}tP>lI
zHgij?WuN>|)JFzrI4ckXfd)5_a7D6<dov@`d*;dfD!wd?K&MPjQJJ;*m&`sUkUjv$
CV<n>i

delta 127
zcmZokXbF&KU|?W$DortDU{C-uIe-{M3vdI4fgFj6@&=4f8v}OpGb(T95je;)*<0<*
z<^u5|rp??6YuP9FOZrQ)0@VY70#FNsE0R|3&5TU%nJ4q>_;N5oOxBp3pfhXpKb2if
HK#e{Cl}Q+k

diff --git a/static/user/cover-s.png b/static/user/cover-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0853486725288f1973ce6b4a489c25c7fc6ef9e
GIT binary patch
literal 3850
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
H@a}&D!2&ek

literal 0
HcmV?d00001


From 2ce4bb827f4d6fa5121e7f1101b920298593720b Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 23 Feb 2022 16:35:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=85=8D=E6=89=93?=
 =?UTF-8?q?=E6=89=B0=E6=B6=88=E6=81=AF=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/friends/info.vue | 2 +-
 pages/im/group/index.vue  | 2 +-
 pages/im/group/info.vue   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 328d6d2..671796b 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -30,7 +30,7 @@
                     <u-icon name="arrow-right" color="#eee" size="16" />
                 </view>
                 <view class="item u-border-bottom">
-                    <label>聊天免打扰</label>
+                    <label>消息免打扰</label>
                     <u-switch size="22" v-model="status" activeColor="#34CE98" @change="setStatus"></u-switch>
                 </view>
                 <view class="item">
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index 6ff481d..14eb4f5 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -3,7 +3,7 @@
         <block v-if="groups.length > 0">
             <view class="title"> 群聊 </view>
             <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
-                <u-avatar size="38" shape="square" :src="item.portraitUrl !== ''?contact(item.targetId).portraitUrl :require('@/static/user/cover-s.png')" />
+                <u-avatar size="36" shape="square" :src="item.portraitUrl !== ''?contact(item.targetId).portraitUrl :require('@/static/user/cover-s.png')" />
                 <view class="info">
                     <view class="name">{{item.name}}  <span class="total">共{{item.people_count}} 成员</span></view>
                 </view>
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index be84427..8b73708 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -13,7 +13,7 @@
             <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 class="u-border-bottom" :border="false" title="免打扰">
+            <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>

From 768edb8e873d8c43d29160337640b7c931aaca75 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 16:38:14 +0800
Subject: [PATCH 5/6] format

---
 pages/im/group/chat.vue     | 4 +++-
 pages/im/group/reviewed.vue | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index b75f21a..525563f 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -52,10 +52,12 @@
                     }
                 }
             }
+        },
+        onShow() {
+            this.initGroupInfo()
         },
         onLoad(e) {
             this.targetId = e.targetId
-            this.initGroupInfo()
             // 获取历史消息列表
             this.getMessageList()
             // 监听新消息
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index 8f09af0..f861dce 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -22,7 +22,7 @@
         <view class="no-lists" v-else>
             <u-image class="cover" radius="4" width="400rpx" height="400rpx"
                 :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
-            <span> 暂无群聊申请数据~</span>
+            <span>暂无群聊申请数据</span>
         </view>
     </view>
 </template>
@@ -82,7 +82,6 @@
                             uni.$emit('groupInvitedUser')
                         }
                     })
-
                 }).catch(err => {
                     // uni.showToast({
                     //     title: err.message,

From 8a8e55600f405042bc448aca5f02ff4dfefe089a Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 16:49:15 +0800
Subject: [PATCH 6/6] =?UTF-8?q?uview=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=8Cse?=
 =?UTF-8?q?arch=E9=AB=98=E5=BA=A6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/friends/pending.vue |  2 +-
 pages/im/friends/search.vue  | 22 ++++++++++++----------
 pages/im/group/index.vue     |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index 57480ff..cb1802d 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -2,7 +2,7 @@
     <view class="pending">
         <u-sticky>
             <view class="header-search" @click="$Router.push({ name: 'SearchFriend' })">
-                <u-search placeholder="输入手机号码搜索" height="74" searchIcon="search" inputAlign="center" bgColor="white"
+                <u-search placeholder="输入手机号码搜索" searchIcon="search" inputAlign="center" bgColor="white"
                     :disabled="true" :show-action="false" />
             </view>
         </u-sticky>
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index 1c08750..0125804 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -11,14 +11,16 @@
         <!-- 搜索 、   -->
         <u-sticky>
             <view class="header-search">
-                <u-search placeholder="输入用户账号、手机号" height="74" searchIcon="search" @custom="search" v-model="searchValue" @search="search" bgColor="#f9f9f9" :focus="focused" />
+                <u-search placeholder="输入用户账号、手机号" searchIcon="search" @custom="search" v-model="searchValue"
+                    @search="search" bgColor="#f9f9f9" :focus="focused" />
             </view>
         </u-sticky>
         <block v-if="searchResult.length > 0">
             <applyFriend :lists="searchResult" :isApply="true" @action="action" />
         </block>
         <view class="no-lists" v-else>
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+                :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
             <span>暂无匹配内容~</span>
         </view>
     </view>
@@ -43,11 +45,11 @@
         },
         methods: {
             search() {
-                 // friendship: ''    没有好友关系
-                 // accepted    好友
-                 // pending  申请中
-                 // denied 拒绝 
-                 // blocked 黑名单
+                // friendship: ''    没有好友关系
+                // accepted    好友
+                // pending  申请中
+                // denied 拒绝 
+                // blocked 黑名单
                 searchFriend(this.searchValue)
                     .then(res => {
                         this.searchResult = res;
@@ -60,9 +62,9 @@
                         });
                     });
             },
-            action(e) {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + e.item.targetId
+            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 14eb4f5..5b0c47c 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -5,10 +5,10 @@
             <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
                 <u-avatar size="36" shape="square" :src="item.portraitUrl !== ''?contact(item.targetId).portraitUrl :require('@/static/user/cover-s.png')" />
                 <view class="info">
-                    <view class="name">{{item.name}}  <span class="total">共{{item.people_count}} 成员</span></view>
+                    <view class="name">{{ item.name }}  <span class="total">共{{ item.members }} 成员</span></view>
                 </view>
             </view>
-            <view class="group-count"> {{groups.length}}个群聊 </view>
+            <view class="group-count"> {{ groups.length }}个群聊 </view>
         </block>
         <view class="no-lists" v-else>
             <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />