1.新增几个接口。

@@ -79,4 +79,51 @@ class HomeController extends Controller
             return Response::fail($exception->getMessage());
             return Response::fail($exception->getMessage());
         }
         }
     }
     }
+
+    /**
+     * 目前的逻辑是：点赞或者收藏过的不显示在里面
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Resources\Json\JsonResource
+     */
+    public function fresh(Request $request)
+    {
+        $page = $request->get('page',1);
+        $page_size = $request->get('page_size',20);
+        $lists = Immerse::query()
+            ->where('state', 1)
+            ->orderByDesc('created_at')
+            ->skip(($page - 1) * $page_size)->take($page_size + 1)->get();
+        $token = $request->bearerToken();
+        $user_id = $token ? ((Sanctum::$personalAccessTokenModel)::findToken($token))->tokenable_id : 'asdasd';
+
+        $data = [];
+        foreach ($lists as $list) {
+            if (!$list->isPraise($list->id, $user_id) && !$list->isCollect($list->id, $user_id)){
+                $data[] = [
+                    'id' => $list->id,
+                    'user_id' => $list->user_id,
+                    'title' => $list->title,
+                    'content' => $list->content,
+                    'weather' => $list->weather,
+                    'haungli' => $list->haungli,
+                    'longitude' => $list->longitude,
+                    'latitude' => $list->latitude,
+                    'location' => $list->location,
+                    'url' => $list->url,
+                    'type' => $list->type,
+                    'poem_id' => $list->poem_id,
+                    'temp_id' => $list->temp_id,
+                    'bgm' => $list->bgm,
+                    'praise' => $list->praise,
+                    'view' => $list->view,
+                    'collect' => $list->collect,
+                    'share' => $list->share,
+                    'is_praise' => $list->isPraise($list->id, $user_id),
+                    'is_collect' => $list->isCollect($list->id, $user_id),
+                ];
+            }
+        }
+
+        return Response::success($data);
+    }
 }
 }

@@ -150,4 +150,18 @@ class ImmerseController extends Controller
 
 
         else return Response::success();
         else return Response::success();
     }
     }
+
+    public function collectList(Request $request)
+    {
+        $page = $request->get('page',1);
+        $page_size = $request->get('page_size',20);
+
+        $user = $request->user();
+
+        $data = Collect::query()->where(['user_id' => $user->id, 'state' => 1])
+            ->orderByDesc('created_at')
+            ->skip(($page - 1) * $page_size)->take($page_size + 1)->get();
+
+        return Response::success($data);
+    }
 }
 }

@@ -39,6 +39,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route
     /**首页*/
     /**首页*/
     $api->apiResource('/home', 'HomeController');
     $api->apiResource('/home', 'HomeController');
 
 
+    /**首页"新鲜"*/
+    $api->get('/fresh', 'HomeController@fresh');
+
     /** 图片上传 */
     /** 图片上传 */
     $api->post('/upload/image', 'SettingController@uploadImage');
     $api->post('/upload/image', 'SettingController@uploadImage');
 
 
@@ -88,6 +91,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->middleware('auth:sanc
     /** 收藏 */
     /** 收藏 */
     $api->post('/collect/{id}', 'ImmerseController@collect');
     $api->post('/collect/{id}', 'ImmerseController@collect');
 
 
+    /** 收藏列表 */
+    $api->post('/collect', 'ImmerseController@collectList');
+
     /** 众妙 */
     /** 众妙 */
     $api->get('/packpoem', 'HomeController@packpoem');
     $api->get('/packpoem', 'HomeController@packpoem');