add

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -90,16 +90,21 @@ class IndexController extends Controller
         $users = [];
         $type = $request->type;
         if ($type == 'trend') {
-            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->offset(20)->limit(100)->paginate(20);
+            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->offset(20)->limit(100)->toSql();
+            dd($dreams);
+
             $this->dreams($dreams);
             return $this->api(compact('users','dreams'));
         } elseif ($type == 'news') {
-            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->offset(100)->limit(500)->paginate(20);
+            $dreams = DreamInfoModel::orderBy('score','desc')->orderBy('created_at','desc')->with('user')->limit(500)->offset(100)->toSql();
+            dd($dreams);
+
             $this->dreams($dreams);
             return $this->api(compact('users','dreams'));
         } else{
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->paginate(20);
+            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->toSql();
+            dd($dreams);
             $this->dreams($dreams);
             return $this->api(compact('banners','users','dreams'));
         }
@@ -147,11 +152,11 @@ class IndexController extends Controller
         $user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
         $dream_infos =  DreamInfoModel::where(function ($query) use($keyword) {
             $query->where('name','like',$keyword)
-                ->where('end_time','<=',time());
+                ->where('end_time','>=',time());
         })
         ->orWhere(function ($query) use($keyword){
             $query->where('sign','like',$keyword)
-                ->where('end_time','<=',time());
+                ->where('end_time','>=',time());
         })->with(['user','img'])->get();
         $signs  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
         if (empty($request->keyword)) {