gq преди 7 години
родител
ревизия
d310937c5e
променени са 1 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 6 3
      server/app/Http/Controllers/Api/V1/IndexController.php

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

@@ -67,6 +67,7 @@ class IndexController extends Controller
      *               "video": "url",
      *               "video": "url",
      *               "score": 100079365,
      *               "score": 100079365,
      *               "sign": "梦想达人",
      *               "sign": "梦想达人",
+     *               "signs": "[]",  //梦想标签
      *               "code": "",
      *               "code": "",
      *               "parameter": 100,
      *               "parameter": 100,
      *               "created_at": "2017-06-25 12:45:22",
      *               "created_at": "2017-06-25 12:45:22",
@@ -126,18 +127,20 @@ class IndexController extends Controller
             $banners = $this->getBanner();
             $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);
             $this->dreams($dreams);
-            return $this->api(compact('banners','users','dreams'));
         } elseif ($type == 'news') {
         } elseif ($type == 'news') {
             $banners = $this->getBanner();
             $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);
             $this->dreams($dreams);
-            return $this->api(compact('banners','users','dreams'));
         } else{
         } else{
             $banners = $this->getBanner();
             $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);
             $this->dreams($dreams);
-            return $this->api(compact('banners','users','dreams'));
         }
         }
+        foreach ($dreams as $dream) {
+            $dream->signs = explode(',',$dream->sign);
+        }
+        return $this->api(compact('banners','users','dreams'));
+
     }
     }
 
 
     /**
     /**