|
@@ -14,23 +14,31 @@ class Userfollow extends Api
|
|
|
|
|
|
//我的关注列表
|
|
|
public function my_follow_list(){
|
|
|
+ $user_id = input('user_id',0);
|
|
|
+ if(empty($user_id)){
|
|
|
+ $user_id = $this->auth->id;
|
|
|
+ }
|
|
|
+
|
|
|
$list = Db::name('user_follow')
|
|
|
->alias('follow')
|
|
|
->join('user','follow.follow_uid = user.id','LEFT')
|
|
|
->join('user_wallet uw','user.id = uw.user_id','LEFT')
|
|
|
->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
|
|
|
- ->where('follow.uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
|
|
|
+ ->where('follow.uid',$user_id)->order('follow.id desc')->autopage()->select();
|
|
|
|
|
|
$list = list_domain_image($list,['avatar']);
|
|
|
$list = list_birthday_age($list);
|
|
|
|
|
|
+ //我的关注uids
|
|
|
+ $my_follow_uids = $this->my_follow_uids();
|
|
|
+
|
|
|
if(!empty($list)){
|
|
|
foreach($list as $key => &$val){
|
|
|
//用户vip
|
|
|
$val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
|
|
|
unset($val['vip_endtime']);
|
|
|
//是否关注
|
|
|
- $val['is_follow'] = 1;
|
|
|
+ $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -39,12 +47,17 @@ class Userfollow extends Api
|
|
|
|
|
|
//我的粉丝列表
|
|
|
public function my_fans_list(){
|
|
|
+ $user_id = input('user_id',0);
|
|
|
+ if(empty($user_id)){
|
|
|
+ $user_id = $this->auth->id;
|
|
|
+ }
|
|
|
+
|
|
|
$list = Db::name('user_follow')
|
|
|
->alias('follow')
|
|
|
->join('user','follow.uid = user.id','LEFT')
|
|
|
->join('user_wallet uw','user.id = uw.user_id','LEFT')
|
|
|
->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
|
|
|
- ->where('follow.follow_uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
|
|
|
+ ->where('follow.follow_uid',$user_id)->order('follow.id desc')->autopage()->select();
|
|
|
|
|
|
$list = list_domain_image($list,['avatar']);
|
|
|
$list = list_birthday_age($list);
|