更新

app/Services/DynamicService.php

@@ -91,64 +91,64 @@ class DynamicService
         }
 
         //性别
-        if($where['look_type']!=3){
-            $dynamic = $dynamic->whereHas('user',function($query)use($where){
-                $query->where('sex',$where['look_type'])->select();
-            });
-        }
-
-        //用户id
-        if($where['user_id']!=0){
-            $dynamic = $dynamic->where('user_id','=',$where['user_id']);
-        }
-
-        //标签
-        if($where['tag_id']!=0){
-            $dynamic = $dynamic->whereRaw('FIND_IN_SET(?,tag)',[$where['tag_id']]);
-        }
+//        if($where['look_type']!=3){
+//            $dynamic = $dynamic->whereHas('user',function($query)use($where){
+//                $query->where('sex',$where['look_type'])->select();
+//            });
+//        }
+//
+//        //用户id
+//        if($where['user_id']!=0){
+//            $dynamic = $dynamic->where('user_id','=',$where['user_id']);
+//        }
+//
+//        //标签
+//        if($where['tag_id']!=0){
+//            $dynamic = $dynamic->whereRaw('FIND_IN_SET(?,tag)',[$where['tag_id']]);
+//        }
 
         $dynamic = $dynamic->orderByDesc('id')
             ->paginate(request('perPage',20));
         $dynamic = $dynamic->toArray();
-//        foreach ($dynamic['data'] as $k=>$v){
-//            $dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);
-//
-//
-//            //计算距离 如果设置了位置，使用设置位置  否则使用定位位置
-//            if(!$v['latitude']||!$v['longitude']){
-//                //没有设置位置  取用户位置
-//                $v_user = User::query()->where(['id'=>$v['user_id']])->first();
-//                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']);
-//            }
-//            if($distance>=1){
-//                $distance = round($distance);
-//            }else{
-//                $distance = round($distance*1000);
-//            }
-//
-//            $dynamic['data'][$k]['distance'] = $distance;
-//
-//
-//            $dynamic['data'][$k]['atime'] = uc_time_ago(strtotime($v['created_at']));
-//            $dynamic['data'][$k]['tag'] = DB::table("dynamic_tag")->whereIn('id',explode(',',$v['tag']))->get();
-//
-//            $is_zan = 0;
-//            if($user = auth('api')->user()){
-//                if(DynamicZanModel::query()->where(['user_id'=>$user->id,'dynamic_id'=>$v['id']])->first()){
-//                    $is_zan = 1;
-//                }
-//            }
-//            $dynamic['data'][$k]['is_zan'] = $is_zan;
-//
-//
-//
-//        }
+        foreach ($dynamic['data'] as $k=>$v){
+            $dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);
+
+
+            //计算距离 如果设置了位置，使用设置位置  否则使用定位位置
+            if(!$v['latitude']||!$v['longitude']){
+                //没有设置位置  取用户位置
+                $v_user = User::query()->where(['id'=>$v['user_id']])->first();
+                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']);
+            }
+            if($distance>=1){
+                $distance = round($distance);
+            }else{
+                $distance = round($distance*1000);
+            }
+
+            $dynamic['data'][$k]['distance'] = $distance;
+
+
+            $dynamic['data'][$k]['atime'] = uc_time_ago(strtotime($v['created_at']));
+            $dynamic['data'][$k]['tag'] = DB::table("dynamic_tag")->whereIn('id',explode(',',$v['tag']))->get();
+
+            $is_zan = 0;
+            if($user = auth('api')->user()){
+                if(DynamicZanModel::query()->where(['user_id'=>$user->id,'dynamic_id'=>$v['id']])->first()){
+                    $is_zan = 1;
+                }
+            }
+            $dynamic['data'][$k]['is_zan'] = $is_zan;
+
+
+
+        }
 
         return $dynamic;
     }