|
@@ -65,7 +65,7 @@ class HomeService
|
|
$userinfo = User::query()
|
|
$userinfo = User::query()
|
|
->leftJoin('users_info','users.id','=','users_info.user_id')
|
|
->leftJoin('users_info','users.id','=','users_info.user_id')
|
|
->where('users.id',$user_id)
|
|
->where('users.id',$user_id)
|
|
- ->select(['users.id','users.sex','users.is_auth','users.is_vip','users.tencent_im_user_id','users.online','users_info.*'])
|
|
|
|
|
|
+ ->select(['users.id','users.sex','users.is_auth','users.is_vip','users.latitude','users.longitude','users.tencent_im_user_id','users.online','users_info.*'])
|
|
->first();
|
|
->first();
|
|
$userinfo->age = birthday($userinfo->birthday);
|
|
$userinfo->age = birthday($userinfo->birthday);
|
|
$userinfo->hobby = !empty($userinfo->hobby)?explode(',',$userinfo->hobby):array();
|
|
$userinfo->hobby = !empty($userinfo->hobby)?explode(',',$userinfo->hobby):array();
|
|
@@ -96,6 +96,7 @@ class HomeService
|
|
}else{
|
|
}else{
|
|
$photo = array();
|
|
$photo = array();
|
|
}
|
|
}
|
|
|
|
+ $distance = GetDistance($user->latitude,$user->longitude,$userinfo->latitude,$userinfo->longitude);
|
|
}else{
|
|
}else{
|
|
//查询是否阅后即焚
|
|
//查询是否阅后即焚
|
|
if(count($photo)>0){
|
|
if(count($photo)>0){
|
|
@@ -107,6 +108,7 @@ class HomeService
|
|
}else{
|
|
}else{
|
|
$photo = array();
|
|
$photo = array();
|
|
}
|
|
}
|
|
|
|
+ $distance = 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -134,6 +136,7 @@ class HomeService
|
|
$comment['total_star'] = $total_star;
|
|
$comment['total_star'] = $total_star;
|
|
$comment['total_num'] = $total_num;
|
|
$comment['total_num'] = $total_num;
|
|
$userinfo->comment = $comment;
|
|
$userinfo->comment = $comment;
|
|
|
|
+ $userinfo->distance = $distance;
|
|
return $userinfo;
|
|
return $userinfo;
|
|
}
|
|
}
|
|
|
|
|