李帅

1.微调一下接口,打印参数

...@@ -18,7 +18,7 @@ class TemplateTable extends LazyRenderable ...@@ -18,7 +18,7 @@ class TemplateTable extends LazyRenderable
18 public function grid(): Grid 18 public function grid(): Grid
19 { 19 {
20 return Grid::make(new VideoTemp(), function (Grid $grid) { 20 return Grid::make(new VideoTemp(), function (Grid $grid) {
21 - $grid->model()->with(['componentsTable']); 21 + $grid->model()->with(['componentsTable'])->where("state",1);
22 $grid->column('id', 'ID')->sortable(); 22 $grid->column('id', 'ID')->sortable();
23 $grid->column('title'); 23 $grid->column('title');
24 $grid->column('','组件信息') 24 $grid->column('','组件信息')
......
...@@ -57,7 +57,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -57,7 +57,7 @@ class AdminMakeImmerse implements ShouldQueue
57 57
58 // 素材准备 58 // 素材准备
59 $drawtext = $this->getTextContentString(); 59 $drawtext = $this->getTextContentString();
60 - $watermark = $this->getAbsolutePath('ffmpeg/LOGO_eng.png'); 60 + $watermark = $this->getAbsolutePath('images/LOGO_eng.png');
61 $is_bgm = $template->bg_music; 61 $is_bgm = $template->bg_music;
62 $bgm = $this->getAbsolutePath($template->bgm_url); 62 $bgm = $this->getAbsolutePath($template->bgm_url);
63 63
......