更新

app/Http/Controllers/Api/HomeController.php

@@ -4,6 +4,7 @@
 namespace App\Http\Controllers\Api;
 
 
+use App\Services\DynamicService;
 use App\Services\GeohashService;
 use App\Services\HomeService;
 use App\Services\RedisService;
@@ -31,9 +32,9 @@ class HomeController extends Controller
             if(!isset($request->longitude) || $request->longitude==""){
                 throw new Exception("参数错误");
             }
-            if(!isset($request->uniqueID) || $request->uniqueID==""){
-                throw new Exception("参数错误");
-            }
+//            if(!isset($request->uniqueID) || $request->uniqueID==""){
+//                throw new Exception("参数错误");
+//            }
             $user = auth('api')->user();
             if(!$user){
                 RedisService::redis()->SETEX('user_location_' . $request->uniqueID, 600, json_encode(['latitude' => $request->latitude, 'longitude' => $request->longitude]));
@@ -64,6 +65,12 @@ class HomeController extends Controller
         return response()->json($res);
     }
 
+
+    /**
+     * 用户详情
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse|void
+     */
     public function user_detail(Request $request){
         try {
             $res = $this->homeService->user_detail($request->user_id);
@@ -73,5 +80,26 @@ class HomeController extends Controller
         return response()->json($res);
     }
 
+    /**
+     * 用户动态
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse|void
+     */
+    public function user_dynamic(Request $request){
+        try {
+            $where = array();
+            $where['type'] = $request->post('type',1); //类型  type 1全部  2关注  3附近
+            $where['look_type'] =$request->post('look_type',3);//查看类型  type 1只看男士  2只看女士  3全部
+            $where['tag_id'] =$request->post('tag_id',0); //话题标签
+            $where['user_id'] =$request->user_id;
+            $dynamicService = new DynamicService();
+            $res = $dynamicService->dynamic_list($where);
+        }catch (\Exception $exception){
+            return $this->response->errorForbidden($exception->getMessage());
+        }
+        return response()->json($res);
+    }
+
+
 
 }

app/Services/DynamicService.php

@@ -101,7 +101,7 @@ class DynamicService
         }
 
         $dynamic = $dynamic->orderByDesc('id')
-            ->paginate(request('perPage',10));
+            ->paginate(request('perPage',20));
         $dynamic = $dynamic->toArray();
         foreach ($dynamic['data'] as $k=>$v){
             $dynamic['data'][$k]['img_url'] = json_decode($v['img_url'],true);

app/Services/HomeService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 
 
 use App\Models\User;
+use App\Models\UserLikeModel;
 use Illuminate\Support\Facades\DB;
 
 class HomeService
@@ -49,10 +50,13 @@ class HomeService
     //用户详情
     public function user_detail($user_id){
         $user = auth('api')->user();
+        $is_like = 0;
         if($user){
             //登录状态  增加 谁看了我记录
             look_log($user->id,$user_id);
-
+            if(UserLikeModel::query()->where(['user_id'=>$user->id,'like_id'=>$user_id])->first()){
+                $is_like = 1;
+            }
         }
         $userinfo = User::query()
             ->leftJoin('users_info','users.id','=','users_info.user_id')
@@ -63,7 +67,7 @@ class HomeService
         $userinfo->photo = json_decode($userinfo->photo,true);
         $userinfo->video = json_decode($userinfo->video,true);
 
-        $userinfo->is_like = 1;
+        $userinfo->is_like = $is_like;
         return $userinfo;
     }
 }

routes/api.php

@@ -31,6 +31,7 @@ $api->version('v1', [
             $api->post('/home', 'HomeController@home')->name('home.home');
             $api->post('/get_location', 'HomeController@get_location')->name('home.get_location');
             $api->post('/user_detail', 'HomeController@user_detail')->name('home.user_detail');
+            $api->post('/user_dynamic', 'HomeController@user_dynamic')->name('home.user_dynamic');
         });
 
         /*