From 9620278813e78470e5594031303b79ddff4042c9 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 16 Feb 2022 18:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=9C=89=E6=90=9C=E7=B4=A2=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/friendApplyCell.vue  |   2 +-
 pages/im/components/friendSearchList.vue | 138 +++++++++++++++++++++++
 pages/im/components/messageCell.vue      |  10 +-
 pages/im/friends/index.vue               |  15 ++-
 pages/im/friends/info.vue                |  37 +++---
 pages/im/friends/search.vue              |  13 ++-
 6 files changed, 188 insertions(+), 27 deletions(-)
 create mode 100644 pages/im/components/friendSearchList.vue

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index 94f3263..e9ed0a2 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="apply--cell u-border-bottom">
         <view class="avatar">
-            <u-avatar :src="user.portraitUrl" shape="square" size="46" />
+            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
         </view>
         <view class="info">
             <view class="name">
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
new file mode 100644
index 0000000..76ae0d6
--- /dev/null
+++ b/pages/im/components/friendSearchList.vue
@@ -0,0 +1,138 @@
+<template>
+    <view class="friend-apply">
+        <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
+            <view class="lists">
+                <view class="" style="width: 100rpx;height: 100rpx;">
+                    <u-avatar :src="item.portraitUrl || require('@/static/user/cover.png')" shape="square" size="44" />
+                </view>
+                <view class="right">
+                    <view class="title">
+                        <view class="name">{{ item.name }}</view>
+                        <view class="des">{{ item.address }}</view>
+                    </view>
+                    <view class="agress-btn">
+                        <span v-if="isApply && item.friendship !=='accepted'" @click="action('apply', item)">查看</span>
+                        <span class="isFri" v-if="isApply && item.friendship ==='accepted'" @click="action('isFriend', item)">已是好友</span>
+                    </view>
+                </view>
+            </view>
+        </block>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'friend-apply-reject-agree',
+        props: {
+            lists: {
+                type: Array,
+                default: []
+            },
+            isAgree: {
+                type: Boolean,
+                default: false
+            },
+            isReject: {
+                type: Boolean,
+                default: false
+            },
+            isApply: {
+                type: Boolean,
+                default: false
+            }
+        },
+        created() {
+            console.log(this.lists);
+        },
+        methods: {
+            action(type, item) {
+                if (type === 'isFriend') {
+                    // ，后期可以跳转到信息介绍页面，先留在这里
+                    return uni.showToast({
+                        title: '已是好友，无需重复添加',
+                        icon: 'none',
+                        duration: 2000
+                    });
+                }
+                this.$emit('action', {
+                    type,
+                    item
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+    .lists {
+        padding: 0 $padding;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        box-sizing: border-box;
+        font-size: $title-size;
+        color: $text-gray;
+
+        .cover {
+            background-color: #ffffff;
+        }
+
+        .right {
+            width: 570rpx;
+            margin-left: $margin - 10;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            padding: $padding 0;
+            border-bottom: solid 1rpx #f9f9f9;
+
+            .title {
+                width: 370rpx;
+
+                .name {
+                    width: 100%;
+                    color: $text-color;
+                    font-size: $title-size + 2;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+
+                .des {
+                    width: 100%;
+                    flex: 1;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    font-size: $title-size-m;
+                    margin-top: $margin - 10;
+                    color: $text-gray-m;
+                }
+            }
+
+            .agress-btn {
+                display: flex;
+                color: #fff;
+
+                span {
+                    display: inline-block;
+                    padding: 6rpx 14rpx;
+                    background-color: $text-price;
+                    border-radius: 10rpx;
+                }
+
+                span:nth-child(1) {
+                    background-color: $main-color;
+                    margin-right: 10rpx;
+                }
+
+                .isFri {
+                    background-color: #f9f9f9 !important;
+                    color: #666;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 6080df1..f5a373c 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,12 +6,10 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
-                        class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
-                :user="item.latestMessage.userInfo" />
+            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -19,6 +17,10 @@
 <script>
     import messagePreview from './messagePreview'
 
+
+
+
+
     export default {
         props: {
             item: {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 10e3e9f..8d70cb2 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -12,15 +12,14 @@
             </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="#F3F6FB" height="20" size="12" color="#666">
-                    </u-index-anchor>
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#F9F9F9" height="20" size="12" color="#666" />
 
                     <view v-for="(friendItem, index) in item" :key="index" class="friend-flex u-border-bottom"
                         @click="toFriend(friendItem.targetId)">
-                        <u-avatar size="40" shape="square" :src="contact(friendItem.targetId).portraitUrl" />
+                        <u-avatar class="avatar-img" size="40" shape="square" :src="contact(friendItem.targetId).portraitUrl" />
                         <view class="info">
                             <view class="name">{{ contact(friendItem.targetId).name }}</view>
-                            <view class="address">{{ friendItem.address }}</view>
+                            <view class="address">hash:{{ friendItem.address }}</view>
                         </view>
                     </view>
                 </u-index-item>
@@ -119,10 +118,13 @@
     // 好友列表
     .friend-flex {
         position: relative;
-        padding: 20rpx $padding;
+        padding: 24rpx $padding;
         display: flex;
         flex-direction: row;
         align-items: center;
+        .avatar-img{
+            box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
+        }
 
         .info {
             flex: 1;
@@ -137,7 +139,8 @@
 
             .address {
                 color: $text-gray-m;
-                font-size: $title-size-m - 5;
+                font-size: $title-size-m - 3;
+                padding-top: 10rpx;
             }
         }
     }
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 778a51f..35a3766 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -6,7 +6,7 @@
                 bg-color="#fff"></u-avatar>
             <view class="info-text">
                 <view class="nickname">{{ userInfo.name }}</view>
-                <view class="address" @longpress="copyAddress">地址：{{ userInfo.address }}</view>
+                <view class="address" @longpress="copyAddress">Hash：{{ userInfo.address }}</view>
             </view>
         </view>
         <!-- 用户资料 -->
@@ -19,7 +19,7 @@
             </view>
         </view>
 
-        <block v-if="userInfo.is_friend">
+        <block v-if="userInfo.friendship ==='accepted'">
             <view class="info-btns">
                 <view class="item u-border-bottom" @click="setRemark">
                     <label>设置备注</label>
@@ -83,7 +83,11 @@
     } from '@/apis/interfaces/im.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
-
+    // friendship: ''    没有好友关系
+    // accepted    好友
+    // pending  申请中
+    // denied 拒绝 
+    // blocked 黑名单
     export default {
         data() {
             return {
@@ -105,9 +109,10 @@
                 callShow: false
             }
         },
-        onLoad(e) {
+        onLoad(e) {
             this.targetId = e.targetId
             getFriendInfo(e.targetId).then(res => {
+                console.log(res, "获取朋友的信息")
                 this.userInfo = res
                 // 获取到用户信息之后，去检查一下要不要更新
                 this.$store.dispatch('updateContact', res)
@@ -158,7 +163,7 @@
                     content: '确认删除后不可恢复',
                     success: e => {
                         if (e.confirm) {
-                            deleteFriend(this.targetId).then(res => {
+                            deleteFriend(this.targetId).then(res => {
                                 uni.$emit('onContactNotification')
                                 // 删除聊天记录
                                 RongIMLib.deleteMessages(1, this.targetId);
@@ -198,17 +203,23 @@
             toBeFriend() {
                 pedingFriend(this.targetId).then(res => {
                         uni.showToast({
-                            title: '申请成功',
-                            icon: 'none'
+                            title: `  申请成功,等待审核  `,
+                            icon: 'none',
+                            duration: 3000,
+                            mask: true
                         });
-
                     })
                     .catch(err => {
-                        uni.showToast({
-                            icon: 'error',
-                            title: err.message,
-                            duration: 2000
-                        })
+                        // if(err.status_code === 6001){
+                        //     this.userInfo.friendship = 'accepted'
+                        // }else{
+                            uni.showToast({
+                                icon: 'error',
+                                title: err.message,
+                                duration: 2000,
+                                mask: true
+                            })
+                        // }
                     })
             },
             singleCall(e) {
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index a0d26f8..cab97c8 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -31,7 +31,7 @@
         searchFriend,
         pedingFriend
     } from '@/apis/interfaces/im.js';
-    import applyFriend from '../components/friendApplyList.vue';
+    import applyFriend from '../components/friendSearchList.vue';
     export default {
         components: {
             applyFriend
@@ -45,9 +45,15 @@
         },
         methods: {
             search() {
+                 // friendship: ''    没有好友关系
+                 // accepted    好友
+                 // pending  申请中
+                 // denied 拒绝 
+                 // blocked 黑名单
                 searchFriend(this.searchValue)
                     .then(res => {
                         this.searchResult = res;
+                        console.log(res)
                     })
                     .catch(err => {
                         uni.showToast({
@@ -56,9 +62,10 @@
                         });
                     });
             },
-            action(e) {
+            action(e) {
+                
                 uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + e.item.userId
+                    url: '/pages/im/friends/info?targetId=' + e.item.targetId
                 })
             }
         }