|
@@ -260,7 +260,7 @@ class UserCenter extends Common
|
|
* (个人中心模块)(消息-最新关注)
|
|
* (个人中心模块)(消息-最新关注)
|
|
*/
|
|
*/
|
|
public function getFollowsUser() {
|
|
public function getFollowsUser() {
|
|
- $type = $this->request->request('type',1); // 1=关注,2=粉丝
|
|
|
|
|
|
+ $type = $this->request->request('type',1); // 1=关注,2=粉丝,3=好友
|
|
$page = $this->request->request('page',1); // 分页
|
|
$page = $this->request->request('page',1); // 分页
|
|
$pageNum = $this->request->request('pageNum',10); // 分页
|
|
$pageNum = $this->request->request('pageNum',10); // 分页
|
|
// 分页搜索构建
|
|
// 分页搜索构建
|
|
@@ -306,7 +306,7 @@ class UserCenter extends Common
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$fansfollow = $followlist;
|
|
$fansfollow = $followlist;
|
|
- } else {
|
|
|
|
|
|
+ } elseif($type == 2) {
|
|
$ids = [];
|
|
$ids = [];
|
|
if($followlist) {
|
|
if($followlist) {
|
|
foreach($followlist as $k => $v) {
|
|
foreach($followlist as $k => $v) {
|
|
@@ -324,6 +324,24 @@ class UserCenter extends Common
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$fansfollow = $fanslist;
|
|
$fansfollow = $fanslist;
|
|
|
|
+ }else {
|
|
|
|
+ $ids = [];
|
|
|
|
+ if($followlist) {
|
|
|
|
+ foreach($followlist as $k => $v) {
|
|
|
|
+ $ids[] = $v["user_id"];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if($fanslist) {
|
|
|
|
+ foreach($fanslist as $k => $v) {
|
|
|
|
+ $fanslist[$k]['createtime_text'] = get_last_time($v['createtime']);
|
|
|
|
+ if(in_array($v["fans_id"],$ids)) {
|
|
|
|
+ $fanslist[$k]["is_hu"] = 1;
|
|
|
|
+ } else {
|
|
|
|
+ unset($fanslist[$k]); //不是好友的 直接unset掉
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ $fansfollow = $fanslist;
|
|
}
|
|
}
|
|
|
|
|
|
if($fansfollow) {
|
|
if($fansfollow) {
|