add

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -138,37 +138,6 @@ class IndexController extends Controller
      *      ]
      *  }
      *}
-     *               post
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": {
-     *       "user_infos": [
-     *          {
-     *              "id": 1,
-     *              "phone": "13880642880",
-     *              "nickname": "name1",
-     *              "avatar": "https://timgsa.baidu.com/ti.thumb.224_0.jpeg",
-     *              },
-     *      ],
-     *      "dream_infos": [
-     *           {
-     *              "id": 5,
-     *              "user_id": 1,
-     *              "name": "梦想标题1",
-     *              "about": "梦想介绍",
-     *          },
-     *      ],
-     *      "signs": [
-     *          {
-     *              "id": 1013,
-     *              "key": "",
-     *              "value": "ha",                 标签名
-     *          },
-     *      ]
-     *  }
-     *}
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
      */
@@ -177,8 +146,9 @@ class IndexController extends Controller
         $user = $this->getUser();
         $keyword ='%'.$request->keyword.'%';
         $user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
-        $dream_infos = DreamInfoModel::where('name','like',$keyword)->
-            orWhere('sign','like',$keyword)->with('img')->get();
+        $query = DreamInfoModel::where('end_time','<=',time())->where('name','like',$keyword)->
+            orWhere('sign','like',$keyword);
+        $dream_infos =$query->with('img')->get();
         $signs  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
         if (empty($request->keyword)) {
 //            历史搜索

server/app/Http/Controllers/Api/V1/MyController.php

@@ -424,23 +424,36 @@ class MyController extends Controller
         "message": "",
         "data": [
             {
-                "id": 5,
+                "id": 2,
                 "user_id": 1,
-                "name": "梦想标题1",
-                "about": "梦想介绍",
-                "coin": 2500,
-                "time": 72000,
-                "get_coin": 0,
-                "mark": 0,
-                "status": 0,
-                "video": "url",
-                "score": 100079365,
-                "sign": "梦想达人",
-                "created_at": "2017-06-25 12:45:22",
-                "updated_at": "2017-06-28 15:50:41",
-                "user": {},
-                "imgs": []
-            },
+                "dream_id": 12,
+                "dream_user_id": 2,
+                "interaction_number": 0,
+                "created_at": "2017-06-25 13:11:45",
+                "updated_at": "2017-06-25 13:11:45",
+                "dreams": [                                      梦想
+                    {
+                        "id": 12,
+                        "user_id": 2,
+                        "name": "用户2梦想标题166",
+                        "about": "用户2梦想介绍666",
+                        "coin": 2500,
+                        "end_time": 72000,
+                        "get_coin": 792,
+                        "mark": 5484,
+                        "status": 0,
+                        "video": "e",
+                        "score": 158730,
+                        "sign": "梦想达人",
+                        "created_at": "2017-06-25 13:10:56",
+                        "updated_at": "2017-06-28 16:53:39"
+                        "img": {
+                            "title": "",
+                            "pic": "https://timgsa.baidu.com/timg9&di2f.jpg"
+                        }
+                    }
+                ]
+            }
         ]
     }
      * @apiErrorExample {json} Error-Response:
@@ -449,19 +462,18 @@ class MyController extends Controller
     public function searchCollection(Request $request)
     {
         $user = $this->getUser();
-        if (empty($request->keyword)) {
-            return $this->api('');
-        }
         $keyword ='%'.$request->keyword.'%';
-        $data = DreamInfoModel::where('name','like',$keyword)->
-        orWhere('sign','like',$keyword)->with('user','imgs')->get();
+        $data = UserCareDream::where('user_id',$user->id)->
+        whereHas('dreams',function ($query) use($keyword){
+            $query->where('end_time','<=',time())->where('name','like',$keyword);
+        })->with('dreams')->get();
+       foreach ($data as $item) {
+           foreach ($item->dreams as $dream) {
+               $dream->img;
+           }
+        }
         $this->insertSearchTable($user->id,$request->keyword);
-        $data = $user->careDreams()->whereHas('careDreams', function ($query) use ($keyword) {
-            $query->  where('name','like',$keyword)->
-            orWhere('sign','like',$keyword)->with('user','imgs');
-        });
-        return $data;
-        return $this->api(compact('data'));
+        return $this->api($data);
     }
 
     public function insertSearchTable($id,$keyword)

server/app/Models/UserCareDream.php

@@ -12,4 +12,9 @@ class UserCareDream extends Model
         'dream_id',
         'dream_user_id',
         ];
+
+    public function dreams()
+    {
+        return $this->hasMany('App\Models\DreamInfoModel','id','dream_id');
+    }
 }