From d897e9a33d33ad6d275a8c22224a96852f3c5938 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 20 Aug 2022 11:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=8F=8A?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99input?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ProgramConstructController.php      | 8 ++++----
 app/Http/Controllers/ProgramVideoConstructController.php | 4 ++--
 resources/views/program/construct/batch_add.blade.php    | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ProgramConstructController.php b/app/Http/Controllers/ProgramConstructController.php
index 33225b7..5272757 100644
--- a/app/Http/Controllers/ProgramConstructController.php
+++ b/app/Http/Controllers/ProgramConstructController.php
@@ -5,8 +5,10 @@ namespace App\Http\Controllers;
 use App\Models\Programs;
 use App\Models\ProgramVideos;
 use App\Models\VideoComments;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\DB;
 
 class ProgramConstructController extends BaseController
 {
@@ -57,10 +59,8 @@ class ProgramConstructController extends BaseController
         $content = $request->post("content");
         $count = ProgramVideos::query()->where("video_bvid", "=", $bvid)->count();
         if ($count > 0) {
-            return view("program.construct.batch_add", [
-                "content" => $content,
-                "bvid" => $bvid,
-                "message" => "该BVID下已有{$count}个节目关联，请手动添加",
+            return back()->withInput()->withErrors([
+                "bvid" => "该BVID下已有{$count}个节目关联，请手动添加"
             ]);
         }
         $regex = "/^p(?P<part>\d{1,2})[-# _:,)]+(?P<time>(0?1[:：])?\d{1,3}[:：]\d{1,2}) ?(?P<content>.+)$/ui";
diff --git a/app/Http/Controllers/ProgramVideoConstructController.php b/app/Http/Controllers/ProgramVideoConstructController.php
index 3c7a84c..0375532 100644
--- a/app/Http/Controllers/ProgramVideoConstructController.php
+++ b/app/Http/Controllers/ProgramVideoConstructController.php
@@ -103,7 +103,7 @@ class ProgramVideoConstructController extends BaseController
 
     public function to_fix_created_at(Request $request, ProgramVideos $program_video) {
         if ($program_video->created_at === null) {
-            return back()->withErrors([
+            return back()->withInput()->withErrors([
                 "id" => "没有开始时间，请先保存对应时间"
             ]);
         }
@@ -118,7 +118,7 @@ class ProgramVideoConstructController extends BaseController
             "each_time" => ["required", "date_format:H:i:s"]
         ]);
         if ($program_video->created_at === null) {
-            return back()->withErrors([
+            return back()->withInput()->withErrors([
                 "id" => "没有开始时间，请先保存对应时间"
             ]);
         }
diff --git a/resources/views/program/construct/batch_add.blade.php b/resources/views/program/construct/batch_add.blade.php
index ac20992..d30151f 100644
--- a/resources/views/program/construct/batch_add.blade.php
+++ b/resources/views/program/construct/batch_add.blade.php
@@ -18,9 +18,6 @@
         <input class="form-input border-0 border-b-2 w-full" type="text" name="bvid" required value="{{ old('bvid') }}">
     </label>
     @include("common.form_error")
-    @isset($message)
-        <div class="bg-red-600 text-white">提示：{{ $message }}</div>
-    @endisset
     <div class="block my-2 text-center">
         <input class="px-6 py-2 inline-block rounded-full bg-cyan-600 text-white" type="submit">
     </div>