|
@@ -90,21 +90,21 @@ class IndexController extends Controller
|
|
$users = [];
|
|
$users = [];
|
|
$type = $request->type;
|
|
$type = $request->type;
|
|
if ($type == 'trend') {
|
|
if ($type == 'trend') {
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->offset(20)->limit(100)->toSql();
|
|
|
|
- dd($dreams);
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->offset(20)->limit(100)->paginate(15);
|
|
|
|
+// dd($dreams);
|
|
|
|
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
return $this->api(compact('users','dreams'));
|
|
return $this->api(compact('users','dreams'));
|
|
} elseif ($type == 'news') {
|
|
} elseif ($type == 'news') {
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->orderBy('created_at','desc')->with('user')->limit(500)->offset(100)->toSql();
|
|
|
|
- dd($dreams);
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->orderBy('created_at','desc')->with('user')->limit(500)->offset(100)->paginate(15);
|
|
|
|
+// dd($dreams);
|
|
|
|
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
return $this->api(compact('users','dreams'));
|
|
return $this->api(compact('users','dreams'));
|
|
} else{
|
|
} else{
|
|
$banners = $this->getBanner();
|
|
$banners = $this->getBanner();
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->toSql();
|
|
|
|
- dd($dreams);
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->paginate(15);
|
|
|
|
+// dd($dreams);
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
return $this->api(compact('banners','users','dreams'));
|
|
return $this->api(compact('banners','users','dreams'));
|
|
}
|
|
}
|