diff --git a/pages.json b/pages.json
index 9d8aede..a5b52d1 100644
--- a/pages.json
+++ b/pages.json
@@ -373,19 +373,6 @@
         {
             "path": "pages/im/private/chat",
             "style": {
-                "navigationBarBackgroundColor":"#FFFFFF",
-                "disableScroll": false,
-                "app-plus": {
-                    "titleNView": {
-                        "type": "default",
-                        "buttons": [{
-                            "float": "right",
-                            "fontSrc": "/static/iconfont.ttf",
-                            "text": "\ue607",
-                            "fontSize": "20px"
-                        }]
-                    }
-                }
             }
         },
         {
@@ -464,7 +451,7 @@
         {
             "path": "pages/im/group/chat",
             "name": "imGroupChat",
-            "style": {
+            "style": {
                 "navigationBarTitleText": "群聊",
                 "app-plus": {
                     "titleNView": {
diff --git a/pages/im/components/connectionStatus.vue b/pages/im/components/connectionStatus.vue
index 3009e43..f15b684 100644
--- a/pages/im/components/connectionStatus.vue
+++ b/pages/im/components/connectionStatus.vue
@@ -1,67 +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>
+<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/components/conversationList.vue b/pages/im/components/conversationList.vue
index bf3cab8..4858aa6 100644
--- a/pages/im/components/conversationList.vue
+++ b/pages/im/components/conversationList.vue
@@ -1,10 +1,9 @@
 <template>
     <view>
-        <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop }]"
+        <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop, 'is-active': pickedItem.targetId == item.targetId }]"
             :data-item="item" @longpress="onLongPress" @click="toDetail(item)">
             <message-cell :item="item" />
         </view>
-
         <view class="shade" @click="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
                 <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu" :data-index="index">
@@ -131,6 +130,10 @@
 
         &.is-top {
             background: $window-color;
+        }
+        
+        &.is-active {
+            background: #F8FAFF;
         }
     }
 
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 12543e9..4cdfacb 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -61,8 +61,13 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
+<<<<<<< HEAD
                 avatarSize: 45,
                 labelSize: 14,
+=======
+                avatarSize: 84,
+                labelSize: 14,
+>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
                 iconSize: 14
             }
         },
@@ -73,10 +78,17 @@
                 }
             }
         },
