|
@@ -90,36 +90,35 @@ 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.is_active',
|
|
|
+ 'user.height',
|
|
|
+ 'user.weight',
|
|
|
+ 'user.cityname',
|
|
|
+ 'user.bio',
|
|
|
|
|
|
'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('user.is_active desc,distance asc,user.id desc')
|
|
|
+ ->order('distance asc,user.id desc')
|
|
|
->autopage()
|
|
|
->select();
|
|
|
$list = list_domain_image($list,['avatar','photo_images']);
|
|
|
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';
|
|
@@ -127,7 +126,7 @@ class Index extends Api
|
|
|
$val['distance'] = '未知';
|
|
|
}
|
|
|
|
|
|
- $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
|
|
|
+
|
|
|
|
|
|
|
|
|
$yinsi = $this->user_power($val['id'],'yinsi');
|
|
@@ -135,6 +134,34 @@ class Index extends Api
|
|
|
$val['distance'] = '';
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ $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);
|