首页，附近，推荐

application/api/controller/Index.php

@@ -24,21 +24,17 @@ class Index extends Api
     //是vip，且开启了隐身的，不能在内
     public function fujin(){
         $cityname = input('cityname','');
-        /*if(empty($cityname)){
-            $cityname = $this->auth->cityname;
-        }*/
 
+        //强制条件
         $where = [
             'user.id' => ['neq',$this->auth->id],
             'user.status' => 1,
-            //'user.cityname' => $cityname,
             'power.yinshen' => 0,
         ];
 
         if(!empty($cityname) && $cityname != $this->auth->cityname){
             $where['user.cityname'] = $cityname;
         }else{
-            //$where['user.provincename'] = $this->auth->provincename;//仅以此缩小范围
         }
 
         //性别
@@ -103,22 +99,19 @@ class Index extends Api
 
             'wallet.vip_endtime',
             '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(user.longitude,user.latitude))*111195) as distance',
-//            'active.requesttime',
         ];
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
             ->join('user_power power' ,'user.id = power.user_id','LEFT')
-//            ->join('user_active active' ,'user.id = active.user_id','LEFT')
             ->where($where)
             ->where($where_black)
             ->having($having_dis)
             ->order('distance asc,user.id desc')
             ->autopage()
             ->select();
-        $list = list_domain_image($list,['avatar','photo_images']);
+        $list = list_domain_image($list,['avatar']);
         foreach($list as $key => &$val){
             $val['age'] = birthtime_to_age($val['birthday']);
-//            $val['photo_images'] = explode(',',$val['photo_images'])[0];
             $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
 
             $val['distance'] = bcdiv(intval($val['distance']),1000,1).'km';
@@ -126,7 +119,6 @@ class Index extends Api
                 $val['distance'] = '未知';
             }
 
-//            $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
 
             //vip如果开了隐私保护，需要隐藏距离
             $yinsi = $this->user_power($val['id'],'yinsi');
@@ -170,10 +162,7 @@ class Index extends Api
     //推荐
     //真人认证的，是推荐用户的，可能也要限制vip的
     public function tuijian(){
-        /*$cityname = input('cityname','');
-        if(empty($cityname)){
-            $cityname = $this->auth->cityname;
-        }*/
+
 
         //强制条件
         $where = [
@@ -182,14 +171,19 @@ class Index extends Api
           //  'power.yinshen' => 0,
         ];
 
-        //搜索条件 性别
+        //性别
         $gender = input('gender','all');
         if($gender != 'all'){
             $where['user.gender'] = $gender;
         }
 
-
-        //搜索条件 年龄
+        //排除黑名单的
+        $where_black = [];
+        $black_ids = Db::name('user_black')->where(['uid'=>$this->auth->id])->column('black_uid');
+        if(!empty($black_ids)){
+            $where_black['user.id'] = ['NOTIN',$black_ids];
+        }
+        //年龄
         $agemin = input('agemin',18);
         if($agemin > 18){
             $where['user.birthday'] = ['lt',time()-$agemin*31536000];
@@ -202,12 +196,7 @@ class Index extends Api
             $where['user.birthday'] = ['between',[time()-$agemax*31536000,time()-$agemin*31536000]];
         }
 
-        //排除黑名单的
-        $where_black = [];
-        $black_ids = Db::name('user_black')->where(['uid'=>$this->auth->id])->column('black_uid');
-        if(!empty($black_ids)){
-            $where_black['user.id'] = ['NOTIN',$black_ids];
-        }
+
 
         //其他条件  与 推荐条件是 或的关系
         $where_other = [
@@ -241,26 +230,24 @@ class Index extends Api
 
         $field = [
             'user.id',
-            'user.username',
             'user.nickname',
             'user.avatar',
-            'user.photo_images',
             'user.gender',
             'user.birthday',
-            'user.cityname',
             'user.longitude',
             'user.latitude',
-
+            'user.height',
+            'user.weight',
+            'user.cityname',
+            'user.bio',
             'user.is_active',
 
             'wallet.vip_endtime',
             '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(user.longitude,user.latitude))*111195) as distance',
-            'active.requesttime',
         ];
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
             ->join('user_power power' ,'user.id = power.user_id','LEFT')
-            ->join('user_active active' ,'user.id = active.user_id','LEFT')
             ->where($where)
             ->where($where_black)
             ->where(
@@ -277,10 +264,9 @@ class Index extends Api
             ->autopage()
             ->select();
 
-        $list = list_domain_image($list,['avatar','photo_images']);
+        $list = list_domain_image($list,['avatar']);
         foreach($list as $key => &$val){
             $val['age'] = birthtime_to_age($val['birthday']);
-            $val['photo_images'] = explode(',',$val['photo_images'])[0];
             $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
 
             $val['distance'] = bcdiv(intval($val['distance']),1000,1).'km';
@@ -288,14 +274,41 @@ class Index extends Api
                 $val['distance'] = '未知';
             }
 
-            $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
-            
+
             //vip如果开了隐私保护，需要隐藏距离,隐藏所在城市
             $yinsi = $this->user_power($val['id'],'yinsi');
             if($yinsi == 1){
                 $val['distance'] = '';
                 $val['cityname'] = '';
             }
+
+            //简单信息
+            $simple_info = '';
+            if(!empty($val['height'])){
+                $simple_info .= $val['height'];
+            }
+            if(!empty($val['weight'])){
+                if(!empty($simple_info)){
+                    $simple_info .= '|';
+                }
+                $simple_info .= $val['weight'];
+            }
+            if(!empty($val['cityname'])){
+                if(!empty($simple_info)){
+                    $simple_info .= '|';
+                }
+                $simple_info .= $val['cityname'];
+            }
+            $val['simple_info'] = $simple_info;
+
+            //
+            unset($val['longitude']);
+            unset($val['latitude']);
+            unset($val['height']);
+            unset($val['weight']);
+            unset($val['cityname']);
+            unset($val['vip_endtime']);
+            unset($val['birthday']);
         }
 
         $this->success(1,$list);