gq 7 سال پیش
والد
کامیت
4768aafd4f
1فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 4 2
      server/app/Http/Controllers/Api/V1/IndexController.php

+ 4 - 2
server/app/Http/Controllers/Api/V1/IndexController.php

xqd
@@ -133,13 +133,15 @@ 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);
             $this->dreams($dreams);
-            return $this->api(compact('users','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);
             $this->dreams($dreams);
-            return $this->api(compact('users','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);