好友待审列表，其他人个人资料

application/api/controller/Usercenter.php

@@ -19,7 +19,7 @@ class Usercenter extends Api
         'id',
         'username',
         'nickname',
-        'truename',
+//        'truename',
         'mobile',
         'avatar',
 
@@ -44,7 +44,7 @@ class Usercenter extends Api
     //获取他人用户信息，留下足迹
     public function getuserinfo(){
         $uid = input_post('uid',0);
-        $userinfo = Db::name('user')->field($this->allowFields)->where('id',$uid)->find();
+        $userinfo = Db::name('user')->field($this->allowFields)->where('id|username',$uid)->find();
 
         if(!$userinfo){
             $this->error('不存在的用户');
@@ -878,31 +878,6 @@ class Usercenter extends Api
         return $all_result;
     }
 
-    /**
-     * 是否关注
-     */
-    public function isFollows() {
-        $user_id = $this->request->request("user_id",0,"intval");
-
-        if (!$user_id || $user_id<=0) {
-            $this->error(__('Invalid parameters'));
-        }
-
-        $map = [
-            'uid' => $this->auth->id,
-            'follow_uid' => $user_id,
-        ];
-        $check = Db::name('user_follow')->where($map)->find();
-
-        $data = [];
-        if($check){
-            $data["is_show_follow"] = 0;
-        }else{
-            $data["is_show_follow"] = 1;
-        }
-
-        $this->success("获取成功！",$data);
-    }
 
 
     /**

application/api/controller/Userfollow.php

@@ -99,6 +99,34 @@ class Userfollow extends Api
         $this->success('success',$new_rs);
     }
 
+    //好友审核列表。粉丝列表改的。关注了我，我还没关注他的
+    public function my_fans_unfollow_list(){
+        //我的关注uids
+        $my_follow_uids = $this->my_follow_uids();
+
+        $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)->where('user.id','NOT IN',$my_follow_uids)->order('follow.id desc')->autopage()->select();
+
+        $list = list_domain_image($list,['avatar']);
+        $list = list_birthday_age($list);
+
+        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'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
+            }
+        }
+
+        $this->success('success',$list);
+    }
+
 
     //关注某人
     public function follow_one(){