From ff1fa5d79b358288508a46bf34b49879cac12a90 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 13 Dec 2023 15:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=BC=80=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=94=AF=E6=8C=81=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/diy/VisualConfig.php | 2 +-
 app/controller/api/Common.php                    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

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);
     }
 }