From 2cc26b98b0d5ae34e4f2d19d860ceeda1c65a4e2 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Sun, 28 Apr 2024 21:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=A7=BB=E9=99=A4=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BB=A3=E7=A0=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E2=80=9C=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E2=80=9D=E6=97=B6=EF=BC=8C=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E5=9C=A8=E2=80=9C=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E2=80=9D=E4=B8=AD=E5=A1=AB=E5=86=99=E5=B9=BF=E5=91=8A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                  | 10 ++--------
 templates/widget/ad_piece.html |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index c5e0904..3997532 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -688,7 +688,7 @@ spec:
               height: 100px
               label: 侧边栏内容
               placeholder: 请输入 HTML 内容
-              help: '非必填，仅在侧边栏类型为公告、自定义时生效。'
+              help: '非必填，仅在侧边栏类型为公告、广告(自定义广告代码)、自定义时生效。'
         - $formkit: radio
           name: enable_color_character
           label:  侧边栏信息-开启彩字切换
@@ -879,6 +879,7 @@ spec:
         - $formkit: radio
           name: ad_mode
           label:  侧边栏广告-广告展示方法
+          help: '选择“自定义广告代码”时，必须在“侧边栏内容”中填写广告代码。'
           value: true
           options:
             - value: true
@@ -895,13 +896,6 @@ spec:
           label:  侧边栏广告-广告图片链接
           placeholder: '请输入/选择图片路径'
           help: '图片+链接模式时不能为空。'
-        - $formkit: code
-          name: ad_custom_code
-          label:  侧边栏广告-自定义广告代码
-          language: html
-          height: 240px
-          placeholder: '请输入广告代码'
-          help: '在这里黏贴广告联盟提供的广告代码，自定义广告代码模式时不能为空。'
         - $formkit: number
           name: recent_posts_num
           label:  侧边栏最近文章-展示文章数量
diff --git a/templates/widget/ad_piece.html b/templates/widget/ad_piece.html
index 6bbe0ed..c4d75d5 100644
--- a/templates/widget/ad_piece.html
+++ b/templates/widget/ad_piece.html
@@ -4,7 +4,7 @@
   <a th:if="${theme.config.sidebar.ad_mode}" target="_blank" th:href="${theme.config.sidebar.ad_target_url}">
     <img width="100%" th:src="${theme.config.sidebar.ad_image}" alt="广告"/>
   </a>
-  <th:block th:unless="${theme.config.sidebar.ad_mode}" th:utext="${theme.config.sidebar.ad_custom_code}"/>
+  <th:block th:unless="${theme.config.sidebar.ad_mode}" 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"
                      xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path