| xqd
@@ -185,12 +185,11 @@ class IndexController extends Controller
|
|
|
$keyword ='%'.$request->keyword.'%';
|
|
|
$user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
|
|
|
$dream_infos = DreamInfoModel::where(function ($query) use($keyword) {
|
|
|
- $query->where('name','like',$keyword)
|
|
|
- ->where('end_time','>=',time());
|
|
|
+// ->where('end_time','>=',time())
|
|
|
+ $query->where('name','like',$keyword);
|
|
|
})
|
|
|
->orWhere(function ($query) use($keyword){
|
|
|
- $query->where('sign','like',$keyword)
|
|
|
- ->where('end_time','>=',time());
|
|
|
+ $query->where('sign','like',$keyword);
|
|
|
})->with(['user','img'])->get();
|
|
|
$this->dreams($dream_infos);
|
|
|
$signs = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
|