From b4685639ca27e1f76491e33609e91653a3388e0a Mon Sep 17 00:00:00 2001
From: mjsoftware <1406993111@qq.com>
Date: Fri, 17 Jan 2025 10:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8E=A7=E5=88=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B0=E4=BE=A7=E8=BE=B9=E6=A0=8F=E7=BB=84=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                  | 40 +++++++++++++++++-----------------
 templates/widget/ad_piece.html |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index dffa0ec..a1280de 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -771,6 +771,26 @@ spec:
               label: 侧边栏内容
               placeholder: 请输入 HTML 内容
               help: '非必填，仅在侧边栏类型为公告、广告、自定义时生效。'
+            - $formkit: select
+              name: show_ad_tag
+              if: $value.type === 'ad_piece'
+              label: 侧边栏广告-显示“广告”标签
+              value: true
+              options:
+                - value: true
+                  label: 显示
+                - value: false
+                  label: 不显示
+            - $formkit: select
+              name: ad_tag_close
+              if: $value.type === 'ad_piece'
+              label: 侧边栏广告-点击“广告”标签可关闭广告
+              value: true
+              options:
+                - value: true
+                  label: 是
+                - value: false
+                  label: 否
         - $formkit: radio
           name: enable_color_character
           label: 侧边栏信息-开启彩字切换
@@ -940,26 +960,6 @@ spec:
             type="playlist"
             id="7355014621"
           help: '输入音乐参数配置(id / server / type必填)，详细配置方式见官方文档：https://github.com/metowolf/MetingJS/'
-        - $formkit: radio
-          name: show_ad_tag
-          label: 侧边栏广告-显示“广告”标签
-          help: '控制所有“广告模块”的显示广告标签功能。'
-          value: true
-          options:
-            - value: true
-              label: 显示
-            - value: false
-              label: 不显示
-        - $formkit: radio
-          name: ad_tag_close
-          label: 侧边栏广告-点击“广告”标签可关闭广告
-          help: '控制所有“广告模块”的关闭广告功能。'
-          value: true
-          options:
-            - value: true
-              label: 是
-            - value: false
-              label: 否
         - $formkit: number
           name: recent_posts_num
           label: 侧边栏最近文章-展示文章数量
diff --git a/templates/widget/ad_piece.html b/templates/widget/ad_piece.html
index 5ef561a..f54a32b 100644
--- a/templates/widget/ad_piece.html
+++ b/templates/widget/ad_piece.html
@@ -2,8 +2,8 @@
      th:fragment="widget (sidebar)"
      th:class="'card widget ' + ${sidebar.hide}">
   <th:block th:utext="${sidebar.content}"/>
-  <span th:if="${theme.config.sidebar.show_ad_tag}" class="ad-tag">广告
-                <svg th:if="${theme.config.sidebar.ad_tag_close}" class="click-close" data-close=".widget"
+  <span th:if="${sidebar.show_ad_tag}" class="ad-tag">广告
+                <svg th:if="${sidebar.ad_tag_close}" class="click-close" data-close=".widget"
                      xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path
                   d="M3.25,3.25l8.5,8.5M11.75,3.25l-8.5,8.5"></path></svg>
             </span>