| xqd
@@ -146,9 +146,14 @@ class IndexController extends Controller
|
|
|
$user = $this->getUser();
|
|
|
$keyword ='%'.$request->keyword.'%';
|
|
|
$user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
|
|
|
- $query = DreamInfoModel::where('end_time','<=',time())->where('name','like',$keyword)->
|
|
|
- orWhere('sign','like',$keyword);
|
|
|
- $dream_infos =$query->with(['img','user'])->get();
|
|
|
+ $dream_infos = DreamInfoModel::where(function ($query) use($keyword) {
|
|
|
+ $query->where('name','like',$keyword)
|
|
|
+ ->where('end_time','<=',time());
|
|
|
+ })
|
|
|
+ ->orWhere(function ($query) use($keyword){
|
|
|
+ $query->where('sign','like',$keyword)
|
|
|
+ ->where('end_time','<=',time());
|
|
|
+ })->get();
|
|
|
$signs = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
|
|
|
if (empty($request->keyword)) {
|
|
|
// 历史搜索
|