+<<<<<<< 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()
@@ -273,8 +285,8 @@
             .avatar {
                 border-radius: 0 8rpx 0 0;
                 position: relative;
-                width: 90rpx;
-                height: 90rpx;
+                width: 84rpx;
+                height: 84rpx;
                 overflow: hidden;
 
                 .admin {
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 23ace13..df717cb 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -2,7 +2,7 @@
     <view class="message--cell">
         <view class="avatar">
             <u-badge max="99" shape="horn" absolute :offset="[-5, -8]" :value="item.unreadMessageCount" />
-            <u-avatar :src="contact(item.targetId).portraitUrl" shape="square" size="44" />
+            <u-avatar :src="contact(item.targetId).portraitUrl" shape="square" :size="avatarSize" />
         </view>
         <view class="content">
             <view class="header">
@@ -18,6 +18,7 @@
 
 <script>
     import messagePreview from './messagePreview'
+    import utils from '@/utils/index.js'
 
     export default {
         props: {
@@ -27,8 +28,16 @@
                     return {}
                 }
             }
-        },
+        },
+        data() {
+            return {
+                avatarRpx: 84
+            }
+        },
         computed: {
+            avatarSize() {
+                return utils.rpx2px(this.avatarRpx)
+            },
             contact() {
                 return function(targetId) {
                     return this.$store.getters.contactInfo(targetId)
@@ -48,6 +57,7 @@
 
         .avatar {
             position: relative;
+            padding-top: 5rpx;
 
             .u-badge {
                 z-index: 998;
@@ -59,10 +69,8 @@
             box-sizing: border-box;
             position: relative;
             flex: 1;
-
-
             border-bottom-width: 0.5px !important;
-            border-color: #f9f9f9 !important;
+            border-color: #eee !important;
             border-bottom-style: solid;
 
             .header {
diff --git a/pages/im/components/messagePreview.vue b/pages/im/components/messagePreview.vue
index c2806ce..b9ffaa5 100644
--- a/pages/im/components/messagePreview.vue
+++ b/pages/im/components/messagePreview.vue
@@ -22,10 +22,10 @@
             <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType=='0'">
+            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType==0">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType=='1'">
+            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType==1">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
             </view>
             <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
diff --git a/pages/im/components/showCall.vue b/pages/im/components/showCall.vue
index 393d541..7f08570 100644
--- a/pages/im/components/showCall.vue
+++ b/pages/im/components/showCall.vue
@@ -1,29 +1,18 @@
 <template>
-    <view class="msg--text">
-        <text class="name" v-if="!guest && name">{{ name }}</text>
-        <view>
-            <text class="im--text" :class="guest ? 'right': 'left'" v-if="message.mediaType == '1'">
-                <u-icon name="camera" /> {{ message.connected ? '通话时长' + message.duration : '未接通' }}
-            </text>
-            <text class="im--text" :class="guest ? 'right': 'left'" v-else>
-                <u-icon name="phone" /> {{ message.connected ? '通话时长' + message.duration : '未接通' }}
-            </text>
+    <view class="msg--call">
+        <view class="name" v-if="!guest && name">{{ name }}</view>
+        <view class="im--text" :class="guest ? 'right': 'left'">
+            <u-icon name="camera" size="22" v-if="message.mediaType == 1"
+                :label="message.connected ? '通话时长：' + duration : '未接通'" />
+            <u-icon name="phone" size="22" v-else :label="message.connected ? '通话时长：' + duration : '未接通'" />
         </view>
     </view>
 </template>
-<!--  msg 
-{
-    "message": "1",
-    "objectName": "RC:InfoNtf",
-    "userInfo": {
-        "userId": "10051",
-        "name": "Jason.电信",
-        "extra": "",
-        "portraitUrl": "http://storage.zh.shangkelian.cn/uploads/2022/02/16/29b13f5301694721ad7acd8b8b67bbd9.jpg"
-    }
-}
- -->
+
 <script>
+    import utils from '@/utils/index.js'
+    import moment from 'moment'
+    
     export default {
         name: 'showText',
         props: {
@@ -45,16 +34,20 @@
         computed: {
             message() {
                 return JSON.parse(this.msg.message)
-            }
-        },
-        mounted() {
-            console.log(this.message);
+            },
+            duration() {
+                if (this.message.duration > 3600) {
+                    return moment.utc(this.message.duration * 1000).format('HH:mm:ss')
+                } else {
+                    return moment.utc(this.message.duration * 1000).format('mm:ss')
+                }
+            }
         }
     }
 </script>
 
 <style scoped lang="scss">
-    .msg--text {
+    .msg--call {
         .name {
             font-size: 26rpx;
             color: $text-gray-m;
@@ -67,8 +60,8 @@
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;
-            display: inline-block;
-            word-break: break-all;
+            display: flex;
+            flex-direction: row;
 
             &.left {
                 border-radius: 0 20rpx 20rpx 20rpx;
@@ -79,6 +72,10 @@
                 border-radius: 20rpx 0 20rpx 20rpx;
                 background: $main-color;
                 color: white;
+
+                .u-icon {
+                    color: white;
+                }
             }
         }
     }
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index f6d5cd5..cb8f982 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -7,7 +7,7 @@
                 <view class="cell" v-for="(item, index) in messages" :key="index">
                     <view class="time" 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"
+                        <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'" :guest="item.messageDirection == 1"
@@ -37,6 +37,7 @@
     import showImage from '../components/showImage'
     import showText from '../components/showText'
     import sentMessageBar from '../components/sentMessageBar'
+    import utils from '@/utils/index.js'
 
     export default {
         components: {
@@ -47,6 +48,7 @@
         },
         data() {
             return {
+                avatarRpx: 84,
                 targetId: '',
                 conversationType: RongIMLib.ConversationType.GROUP,
                 messages: [],
@@ -56,6 +58,9 @@
             }
         },
         computed: {
+            avatarSize() {
+                return utils.rpx2px(this.avatarRpx)
+            },
             latestMessage() {
                 if (this.messages.length) {
                     return this.messages[0]
@@ -74,8 +79,8 @@
         onLoad(e) {
             this.targetId = e.targetId
             // 获取群成员数量
-            getGroupBase(this.targetId).then(res => {
-                console.log(res);
+            getGroupBase(this.targetId).then(res => {
+                console.log(res);
                 uni.setNavigationBarTitle({
                     title: res.name + `(${res.members})`
                 })
@@ -174,6 +179,7 @@
 
                 .cell {
                     padding: 10rpx 30rpx;
+
                     .time {
                         text-align: center;
                         font-size: 24rpx;
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 2d798eb..0e15481 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="invite">
-        <view class="search">
-            <u--input class="search-input" placeholder="搜索" border="none" prefixIcon="search" v-model="searchTxt"
+        <view class="search u-border-bottom">
+            <u--input class="search-input" placeholder="搜索好友" border="none" prefixIcon="search" v-model="searchTxt"
                 disabledColor="#Fff" prefixIconStyle="font-size: 22px;color: #909399" @change="onSearch" />
         </view>
         <block v-if="friends.length > 0">
@@ -73,19 +73,18 @@
         },
         methods: {
             onSearch() {
-                if (this.searchTxt) {
-					console.log(this.searchTxt)
+                if (this.searchTxt) {
                     this.friends = this.orignalFriends.map((list, index) => {
-                        const resList = list.filter(item => item.name.indexOf(this.searchTxt) > 0)
-                        if (resList.length > 0) {
-                            this.indexs = this.orignalIndexs.map((t, i) => {})
-                        } else {
-                            return;
-                        }
+                        const resList = list.filter(item => {
+                            return item.name.indexOf(this.searchTxt) >= 0
+                        })
                         return resList
                     })
-                    this.friends = this.friends.filter(n => n)
-
+                    this.indexs = this.orignalIndexs.map((t, i) => {
+                        if (this.friends[i].length > 0) {
+                            return t
+                        }
+                    })
                 } else {
                     this.friends = this.orignalFriends
                     this.indexs = this.orignalIndexs
@@ -124,7 +123,6 @@
             },
             onInvite() {
                 inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
-                    console.log(res, 'res')
                     uni.navigateBack({
                         delta: 1,
                         animationType: 'pop-out',
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index 995fd9f..f3f0b3b 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -138,6 +138,7 @@
         }
 
     }
+<<<<<<< HEAD
 
     .no-lists {
         padding-top: $padding * 5;
@@ -153,4 +154,6 @@
             padding-top: $padding;
         }
     }
+=======
+>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
 </style>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index bf25ff0..3d6e68b 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -19,7 +19,7 @@
             </view>
         </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>
@@ -76,13 +76,7 @@
         onHide() {
             uni.$off('onReceiveMessage')
         },
-        methods: {
-            onDemo(){
-                console.log('1111')
-                uni.navigateTo({
-                    url: '/pages/im/chatDemo'
-                })
-            },
+        methods: {
             checkNewFriendPending() {
                 im.getPendingList((pendings) => {
                     this.hasNewFriends = pendings.length
diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index 2a564a9..85b5eba 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -75,18 +75,19 @@
                 // 关闭扬声器
                 volumeOff: false,
                 // 通话时长
-                duration: 0
+                duration: 0,
+                interval: null
             }
         },
         onLoad(e) {
             this.avatarSize = utils.rpx2px(200)
             this.targetId = e.targetId
             this.mediaType = e.mediaType
-            this.isCall = Boolean(e.isCall)
+            this.isCall = Boolean(e.isCall)
             // 进入页面开启外呼
             if (this.isCall) {
                 CallLib.startSingleCall(this.targetId, this.mediaType, '');
-                if (this.mediaType == '1') {
+                if (this.mediaType == 1) {
                     const session = CallLib.getCurrentCallSession()
                     setTimeout(() => {
                         CallLib.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false)
@@ -107,7 +108,6 @@
             this.bigVideoStyle = {
                 width: this.windowWidth + 'px',
                 height: this.windowHeight + 'px',
-                // backgroundImage: `url("${this.contact(this.targetId).portraitUrl}")`
             }
             this.movableAreaStyle = {
                 width: this.windowWidth + 'px',
@@ -131,8 +131,8 @@
             }
         },
         methods: {
-            afterHangup() {
-                const conversationType = IMLib.ConversationType.PRIVATE // 会话类型
+            afterHangup() {
+                clearInterval(this.interval)
                 const targetId = this.targetId
                 const sentStatus = 30
                 const messageContent = {
@@ -144,19 +144,12 @@
                         duration: this.duration
                     })
                 }
-                const sentTime = 0 // 消息的发送时间
-                IMLib.insertOutgoingMessage(conversationType, targetId, sentStatus, messageContent, sentTime,
-                    ({
-                        code,
-                        message
-                    }) => {
-                        console.log(code);
-                        // 插入消息成功
-                        if (code === 0) {
-                            console.log(message)
-                        }
-                    }
-                )
+                const sentTime = 0
+                if (this.isCall) {
+                    IMLib.insertOutgoingMessage(1, targetId, sentStatus, messageContent, sentTime)
+                } else {
+                    IMLib.insertIncomingMessage(1, targetId, targetId, sentStatus, messageContent, sentTime)
+                }
                 uni.$emit('onReceiveMessage', {
                     targetId: this.targetId
                 })
@@ -180,34 +173,37 @@
                 // 设置链接状态
                 this.connected = true
                 // 视频通话，才开摄像头
-                if (this.mediaType == '1') {
+                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)
                     }, 200)
-                }
+                }
+                this.interval = setInterval(() => {
+                    this.duration++
+                }, 1000)
             },
             // 切换主屏显示人
             changeMine() {
-                if (this.isCall) {
-                    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)
-                    }, 200)
-                } else {
-                    const session = CallLib.getCurrentCallSession()
-                    setTimeout(() => {
-                        CallLib.setVideoView(session.targetId, this.$refs.smallVideoView.ref, 0, true)
-                        CallLib.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false)
-                    }, 200)
-                }
-                this.isCall = !this.isCall
+                // if (this.isCall) {
+                //     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)
+                //     }, 200)
+                // } else {
+                //     const session = CallLib.getCurrentCallSession()
+                //     setTimeout(() => {
+                //         CallLib.setVideoView(session.targetId, this.$refs.smallVideoView.ref, 0, true)
+                //         CallLib.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false)
+                //     }, 200)
+                // }
+                // this.isCall = !this.isCall
             },
             hangup() {
-                this.afterHangup()
                 CallLib.hangup()
+                this.afterHangup()
                 this.stopRing()
 
                 setTimeout(() => {
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index 66118e3..d9c6bef 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -7,7 +7,7 @@
                 <view class="cell" v-for="(item, index) in messages" :key="index">
                     <view class="time">{{ item.sentTime|timeCustomCN }}</view>
                     <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                        <u-avatar class="avatar" size="40" shape="square"
+                        <u-avatar class="avatar" :size="avatarSize" shape="square"
                             @click="showUser(item.senderUserId, item.messageDirection)"
                             :src="contact(item.senderUserId).portraitUrl" />
                         <view class="msg">
@@ -37,7 +37,9 @@
     import showImage from '../components/showImage'
     import showText from '../components/showText'
     import showCall from '../components/showCall'
-    import sentMessageBar from '../components/sentMessageBar'
+    import sentMessageBar from '../components/sentMessageBar'
+    import utils from '@/utils/index.js'
+    
     export default {
         components: {
             sentMessageBar,
@@ -47,7 +49,8 @@
             showCall
         },
         data() {
-            return {
+            return {
+                avatarRpx: 84,
                 targetId: '',
                 messages: [],
                 conversationType: 1,
@@ -58,7 +61,10 @@
                 }
             }
         },
-        computed: {
+        computed: {
+            avatarSize() {
+                return utils.rpx2px(this.avatarRpx)
+            },
             latestMessage() {
                 if (this.messages.length) {
                     return this.messages[0]
@@ -95,7 +101,7 @@
                 }
             })
             // 监听收到新消息，判断是否是当前会话，更新会话内容
-            uni.$on('onReceiveMessage', (msg) => {
+            uni.$on('onReceiveMessage', (msg) => {
                 if (msg.targetId == this.targetId) {
                     this.getNewMessage()
                 }
@@ -179,7 +185,8 @@
                     .time {
                         text-align: center;
                         font-size: 24rpx;
-                        color: #666;
+                        color: #666;
+                        margin-bottom: 10rpx;
                     }
 
                     .cell-item {