From 5de1fad1a631a0bca80b8d06e54419ccd4a19bf9 Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@qq.com>
Date: Fri, 4 Aug 2023 23:08:37 +0800
Subject: [PATCH] =?UTF-8?q?6=20=E7=AF=87=E6=8E=A8=E8=8D=90=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=8F=97=E5=88=B0=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5=E6=8E=A8=E8=8D=90=E5=BD=B1=E5=93=8D=EF=BC=8C=E5=8D=B3?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=8A=E6=97=A5=E6=8E=A8=E8=8D=90=E5=90=8E?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=8B=AC=E7=AB=8B=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0=E3=80=82=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=AF=E5=89=8D=E5=85=AD=E7=AF=87=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                            | 55 ++++++++++++------------
 templates/error/404.html                 |  2 +
 templates/modules/widgets/top-group.html |  6 +--
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 6096d590..f4435218 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -231,8 +231,6 @@ spec:
                 todayRecommendTitle:
                 todayRecommendCover:
                 todayRecommendxTitle:
-                recommendPost:
-                recommendPostCustom:
               children:
                 - $formkit: url
                   name: todayRecommendUrl
@@ -254,33 +252,33 @@ spec:
                   label: 背景图
                   placeholder: 请输入地址
                   value: https://liuzhihang.com/upload/hao_dark.jpg
-                - $formkit: select
-                  name: recommendPost
-                  id: recommendPost
-                  key: recommendPost
-                  label: 推荐文章
+            - $formkit: select
+              name: recommendPost
+              id: recommendPost
+              key: recommendPost
+              label: 推荐文章
+              value: latest
+              options:
+                - label: 最新文章
                   value: latest
-                  options:
-                    - label: 最新文章
-                      value: latest
-                    - label: 自定义
-                      value: custom
-                - $formkit: repeater
-                  if: $get(recommendPost).value === custom
-                  name: recommendPostCustom
-                  label: 自定义文章
-                  help: 建议设置六篇文章
-                  value: [ ]
-                  children:
-                    - $formkit: url
-                      name: url
-                      label: 链接
-                    - $formkit: text
-                      name: title
-                      label: 标题
-                    - $formkit: attachment
-                      name: cover
-                      label: 封面地址
+                - label: 自定义
+                  value: custom
+            - $formkit: repeater
+              if: $get(recommendPost).value === custom
+              name: recommendPostCustom
+              label: 自定义文章
+              help: 建议设置六篇文章
+              value: [ ]
+              children:
+                - $formkit: url
+                  name: url
+                  label: 链接
+                - $formkit: text
+                  name: title
+                  label: 标题
+                - $formkit: attachment
+                  name: cover
+                  label: 封面地址
 
     - group: layout
       label: 布局
@@ -2617,3 +2615,4 @@ spec:
                   label: 结束时间
                   placeholder: 请输入结束时间(小时)
                   help: 可以与开始时间相同，表示一个小时内的问候
+
diff --git a/templates/error/404.html b/templates/error/404.html
index 2ce067b6..ffb246f3 100644
--- a/templates/error/404.html
+++ b/templates/error/404.html
@@ -25,6 +25,8 @@
                     </div>
                 </div>
             </div>
+
+            <!-- 默认设置前 6 篇文章 -->
             <div class="aside-list">
                 <div class="aside-list-group"
                      th:with='topGroupPosts = ${postFinder.list(1,6)},
diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html
index aef07a51..9a5bbe62 100644
--- a/templates/modules/widgets/top-group.html
+++ b/templates/modules/widgets/top-group.html
@@ -7,7 +7,7 @@
 >
     <div class="recent-post-item"
          th:each="post : ${topGroupPosts}"
-         th:if="${#strings.equals(theme.config.top.BannerRight.todayRecommendContent.recommendPost, 'latest')}">
+         th:if="${#strings.equals(theme.config.top.BannerRight.recommendPost, 'latest')}">
 
         <div class="post_cover">
             <a th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
@@ -29,8 +29,8 @@
     </div>
     <!-- 自定义的文章右上角的推荐文章 -->
     <div class="recent-post-item"
-         th:each="cuscomPost : ${theme.config.top.BannerRight.todayRecommendContent.recommendPostCustom}"
-         th:if="${#strings.equals(theme.config.top.BannerRight.todayRecommendContent.recommendPost, 'custom')}">
+         th:each="cuscomPost : ${theme.config.top.BannerRight.recommendPostCustom}"
+         th:if="${#strings.equals(theme.config.top.BannerRight.recommendPost, 'custom')}">
         <div class="post_cover">
             <a th:href="@{${cuscomPost.url}}" th:title="${cuscomPost.title}">
                 <span class="recent-post-top-text"