diff --git a/app/Http/Controllers/ProgramQueryController.php b/app/Http/Controllers/ProgramQueryController.php index c948cc3..8b46d1f 100644 --- a/app/Http/Controllers/ProgramQueryController.php +++ b/app/Http/Controllers/ProgramQueryController.php @@ -3,14 +3,13 @@ namespace App\Http\Controllers; use App\Models\Programs; -use App\Models\Tags; use Illuminate\Routing\Controller as BaseController; class ProgramQueryController extends BaseController { public function index() { $keyword = request()->get("keyword", ""); - $programs = Programs::query()->with(["appends", "tag_pivots.tag", "video_pivots.video"])->limit(15)->orderByDesc("created_at")->get(); + $programs = Programs::query()->with(["appends", "video_pivots.video"])->limit(15)->orderByDesc("created_at")->get(); return view("program", [ "keyword" => $keyword, "programs"=>$programs, diff --git a/app/Models/ProgramTags.php b/app/Models/ProgramTags.php deleted file mode 100644 index bcce45f..0000000 --- a/app/Models/ProgramTags.php +++ /dev/null @@ -1,18 +0,0 @@ -belongsTo(Tags::class, "tag_id", "id"); - } - - public function program(): \Illuminate\Database\Eloquent\Relations\BelongsTo - { - return $this->belongsTo(Programs::class, "program_id", "id"); - } -} diff --git a/app/Models/Programs.php b/app/Models/Programs.php index df09b95..b0347dc 100644 --- a/app/Models/Programs.php +++ b/app/Models/Programs.php @@ -11,16 +11,6 @@ class Programs extends Model return $this->hasMany(ProgramAppends::class, "program_id", "id")->orderByDesc("is_original"); } - public function tag_pivots(): \Illuminate\Database\Eloquent\Relations\HasMany - { - return $this->hasMany(ProgramTags::class, "program_id", "id")->orderBy("id"); - } - - public function tags(): \Illuminate\Database\Eloquent\Relations\HasManyThrough - { - return $this->hasManyThrough(Tags::class, ProgramTags::class, "program_id", "id", "id", "tag_id"); - } - public function video_pivots(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(ProgramVideos::class, "program_id", "id"); diff --git a/app/Models/Tags.php b/app/Models/Tags.php deleted file mode 100644 index df43ee6..0000000 --- a/app/Models/Tags.php +++ /dev/null @@ -1,13 +0,0 @@ -hasManyThrough(Programs::class, ProgramTags::class, "tag_id", "id", "id", "program_id"); - } -} diff --git a/resources/views/program.blade.php b/resources/views/program.blade.php index 9ec0bf3..7174bde 100644 --- a/resources/views/program.blade.php +++ b/resources/views/program.blade.php @@ -15,7 +15,6 @@ 节目名称 - 节目标签 点播及追加 视频地址及位置 结束时的画面 @@ -25,11 +24,6 @@ @foreach($programs as $program) {{$program->name}} - - @foreach($program->tag_pivots as $tag_pivot) -
{{$tag_pivot->tag->name}}
- @endforeach - @foreach($program->appends as $append) @if($append->is_original)