| xqd
@@ -76,7 +76,8 @@ class DynamicService
|
|
|
$lat = $user->latitude;
|
|
|
$lng = $user->longitude;
|
|
|
}else{
|
|
|
-
|
|
|
+ $lat = "0";
|
|
|
+ $lng = "0";
|
|
|
}
|
|
|
|
|
|
$dynamic = DynamicModel::query();
|
| xqd
@@ -112,24 +113,17 @@ class DynamicService
|
|
|
$dynamic = $dynamic->toArray();
|
|
|
foreach ($dynamic['data'] as $k=>$v){
|
|
|
$dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);
|
|
|
- //$dynamic['data'][$k]['tag'] = json_decode($v['tag'],true);
|
|
|
- if(!empty($v['site'])){
|
|
|
|
|
|
- $dynamic['data'][$k]['site'] = json_decode($v['site'],true);
|
|
|
- $site = json_decode($v['site'],true);
|
|
|
- }else{
|
|
|
|
|
|
- }
|
|
|
//计算距离 如果设置了位置,使用设置位置 否则使用定位位置
|
|
|
if(!$v['latitude']||!$v['longitude']){
|
|
|
//没有设置位置 取用户位置
|
|
|
$v_user = User::query()->where(['id'=>$v['user_id']])->first();
|
|
|
- if(!$v_user->latitude||!$v_user->longitude){
|
|
|
+ if(!$v_user->latitude || !$v_user->longitude){
|
|
|
$distance = 0;
|
|
|
}else{
|
|
|
$distance = GetDistance($lat,$lng,$v_user->latitude,$v_user->longitude);
|
|
|
}
|
|
|
-
|
|
|
}else{
|
|
|
$distance = GetDistance($lat,$lng,$v['latitude'],$v['longitude']);
|
|
|
}
|