From 0e738acbec794186b7afd1f27b9f116734e4c648 Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@qq.com>
Date: Sat, 19 Nov 2022 19:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8E=A7=E5=88=B6=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5=E6=8E=A8=E8=8D=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                               | 44 ++++++++++++---------
 templates/modules/widgets/banner-group.html |  2 +-
 templates/modules/widgets/top-group.html    |  6 +--
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 95c3784f..ab1d3d91 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -140,6 +140,8 @@ spec:
         - $formkit: radio
           if: "$get(recentTop).value"
           name: todayRecommend
+          id: todayRecommend
+          key: todayRecommend
           label: 今日推荐
           value: false
           options:
@@ -147,24 +149,30 @@ spec:
               value: true
             - label: 隐藏
               value: false
-        - $formkit: url
-          if: "$get(recentTop).value"
-          name: todayRecommendUrl
-          label: 今日推荐跳转地址
-          placeholder: 请输入地址
-          validation: "url"
-        - $formkit: text
-          if: "$get(recentTop).value"
-          name: todayRecommendTitle
-          label: 今日推荐标题
-          placeholder: 请输入标题
-          value: "今日推荐"
-        - $formkit: url
-          if: "$get(recentTop).value"
-          name: todayRecommendCover
-          label: 今日推荐背景图
-          placeholder: 请输入地址
-          validation: "url"
+        - $formkit: group
+          if: "$get(todayRecommend).value"
+          name: todayRecommendContent
+          label: 公众号
+          value:
+            todayRecommendUrl:
+            todayRecommendTitle:
+            todayRecommendCover:
+          children:
+            - $formkit: url
+              name: todayRecommendUrl
+              label: 今日推荐跳转地址
+              placeholder: 请输入地址
+              validation: "url"
+            - $formkit: text
+              name: todayRecommendTitle
+              label: 今日推荐标题
+              placeholder: 请输入标题
+              value: "今日推荐"
+            - $formkit: url
+              name: todayRecommendCover
+              label: 今日推荐背景图
+              placeholder: 请输入地址
+              validation: "url"
 
     - group: layout
       label: 布局
diff --git a/templates/modules/widgets/banner-group.html b/templates/modules/widgets/banner-group.html
index c50e37b1..c4c0467e 100644
--- a/templates/modules/widgets/banner-group.html
+++ b/templates/modules/widgets/banner-group.html
@@ -13,7 +13,7 @@
                  th:utext="${theme.config.top.bannersTitleSmall}"></div>
         </div>
 
-        <!--  改成后台动态可配置-->
+        <!--  后台可配置，未配置时使用默认值-->
         <div class="tags-group-all">
             <div class="tags-group-wrapper" th:if="${#lists.isEmpty(theme.config.top.bannersIconPair)}">
                 <div class="tags-group-icon-pair">
diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html
index a69395e5..a0267265 100644
--- a/templates/modules/widgets/top-group.html
+++ b/templates/modules/widgets/top-group.html
@@ -24,13 +24,13 @@
     <!-- 今日推荐 -->
     <div class="todayCard" id="todayCard"
          th:if="${theme.config.top.todayRecommendSwitch}"
-         th:onclick="'window.open('+ ${theme.config.top.todayRecommendUrl} +')'">
+         th:onclick="'window.open('+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +')'">
         <div class="todayCard-info">
             <div class="todayCard-tips">今日推荐</div>
-            <div class="todayCard-title" th:text="${theme.config.top.todayRecommendTitle}"></div>
+            <div class="todayCard-title" th:text="${theme.config.top.todayRecommendContent.todayRecommendTitle}"></div>
         </div>
         <div class="todayCard-cover"
-             th:style="'background:url('+ ${theme.config.top.todayRecommendCover} +') no-repeat center/cover'">
+             th:style="'background:url('+ ${theme.config.top.todayRecommendContent.todayRecommendCover} +') no-repeat center/cover'">
         </div>
         <div class="banner-button-group">
             <a class="banner-button" onclick="window.event.cancelBubble=!0;heo.hideTodayCard()">