diff --git a/app/Http/Controllers/ProgramConstructController.php b/app/Http/Controllers/ProgramConstructController.php
index 727b59b..7757f55 100644
--- a/app/Http/Controllers/ProgramConstructController.php
+++ b/app/Http/Controllers/ProgramConstructController.php
@@ -9,10 +9,9 @@ use Illuminate\Routing\Controller as BaseController;
class ProgramConstructController extends BaseController
{
public function construct(Request $request) {
- $keyword = $request->get("keyword", "");
- $programs = Programs::query()->with(["appends", "video_pivots.video"])->where("status", "=", 0)->limit(15)->orderByDesc("created_at")->get();
+ $status = $request->get("status", "0");
+ $programs = Programs::query()->with(["appends", "video_pivots.video"])->where("status", $status, 0)->limit(15)->orderByDesc("created_at")->get();
return view("program.construct.index", [
- "keyword" => $keyword,
"programs"=>$programs,
]);
}
diff --git a/app/Http/Controllers/ProgramQueryController.php b/app/Http/Controllers/ProgramQueryController.php
index f1d07f1..0adf5a4 100644
--- a/app/Http/Controllers/ProgramQueryController.php
+++ b/app/Http/Controllers/ProgramQueryController.php
@@ -10,9 +10,21 @@ class ProgramQueryController extends BaseController
{
public function index(Request $request) {
$keyword = $request->get("keyword", "");
- $programs = Programs::query()->with(["appends", "video_pivots.video"])
- ->where("status", "=", 1)->limit(15)->orderByDesc("created_at")
- ->paginate(10)->withQueryString();
+ $query = Programs::query()->with(["appends", "video_pivots.video"])->where("status", "=", 1)->orderByDesc("created_at");
+ if ($keyword) {
+ $keyword_split = explode(" ", $keyword);
+ foreach ($keyword_split as $_keyword) {
+ if (mb_strlen(trim($_keyword)) > 0) {
+ $query->where(function ($_query) use ($_keyword) {
+ $_query
+ ->where("name", "like", "%{$_keyword}%", "or")
+ ->where("difficulty", "like", "%{$_keyword}%", "or")
+ ->where("desc", "like", "%${_keyword}%", "or");
+ });
+ }
+ }
+ }
+ $programs = $query->paginate(10)->withQueryString();
return view("program.index", [
"keyword" => $keyword,
"programs"=>$programs,
diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index b12cdea..a619586 100644
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -5,6 +5,6 @@
导航：
节目单查询
直播弹幕查询
- 节目查询
+ 节目查询
diff --git a/resources/views/danmaku/index.blade.php b/resources/views/danmaku/index.blade.php
index 5c29b90..5ab8f33 100644
--- a/resources/views/danmaku/index.blade.php
+++ b/resources/views/danmaku/index.blade.php
@@ -1,7 +1,7 @@
- 录播节目单查询
+ 录播弹幕查询
diff --git a/resources/views/danmaku/search_index.blade.php b/resources/views/danmaku/search_index.blade.php
index 5926cc2..b8d91a9 100644
--- a/resources/views/danmaku/search_index.blade.php
+++ b/resources/views/danmaku/search_index.blade.php
@@ -1,7 +1,7 @@
- 录播节目单查询
+ 录播弹幕查询
diff --git a/resources/views/program/index.blade.php b/resources/views/program/index.blade.php
index 459e577..d02dcbe 100644
--- a/resources/views/program/index.blade.php
+++ b/resources/views/program/index.blade.php
@@ -7,12 +7,12 @@
@include("common.header")
-搜索功能待开放，数据待补充完整
-
+数据待补充完整
+