diff --git a/app/controller/admin/system/diy/VisualConfig.php b/app/controller/admin/system/diy/VisualConfig.php index 297226d..b0b651a 100644 --- a/app/controller/admin/system/diy/VisualConfig.php +++ b/app/controller/admin/system/diy/VisualConfig.php @@ -68,7 +68,7 @@ class VisualConfig extends BaseController $group = $groupRepository->getWhere(['group_key' => $key]); $data = app()->make(GroupDataRepository::class)->getGroupDataLst($this->request->merId(),$group->group_id,$page, $limit); if ($key == 'open_screen_advertising') { - $data['config'] = systemConfig(['open_screen_switch','open_screen_time','open_screen_space']); + $data['config'] = systemConfig(['open_screen_switch','open_screen_time','open_screen_space','open_screen_type','open_screen_video']); } return app('json')->success($data); } diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php index b532830..5942615 100644 --- a/app/controller/api/Common.php +++ b/app/controller/api/Common.php @@ -552,7 +552,13 @@ class Common extends BaseController $key = ['open_screen_advertising']; $group = app()->make(GroupRepository::class)->getSearch([])->where('group_key','in',$key)->find(); $data= app()->make(GroupDataRepository::class)->getGroupDataLst($this->request->merId(),$group->group_id,1, 10); - $data['config'] = systemConfig(['open_screen_switch','open_screen_time','open_screen_space']); + $data['config'] = systemConfig(['open_screen_switch','open_screen_time','open_screen_space','open_screen_type','open_screen_video']); + if($data['config']['open_screen_type'] == 1){ + $data['type'] = 'video'; + $data['video_link'] = $data['config']['open_screen_video'] ?? ''; + } + + return app('json')->success($data); } }