From 10289a7bf3c9b60f7a4ec13941ae45bb01bf6781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 20 Nov 2025 15:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=9A=E5=8F=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/User.php | 11 +++++++++++
 application/api/model/User.php      |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index ef61172..2cc18d4 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -295,4 +295,15 @@ class User extends BaseCom
         $reslut = model('User')->get_friend_list($user_id, $page, $page_limit);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+
+    //挚友列表查看更多
+    public function get_friend_list_more()
+    {
+        $user_id = input('user_id', 0);//用户id
+        $page = input('page', 1);
+        $page_limit = input('page_limit', 30);
+        $reslut = model('User')->get_friend_list_more($user_id, $page, $page_limit);
+        return V($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
 }
diff --git a/application/api/model/User.php b/application/api/model/User.php
index ea1f4a9..8cfd223 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -1005,7 +1005,7 @@ class User extends Model
             ->join('user b','a.user_id1 = b.id','left')
             ->join('user c','a.user_id2 = c.id','left')
             ->join('vs_relation d','a.relation_id = d.id','left')//关系
-            ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.nickname as nickname1,b.avatar as avatar1,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
+            ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.sex as sex1,b.nickname as nickname1,b.avatar as avatar1,c.sex as sex2,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
             ->where(['a.user_id1' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0,'a.relation_id' => $relation_id])
             ->order('a.updatetime desc')
             ->select();
@@ -1013,7 +1013,7 @@ class User extends Model
             ->join('user b','a.user_id1 = b.id','left')
             ->join('user c','a.user_id2 = c.id','left')
             ->join('vs_relation d','a.relation_id = d.id','left')//关系
-            ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.nickname as nickname1,b.avatar as avatar1,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
+            ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.sex as sex1,b.nickname as nickname1,b.avatar as avatar1,c.sex as sex2,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
             ->where(['a.user_id2' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0,'a.relation_id' => $relation_id])
             ->order('a.updatetime desc')
             ->select();
@@ -1052,4 +1052,7 @@ class User extends Model
 //        return ['code' => 1, 'msg' => '操作成功', 'data' => $room_auction];
     }
 
+
+
+
 }
\ No newline at end of file