From a12d8a2c4019b069ec6a9e16fe0a8fe5c04d09e1 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 23 Feb 2022 15:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=A0=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8=E6=97=A0=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=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/friends/index.vue              |  64 ++++++++++++------------
 pages/im/friends/info.vue               |   2 +-
 pages/im/friends/pending.vue            |   3 +-
 static/.DS_Store                        | Bin 10244 -> 10244 bytes
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index 74ecf13..b37fd4b 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -35,7 +35,7 @@
         },
         methods: {
             resolve() {
-                resolveFriend(this.message.sourceUserId).then(res => {
+                resolveFriend(this.message.sourceUserId).then(res => {
                     this.clearMessages()
                     uni.showToast({
                         icon: 'none',
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index ec32d5a..87a6ef0 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -2,40 +2,33 @@
     <view>
         <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
             <view class="friend-flex" @click="toPending">
-                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')"></u-avatar>
+                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')" />
                 <u-badge max="99" absolute :offset="[23, 20]" :value="pendingCount" />
                 <view class="info">新的朋友</view>
             </view>
             <view class="friend-flex" @click="toGroup">
-                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')"></u-avatar>
+                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')" />
                 <view class="info">我的群聊</view>
             </view>
-            <block v-if="friends.length > 0">
+            <block v-if="friends.length > 0">   
                 <u-index-item v-for="(item, fkey) in friends" :key="fkey">
-                    <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"
-                            :src="contact(friendItem.targetId).portraitUrl" />
-                        <view class="info">
-                            <view class="name">{{ contact(friendItem.targetId).name }}</view>
-                            <!-- <view class="address">地址:{{ friendItem.address }}</view> -->
-                        </view>
+                    <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" :src="contact(friendItem.targetId).portraitUrl" />
+                        <view class="info"> <view class="name">{{ contact(friendItem.targetId).name }}</view> </view>
                     </view>
                 </u-index-item>
             </block>
-            <block v-else>
-                <u-empty class="pages-null" mode="data" text="暂无好友" />
-            </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" />
+                <span>暂无好友列表~</span>
+            </view>
         </u-index-list>
     </view>
 </template>
 
 <script>
-    import {
-        getFriendsLetter
-    } from '@/apis/interfaces/im';
+    import {getFriendsLetter} from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
 
@@ -54,16 +47,20 @@
                 }
             }
         },
-        onLoad() {
+        onShow() {
             this.getFriendList()
             this.checkNewFriendPending()
             uni.$on('onContactNotification', this.checkNewFriendPending)
+        },
+        onUnload() {
+            uni.$off("onContactNotification")
         },
         methods: {
             getFriendList() {
-                getFriendsLetter().then(res => {
+                getFriendsLetter().then(res => {
+                    console.log(res)
                     this.indexs = res.indexList
-                    this.friends = res.itemArr
+                    this.friends = res.itemArr
                 })
             },
             checkNewFriendPending() {
@@ -86,18 +83,9 @@
             },
             // 新朋友
             toPending() {
-                // if (this.pendingCount > 0) {
                 uni.navigateTo({
                     url: '/pages/im/friends/pending'
                 });
-                // } else {
-                //     uni.showToast({
-                //         title: ` 暂无好友申请 ~ `,
-                //         icon: "none",
-                //         mask: true,
-                //         duration: 3000
-                //     })
-                // }
             }
         },
         onNavigationBarButtonTap(e) {
@@ -171,5 +159,19 @@
         font-size: 14px;
         line-height: 24px;
         background-color: #fff;
+    }
+    .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>
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index d1bec3d..19f0201 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -209,7 +209,7 @@
                     })
                     return
                 }
-                pedingFriend(this.targetId, 'message').then(res => {
+                pedingFriend(this.targetId, '').then(res => {
                         uni.showToast({
                             title: `  申请成功,等待审核  `,
                             icon: 'none',
diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue
index eec097d..75fc6c2 100644
--- a/pages/im/friends/pending.vue
+++ b/pages/im/friends/pending.vue
@@ -33,13 +33,14 @@
                 bg: '#fff'
             }
         },
-        onLoad() {
+        onShow() {
             this.getPendingList()
             uni.$on('onContactNotification', this.getPendingList)
         },
         methods: {
             getPendingList() {
                 im.getPendingList((pendings) => {
+                    console.log(pendings,'res......')
                     if (pendings.length > 0) {
                         this.bg = '#f9f9f9'
                     } else {
diff --git a/static/.DS_Store b/static/.DS_Store
index a81ade7433a38163cee5ca2c259b24132f6990d5..d013e42d7c69946f578ea79932051e50aea553fb 100644
GIT binary patch
delta 426
zcmZn(XbG4g&dJTdz{tVCAi+IRL0y)a0muVlCm;s01sE988H$t2iwlx+@{=YOE}m?l
z!XgV&zyijZ47tb(fMO>nUl4ELmZ+{aG&j^yFfuipBrMA~bMglPdB$0jKMKfgZ1};t
znVo}$gI5{ZgvnmQdK{u+;u4~gLei5PgvEv81^A0I^2<Gw^Ya3VQp++^%O@`o4v>vb
zFUm~uPfIIKEr|pvNiNFI$qC3W&Me8y&zsCE;#(h)3DgptS(OS_8eEW=oSB!dZ2tjh
z9T0FTJ7_>y0t_G*fPu0@&I2%mLx3?PFF!98s44&^<qcsla4={yI5Gq?#4r>xG%!qO
zSj@1V;UL2~hQ|zF8U8c!GKw)OF={jF2r!y5nlm~udNO)3`Y;AE22K7XqPcm#gc2L0
y+-4qu_3V=i<$NSrA%-dd1E0Ya7|!rW*jV_Uc{0C><zyd~?VJCL>|p{b_XGe}-C~IV

delta 130
zcmZn(XbG4g&d4*dP;8=}<YWUC7I6k3a0FsT1_l9!{N$vZ{3IYxU^62V8{1|9rumGU
z**RD^7#%nBNUUd{EX*h}*<0?+=BI*cAXzs?L1vHv3=9g~K*ANMkq4;rJM(0I70b!?
TJQ9;*R2FY$mfgVw)oBU<?@AlK