From 4733e920878b3ff4a28664e9c2c7f60b13eb4448 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Sat, 14 Oct 2023 16:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9D=83=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=80=E6=B2=A1=E6=9C=89=E7=BB=99=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                                 | 12 ++++--------
 templates/modules/layouts/layout.html         |  2 +-
 templates/modules/widgets/aside/comments.html |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 9eeca749..9236de73 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1201,15 +1201,14 @@ spec:
           name: post_edit
           label: 运营模式与责任
           value:
-            enable_post_edit:
-            post_edit_url:
+            enable_post_edit: false
+            post_edit_url: "/rss"
           children:
             - $formkit: radio
               name: enable_post_edit
               id: enable_post_edit
               key: enable_post_edit
               help: 启用文章运营模式与责任，请正确填写链接
-              value: false
               options:
                 - label: 启用
                   value: true
@@ -1220,7 +1219,6 @@ spec:
               if: $get(enable_post_edit).value
               label: 运营模式与责任地址
               placeholder: 请输入运营模式与责任地址
-              value: /rss
         - $formkit: group
           name: share_right
           label: 分享按钮
@@ -2070,18 +2068,16 @@ spec:
             name:
             wxPay:
             alipay:
-            enable_reward_wz:
-            reward_md_url:
+            enable_reward_wz: false
+            reward_md_url: "/about"
           children:
             - $formkit: url
               name: reward_md_url
               label: 名单地址
               placeholder: 请输入赞赏者名单地址
-              value: /about
             - $formkit: radio
               name: enable_reward_wz
               label: 文章页面打赏
-              value: false
               options:
                 - label: 启用
                   value: true
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html
index 964132f7..53e990f5 100644
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@@ -138,7 +138,7 @@
         let pjaxSelectors = ['title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax','#site-config']
 
         pjaxSelectors.unshift('meta[property="og:type"]','meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]', 'meta[property="og:description"]'
-                , 'meta[name="twitter:card"]', 'meta[name="twitter:title"]', 'meta[name="twitter:url"]', 'meta[name="twitter:description"]', 'meta[name="twitter:image"]')
+                , 'meta[name="twitter:title"]', 'meta[name="twitter:url"]', 'meta[name="twitter:description"]', 'meta[name="twitter:image"]')
 
         var pjax = new Pjax({
             elements: 'a:not([target="_blank"])',
diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html
index 592ee767..1e6517db 100644
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@@ -10,7 +10,7 @@
     <div class="item-headline"><i class="haofont hao-icon-comments"></i><span>最新评论</span></div>
     <div class="aside-list" id="newcomm">
         <th:block th:if="${#strings.equals(theme.config.comments.use, 'commentWidget') }"
-                  th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ?  theme.config.sidebar.newcommentnumber : 5}">
+                  th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ?  theme.config.sidebar.newcomment.newcommentnumber : 5}">
             <div th:each="comment,iterStat : ${commentFinder.list(null, 1, newcommentnumber)}" class="aside-list-item"
                  th:with="page = ${comment.spec.subjectRef.kind == 'Post' ? postFinder.getByName(comment.spec.subjectRef.name) :
                 comment.spec.subjectRef.kind == 'SinglePage' && not #strings.contains('photos,links,moments,equipment', comment.spec.subjectRef.name) ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},