|
@@ -230,7 +230,7 @@ class DynamicService
|
|
|
$dynamic = $dynamic->orderByDesc('id')
|
|
$dynamic = $dynamic->orderByDesc('id')
|
|
|
->paginate(request('perPage',20));
|
|
->paginate(request('perPage',20));
|
|
|
$dynamic = $dynamic->toArray();
|
|
$dynamic = $dynamic->toArray();
|
|
|
- dd($dynamic);
|
|
|
|
|
|
|
+
|
|
|
foreach ($dynamic['data'] as $k=>$v){
|
|
foreach ($dynamic['data'] as $k=>$v){
|
|
|
$dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);
|
|
$dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);
|
|
|
|
|
|
|
@@ -247,6 +247,7 @@ class DynamicService
|
|
|
}else{
|
|
}else{
|
|
|
$distance = GetDistance($lat,$lng,$v['latitude'],$v['longitude']);
|
|
$distance = GetDistance($lat,$lng,$v['latitude'],$v['longitude']);
|
|
|
}
|
|
}
|
|
|
|
|
+ dd(1111);
|
|
|
if($distance>=1){
|
|
if($distance>=1){
|
|
|
$distance = round($distance);
|
|
$distance = round($distance);
|
|
|
}else{
|
|
}else{
|
