diff --git a/pages.json b/pages.json
index a1838ed..8e0bfba 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,5 @@
 {
-    "pages": [
-        {
+    "pages": [{
             "path": "pages/index/index",
             "name": "Index",
             "style": {
@@ -140,15 +139,15 @@
                 "navigationBarTextStyle": "white"
             }
         },
-				{
-				    "path": "pages/setting/setting",
-				    "name": "Setting",
-				    "style": {
-				        "navigationBarTitleText": "设置中心",
-				        "navigationBarBackgroundColor": "#34CE98",
-				        "navigationBarTextStyle": "white"
-				    }
-				},
+        {
+            "path": "pages/setting/setting",
+            "name": "Setting",
+            "style": {
+                "navigationBarTitleText": "设置中心",
+                "navigationBarBackgroundColor": "#34CE98",
+                "navigationBarTextStyle": "white"
+            }
+        },
         {
             "path": "pages/store/index",
             "name": "Store",
@@ -158,15 +157,13 @@
                 "app-plus": {
                     "titleNView": {
                         "backgroundColor": "#FFFFFF",
-                        "buttons": [
-                            {
-                                "float": "right",
-                                "text": "\ue603",
-                                "fontSrc": "/static/iconfont.ttf",
-                                "color": "#000",
-                                "fontSize": "20px"
-                            }
-                        ]
+                        "buttons": [{
+                            "float": "right",
+                            "text": "\ue603",
+                            "fontSrc": "/static/iconfont.ttf",
+                            "color": "#000",
+                            "fontSize": "20px"
+                        }]
                     }
                 }
             }
@@ -372,8 +369,8 @@
             "path": "pages/im/index",
             "name": "IM",
             "style": {
-                "navigationBarBackgroundColor": "#FFFFFF",
-				"navigationStyle":"custom"
+                "navigationBarBackgroundColor": "#FFFFFF",
+                "navigationStyle": "custom"
             }
         },
         {
@@ -386,14 +383,12 @@
                 "app-plus": {
                     "titleNView": {
                         "type": "default",
-                        "buttons": [
-                            {
-                                "float": "right",
-                                "fontSrc": "/static/iconfont.ttf",
-                                "text": "\ue607",
-                                "fontSize": "20px"
-                            }
-                        ]
+                        "buttons": [{
+                            "float": "right",
+                            "fontSrc": "/static/iconfont.ttf",
+                            "text": "\ue607",
+                            "fontSize": "20px"
+                        }]
                     }
                 }
             }
@@ -409,28 +404,26 @@
             "path": "pages/im/friends/index",
             "name": "imFriends",
             "style": {
-                "navigationBarTitleText": "我的好友",
-				"app-plus": {
-				    "titleNView": {
-				        "type": "default",
-				        "buttons": [
-				            {
-				                "float": "right",
-				                "fontSrc": "/static/iconfont.ttf",
-				                "text": "\ue603",
-				                "fontSize": "20px"
-				            }
-				        ]
-				    }
-				}
+                "navigationBarTitleText": "我的好友",
+                "app-plus": {
+                    "titleNView": {
+                        "type": "default",
+                        "buttons": [{
+                            "float": "right",
+                            "fontSrc": "/static/iconfont.ttf",
+                            "text": "\ue603",
+                            "fontSize": "20px"
+                        }]
+                    }
+                }
             }
         },
         {
             "path": "pages/im/friends/pending",
             "name": "imFriendsPending",
             "style": {
-                "navigationBarTitleText": "新朋友",
-				"navigationBarBackgroundColor":"#F3F6FB"
+                "navigationBarTitleText": "新朋友",
+                "navigationBarBackgroundColor": "#F3F6FB"
             }
         },
         {
@@ -438,15 +431,15 @@
             "name": "SearchFriend",
             "style": {
                 "navigationBarTitleText": "好友搜索",
-        		"navigationBarBackgroundColor":"#F3F6FB"
+                "navigationBarBackgroundColor": "#F3F6FB"
             }
         },
         {
             "path": "pages/im/friends/info",
             "name": "imFriendsInfo",
             "style": {
-                "navigationBarTitleText": "好友资料",
-				"navigationBarBackgroundColor":"#F3F6FB"
+                "navigationBarTitleText": "好友资料",
+                "navigationBarBackgroundColor": "#FFFFFF"
             }
         },
         {
@@ -509,16 +502,14 @@
                     "titleNView": {
                         "backgroundImage": "linear-gradient(to right, #34ce98, #22aa98)",
                         "type": "transparent",
-                        "buttons": [
-                            {
-                                "float": "right",
-                                "text": "\ue607",
-                                "fontSrc": "/static/iconfont.ttf",
-                                "color": "#FFF",
-                                "fontSize": "20px",
-                                "background": "rgba(0,0,0,0)"
-                            }
-                        ],
+                        "buttons": [{
+                            "float": "right",
+                            "text": "\ue607",
+                            "fontSrc": "/static/iconfont.ttf",
+                            "color": "#FFF",
+                            "fontSize": "20px",
+                            "background": "rgba(0,0,0,0)"
+                        }],
                         "backButton": {
                             "background": "rgba(0,0,0,0)"
                         }
@@ -572,16 +563,15 @@
             "name": "UserFiles",
             "style": {
                 "navigationBarTitleText": "健康档案管理",
-								"navigationBarBackgroundColor": "#34CE98",
-								"navigationBarTextStyle": "white"
+                "navigationBarBackgroundColor": "#34CE98",
+                "navigationBarTextStyle": "white"
             }
         }
     ],
     "tabBar": {
         "borderStyle": "white",
         "selectedColor": "#34CE98",
-        "list": [
-            {
+        "list": [{
                 "iconPath": "static/tabBar/tabBar_00.png",
                 "selectedIconPath": "static/tabBar/tabBar_show_00.png",
                 "pagePath": "pages/index/index",
@@ -623,4 +613,4 @@
     "easycom": {
         "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
     }
-}
\ No newline at end of file
+}
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 069dac8..c63127a 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -4,135 +4,206 @@
         <view class="user-info">
             <u-avatar :src="userInfo.portraitUrl" size="100" />
 
-            <view class="nickname">{{ userInfo.name }}</view>
-            <!-- <view class="sex">
-                <u-tag text="男" color="#fff" borderColor="#5db6ee" size="mini" icon="man" bgColor="#5db6ee"></u-tag>
-                <u-tag text="女" color="#fff" borderColor="#e4867a" size="mini" icon="woman" bgColor="#e4867a"></u-tag>
-            </view> -->
+            <view class="nickname">{{ userInfo.username }}</view>
+            <view class="gender">
+                <u-tag text="保密" v-if="userInfo.gender === 0" color="#fff" borderColor="#999" size="mini"
+                    bgColor="#999"></u-tag>
+                <u-tag text="男" v-if="userInfo.gender === 1" color="#fff" borderColor="#5db6ee" size="mini" icon="man"
+                    bgColor="#5db6ee"></u-tag>
+                <u-tag text="女" v-if="userInfo.gender === 2" color="#fff" borderColor="#e4867a" size="mini" icon="woman"
+                    bgColor="#e4867a"></u-tag>
+            </view>
             <view class="address">{{ userInfo.address }}</view>
-            <!-- 通过/拒绝/已通过/已拒绝 -->
         </view>
-        <!-- <view class="user-lists">
-			<view class="user-lists-item">
-				<label>地区</label>
-				<text>黑龙江 哈尔滨</text>
-			</view>
-		</view> -->
-        <!-- 发送消息 -->
-        <view class="info-footer"><button class="open-btn" @click="toPrivate">发送消息</button></view>
+
+        <view class="actions">
+            <u-cell-group>
+                <u-cell isLink title="设置备注" @click="setRemark"></u-cell>
+                <u-cell isLink title="设置标签" @click="setRemark"></u-cell>
+                <u-cell title="聊天免打扰">
+                    <u-switch slot="value" size="18" v-model="status" activeColor="#34CE98" @change="setStatus">
+                    </u-switch>
+                </u-cell>
+                <u-cell title="聊天置顶">
+                    <u-switch slot="value" size="18" v-model="isTop" activeColor="#34CE98" @change="setTop">
+                    </u-switch>
+                </u-cell>
+                <!--        <u-cell title="加入黑名单">
+                    <u-switch slot="value" size="18" v-model="block" activeColor="#34CE98" @change="setBlock"></u-switch>
+                </u-cell> -->
+                <u-cell isLink titleStyle="color: red" title="删除好友" @click="deleteFriend"></u-cell>
+            </u-cell-group>
+        </view>
+
+        <view class="footer">
+            <u-button @click="toPrivate()">
+                <u-icon name="chat" size="20" /> 发送消息
+            </u-button>
+            <u-button @click="toPrivate()">
+                <u-icon name="mic" size="20" /> 音视频通话
+            </u-button>
+        </view>
     </view>
 </template>
 
 <script>
-import { getUserInfo } from '@/apis/interfaces/im.js';
+    import {
+        getUserInfo
+    } from '@/apis/interfaces/im.js'
+    import * as RongIMLib from '@rongcloud/imlib-uni'
 
-export default {
-    data() {
-        return {
-            targetId: '',
-            userInfo: {}
-        };
-    },
-    mounted() {
-        getUserInfo(this.$Route.query.id).then(res => {
-            this.userInfo = res;
-            uni.setNavigationBarTitle({
-                title: res.name
-            });
-        });
-    },
-    methods: {
-        toPrivate() {
-            uni.redirectTo({
-                url: '/pages/im/private/index?conversationType=1&targetId=' + this.targetId
-            });
+    export default {
+        data() {
+            return {
+                targetId: '',
+                userInfo: {},
+                status: false, // 0 是免打扰，1是正常通知
+                isTop: false,
+                block: false,
+                conversationType: 1
+            };
+        },
+        onLoad(e) {
+            this.targetId = e.targetId
+            getUserInfo(e.targetId).then(res => {
+                console.log(res);
+                this.userInfo = res
+                uni.setNavigationBarTitle({
+                    title: res.name
+                })
+            })
+            RongIMLib.getConversationNotificationStatus(this.conversationType, this.targetId, ({
+                status
+            }) => {
+                this.status = !Boolean(status)
+            })
+            RongIMLib.getConversation(this.conversationType, this.targetId, ({
+                conversation
+            }) => {
+                this.isTop = conversation.isTop
+            })
+        },
+        methods: {
+            toPrivate() {
+                uni.redirectTo({
+                    url: '/pages/im/private/index?conversationType=1&targetId=' + this.targetId
+                })
+            },
+            setRemark() {
+                uni.showToast({
+                    icon: 'none',
+                    title: '开发中'
+                })
+            },
+            deleteFriend() {
+                uni.showModal({
+                    title: '删除确认',
+                    content: '确认删除后不可恢复',
+                    success: (e) => {
+                        if (e.confirm) {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '开发中'
+                            })
+                        }
+                    }
+                })
+            },
+            setStatus() {
+                RongIMLib.setConversationNotificationStatus(this.conversationType, this.targetId, this.status, ({
+                    status
+                }) => {
+                    this.status = !Boolean(status)
+                })
+            },
+            setTop() {
+                RongIMLib.setConversationToTop(this.conversationType, this.targetId, this.isTop, (res) => {
+                    RongIMLib.getConversation(this.conversationType, this.targetId, ({
+                        conversation
+                    }) => {
+                        this.isTop = conversation.isTop
+                    })
+                })
+            },
+            setBlock() {
+
+            }
         }
-    }
-};
+    };
 </script>
 
 <style lang="scss" scoped>
-.content {
-    min-height: 100vh;
-    background: $window-color;
-}
-
-// 用户信息
-.user-info {
-    padding: $padding * 3 $padding;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    background: white;
-
-    .nickname {
-        font-size: 42rpx;
-        padding-top: $padding;
+    .content {
+        min-height: 100vh;
+        background: $window-color;
     }
 
-    .address {
-        line-height: 64rpx;
-        font-size: 26rpx;
-        color: $text-gray;
+    .actions {
+        background: white;
+        margin-top: $padding / 2;
     }
 
-    .sex {
-        padding-top: $padding/2;
-
-        text {
-            font-size: $title-size-sm;
-            background: #303133;
-            padding: 0 10rpx;
-            color: white;
-            border-radius: $radius-m;
-            line-height: 30rpx;
-            display: inline-block;
-        }
-    }
-}
-
-.user-lists {
-    margin-top: $margin;
-    background: white;
-
-    .user-lists-item {
-        padding: 0 $padding;
+    // 用户信息
+    .user-info {
+        padding: $padding 0;
         display: flex;
-        justify-content: space-between;
-        line-height: 90rpx;
-        font-size: $title-size-lg;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        background: white;
 
-        label {
-            color: $text-color;
+        .nickname {
+            font-size: 42rpx;
+            padding-top: $padding;
         }
 
-        text {
+        .address {
+            line-height: 64rpx;
+            font-size: 26rpx;
             color: $text-gray;
         }
-    }
-}
 
-// 发送消息
-.info-footer {
-    padding: $padding;
-    width: 100%;
-    box-sizing: border-box;
+        .gender {
+            padding-top: $padding/2;
 
-    .open-btn {
-        width: 100%;
-        height: 90rpx;
-        line-height: 90rpx;
-        background: $main-color;
-        border-radius: $radius-lg;
-        padding: 0;
-        margin: 0;
-        color: white;
-        font-size: $title-size;
-
-        &::after {
-            display: none;
+            text {
+                font-size: $title-size-sm;
+                background: #303133;
+                padding: 0 10rpx;
+                color: white;
+                border-radius: $radius-m;
+                line-height: 30rpx;
+                display: inline-block;
+            }
+        }
+    }
+
+    .user-lists {
+        margin-top: $margin;
+        background: white;
+
+        .user-lists-item {
+            padding: 0 $padding;
+            display: flex;
+            justify-content: space-between;
+            line-height: 90rpx;
+            font-size: $title-size-lg;
+
+            label {
+                color: $text-color;
+            }
+
+            text {
+                color: $text-gray;
+            }
+        }
+    }
+
+    .footer {
+        padding: $padding / 2;
+
+        .u-button {
+            margin-top: $padding / 2;
         }
     }
-}
 </style>
diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index de0d291..66705c1 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -10,74 +10,94 @@
     <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" :disabled="true" :show-action="false" />
+                <u-search placeholder="输入手机号码搜索" height="74" searchIcon="search" inputAlign="center" bgColor="white"
+                    :disabled="true" :show-action="false" />
             </view>
         </u-sticky>
-        <block v-if="pedings.length > 0"><applyFriend :lists="pedings" :isAgree="true" :isReject="false" @action="action" /></block>
+        <block v-if="pedings.length > 0">
+            <applyFriend :lists="pedings" :isAgree="true" :isReject="false" @action="action" />
+        </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>
     </view>
 </template>
 
 <script>
-import { getPedings, resolveFriend, rejectFriend } from '@/apis/interfaces/im.js';
-import applyFriend from '@/components/friend-apply-reject-agree';
-export default {
-    components: {
-        applyFriend
-    },
-    data() {
-        return {
-            // pedings: [{userId:10990,name:'张三'}]
-            pedings: []
-        };
-    },
-    onLoad() {
-        this.getPeddingList();
-    },
-    methods: {
-        // 操作同意或拒绝
-        action(e) {
-            let url = e.type === 'agree' ? resolveFriend : rejectFriend;
-            uni.showModal({
-                title: e.type === 'agree' ? '通过' : '拒绝',
-                content: e.type === 'agree' ? '通过后即可与该用户畅所欲言' : '拒绝后将不会收到该用户发来信息',
-                success: res => {
-                    if (res.confirm) {
-                        url(e.item.userId).then(res => {
-                            this.getPeddingList();
-                        });
-                    }
-                }
-            });
+    import {
+        getPedings,
+        resolveFriend,
+        rejectFriend
+    } from '@/apis/interfaces/im.js';
+    import * as RongIMLib from '@rongcloud/imlib-uni'
+    import applyFriend from '@/components/friend-apply-reject-agree'
+
+    export default {
+        components: {
+            applyFriend
         },
-        getPeddingList() {
-            getPedings().then(res => {
-                this.pedings = res;
-            });
+        data() {
+            return {
+                pedings: []
+            }
+        },
+        onLoad() {
+            this.getPeddingList()
+        },
+        methods: {
+            // 操作同意或拒绝
+            action(e) {
+                let url = e.type === 'agree' ? resolveFriend : rejectFriend
+                uni.showModal({
+                    title: e.type === 'agree' ? '通过' : '拒绝',
+                    content: e.type === 'agree' ? '通过后即可与该用户畅所欲言' : '拒绝后将不会收到该用户发来信息',
+                    success: res => {
+                        if (res.confirm) {
+                            url(e.item.userId).then(res => {
+                                this.getPeddingList()
+                            })
+                        }
+                    }
+                })
+            },
+            getPeddingList() {
+                // 获取系统中的好友关系会话列表
+                // RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], 50, 0, (res) => {
+                //     if (res.code === 0) {
+                //         this.pedings = res.conversations.filter((item) => {
+                //             return item.objectName == RongIMLib.ObjectName.ContactNotification
+                //         })
+                //     }
+                // })
+                getPedings().then(res => {
+                    console.log(res)
+                    this.pedings = res
+                })
+            }
         }
-    }
-};
+    };
 </script>
 
 <style lang="scss" scoped>
-.header-search {
-    padding: $padding/2 $padding;
-    background: $window-color;
-}
-.no-lists{
-    padding-top: $padding * 3;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-    font-size: $title-size-m;
-    color: $text-gray-m;
-    span{
-        padding-top: $padding ;
+    .header-search {
+        padding: $padding/2 $padding;
+        background: $window-color;
+    }
+
+    .no-lists {
+        padding-top: $padding * 3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m;
+        color: $text-gray-m;
+
+        span {
+            padding-top: $padding;
+        }
     }
-}
 </style>