gq 7 年之前
父节点
当前提交
f65ff9abf0

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

xqd xqd
@@ -22,7 +22,7 @@ class Controller extends BaseController
     {
 //        $this->user = UserInfoModel::where('phone','13880642880')->first();
         $this->user = Auth::guard('api')->user();
-//        $this->user = UserInfoModel::find(1);
+        $this->user = UserInfoModel::find(1);
         return $this->user;
     }
 
@@ -31,7 +31,7 @@ class Controller extends BaseController
         $this->middleware('auth:api', [
             'except' => [
                 'upload', 'getCode', 'login', 'wechatLogin', 'alipayNotify', 'wechatpayNotify',
-                'download',  'test',
+                'download',  'test','home'
             ]
         ]);
 

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

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'));
         }