| xqd
@@ -134,17 +134,17 @@ class IndexController extends Controller
|
|
|
$type = $request->type;
|
|
|
if ($type == 'trend') {
|
|
|
$banners = $this->getBanner();
|
|
|
- $dreams = DreamInfoModel::where('end_time','<',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);
|
|
|
+ $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);
|
|
|
$this->dreams($dreams);
|
|
|
return $this->api(compact('banners','users','dreams'));
|
|
|
} elseif ($type == 'news') {
|
|
|
$banners = $this->getBanner();
|
|
|
- $dreams = DreamInfoModel::where('end_time','<',date('Y-m-d H:i:s'))->orderBy('score','desc')->orderBy('created_at','desc')->with('user')->whereNotIn('id', $id_arr2)->limit(500)->paginate(20);
|
|
|
+ $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->orderBy('score','desc')->orderBy('created_at','desc')->with('user')->whereNotIn('id', $id_arr2)->limit(500)->paginate(20);
|
|
|
$this->dreams($dreams);
|
|
|
return $this->api(compact('banners','users','dreams'));
|
|
|
} else{
|
|
|
$banners = $this->getBanner();
|
|
|
- $dreams = DreamInfoModel::where('end_time','<',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->limit(15)->paginate(15);
|
|
|
+ $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->limit(15)->paginate(15);
|
|
|
$this->dreams($dreams);
|
|
|
return $this->api(compact('banners','users','dreams'));
|
|
|
}
|