From 624f76643cf53059ec79182722b8556d7b71f860 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Thu, 30 May 2024 05:52:30 +0800
Subject: [PATCH] =?UTF-8?q?1.2.2.2=E7=A7=BB=E9=99=A4=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E2=80=9C=E5=9B=BE=E7=89=87+=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E2=80=9D=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=94=B9=E4=B8=BA=E7=94=B1=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E4=BB=A3=E7=A0=81=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=8A=A0=E8=BD=BD=E5=A4=9A=E5=B9=BF=E5=91=8A=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                  | 20 --------------------
 templates/widget/ad_piece.html |  5 +----
 version                        |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index e2b8e48..1b24d1b 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -886,26 +886,6 @@ spec:
               label:  是
             - value: false
               label:  否
-        - $formkit: radio
-          name: ad_mode
-          label:  侧边栏广告-广告展示方法
-          help: '选择“自定义广告代码”时，必须在“侧边栏内容”中填写广告代码。'
-          value: true
-          options:
-            - value: true
-              label:  图片+链接
-            - value: false
-              label:  自定义广告代码
-        - $formkit: text
-          name: ad_target_url
-          label:  侧边栏广告-广告目标地址
-          placeholder: '请输入链接地址'
-          help: '填写广告跳转的目标路径。'
-        - $formkit: attachment
-          name: ad_image
-          label:  侧边栏广告-广告图片链接
-          placeholder: '请输入/选择图片路径'
-          help: '图片+链接模式时不能为空。'
         - $formkit: number
           name: recent_posts_num
           label:  侧边栏最近文章-展示文章数量
diff --git a/templates/widget/ad_piece.html b/templates/widget/ad_piece.html
index c4d75d5..5ef561a 100644
--- a/templates/widget/ad_piece.html
+++ b/templates/widget/ad_piece.html
@@ -1,10 +1,7 @@
 <div xmlns:th="https://www.thymeleaf.org"
      th:fragment="widget (sidebar)"
      th:class="'card widget ' + ${sidebar.hide}">
-  <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="${sidebar.content}"/>
+  <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"
                      xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path
diff --git a/version b/version
index 9b4b840..6392f18 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.2.1
\ No newline at end of file
+1.2.2.2
\ No newline at end of file