From b7ce72516007631cf8cb6bac5b0c046f93edd798 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 30 Jul 2022 17:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=8A=82=E7=9B=AE=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=BC=B9=E5=B9=95=E7=9A=84?=
 =?UTF-8?q?title=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ProgramConstructController.php |  5 ++---
 .../Controllers/ProgramQueryController.php     | 18 +++++++++++++++---
 resources/views/common/header.blade.php        |  2 +-
 resources/views/danmaku/index.blade.php        |  2 +-
 resources/views/danmaku/search_index.blade.php |  2 +-
 resources/views/program/index.blade.php        | 12 ++++++------
 6 files changed, 26 insertions(+), 15 deletions(-)

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 @@
         导航：
         <a class="text-blue-600 underline" href="/">节目单查询</a>
         <a class="text-blue-600 underline" href="/danmakus">直播弹幕查询</a>
-        <a class="text-gray-50" href="/programs" style="color: gray" title="数据不全，待补充">节目查询</a>
+        <a class="text-blue-600 underline" href="/programs" title="数据不全，待补充">节目查询</a>
     </div>
 </div>
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 @@
 <html lang="zh">
 <head>
     <meta charset="UTF-8">
-    <title>录播节目单查询</title>
+    <title>录播弹幕查询</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="{{ mix('/css/app.css') }}" rel="stylesheet"/>
 </head>
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 @@
 <html lang="zh">
 <head>
     <meta charset="UTF-8">
-    <title>录播节目单查询</title>
+    <title>录播弹幕查询</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="{{ mix('/css/app.css') }}" rel="stylesheet"/>
 </head>
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 @@
 </head>
 <body>
 @include("common.header")
-<h3>搜索功能待开放，数据待补充完整</h3>
-<!--<form action="">
-        <label for="keyword">查找节目关键词，空格隔开查找多个关键词</label>
-        <input type="text" name="keyword" id="keyword" value="{{$keyword}}">
-        <input type="submit">
-    </form>-->
+<div class="font-bold">数据待补充完整</div>
+<form class="form" action="">
+    <label for="keyword">查找节目关键词，空格隔开查找多个关键词，暂不支持通过点播老板搜索</label>
+    <input class="border border-black" type="text" name="keyword" id="keyword" value="{{$keyword}}">
+    <input class="border border-black" type="submit">
+</form>
 <table class="table-auto border-collapse w-full lg:border lg:border-black">
     <thead>
     <tr class="border border-black sticky bg-white lg:static top-0 left-0 right-0">