From f423135c6fa3355912c6665fce5afa99e3819ef1 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Tue, 2 Apr 2024 11:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=89=8D=E5=92=8C=E8=83=8C=E5=9B=BE=E7=9A=84=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=BC=A5=E8=A1=A5=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=93=BA=E6=BB=A1=E6=97=B6=E7=9A=84=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E8=A1=A8=E7=8E=B0=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=B8=80=E4=B8=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                | 10 ++++++++++
 src/css/style.less           | 11 -----------
 templates/widget/wechat.html |  5 +++--
 theme.yaml                   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index c2524e1..81df286 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -811,10 +811,20 @@ spec:
               name: wechat_img_face
               label: 公众号正面图
               placeholder: '请输入/选择公众号正面图路径'
+            - $formkit: color
+              name: wechat_img_face_color
+              label: 公众号正面图背景色
+              help: 用于填充图片无法铺满部分的颜色。
+              value: '#07c261'
             - $formkit: attachment
               name: wechat_img_back
               label: 公众号背面图
               placeholder: '请输入/选择公众号背面图路径'
+            - $formkit: color
+              name: wechat_img_back_color
+              label: 公众号背面图背景色
+              help: 用于填充图片无法铺满部分的颜色。
+              value: '#ffffff'
         - $formkit: attachment
           name: love_oneself_avatar
           label: 侧边栏恋爱墙-自己的头像
diff --git a/src/css/style.less b/src/css/style.less
index 757090b..0645f1f 100644
--- a/src/css/style.less
+++ b/src/css/style.less
@@ -3545,7 +3545,6 @@ button.swiper-pagination-bullet {
     line-height: 1.7em;
     margin-bottom: 14px;
     padding: 8px 15px;
-    //color: var(--dark-b);
     color: var(--dark-c);
     background: var(--bg-h);
     border-left: 5px solid var(--theme);
@@ -3586,16 +3585,6 @@ button.swiper-pagination-bullet {
           }
         }
 
-        //&  ul {
-        //  &:not(:last-child) {
-        //    margin-bottom: 4px !important;
-        //  }
-        //
-        //  &:last-child {
-        //    margin-bottom: 0px !important;
-        //  }
-        //}
-
         p:not(:last-child) {
           margin-bottom: 4px !important;
         }
diff --git a/templates/widget/wechat.html b/templates/widget/wechat.html
index 75b2811..661230f 100644
--- a/templates/widget/wechat.html
+++ b/templates/widget/wechat.html
@@ -8,10 +8,11 @@
         th:href="${!#strings.isEmpty(wechatUrl) ? wechatUrl : (!#strings.isEmpty(faceImg) ? faceImg : (!#strings.isEmpty(backImg) ? backImg : '#'))}"
         th:onclick="${#strings.isEmpty(wechatUrl)} ? 'event.preventDefault();'" target="_blank">
         <div th:class="${!#strings.isEmpty(faceImg) && !#strings.isEmpty(backImg) ? 'flip-content animation' : 'flip-content'}">
-            <div class="wechatFace">
+            <div class="wechatFace" th:style="|background-color: ${theme.config.sidebar.wechat.wechat_img_face_color};|">
                 <img th:if="${!#strings.isEmpty(faceImg)}" height="auto" width="auto" th:src="${faceImg}" alt="微信公众号"/>
             </div>
-            <div th:class="${!#strings.isEmpty(faceImg) && !#strings.isEmpty(backImg) ? 'wechatBack animation' : 'wechatBack'}" th:classappend="${#strings.isEmpty(faceImg)}? 'show'">
+            <div th:class="${!#strings.isEmpty(faceImg) && !#strings.isEmpty(backImg) ? 'wechatBack animation' : 'wechatBack'}" th:classappend="${#strings.isEmpty(faceImg)}? 'show'"
+                 th:style="|background-color: ${theme.config.sidebar.wechat.wechat_img_back_color};|">
                 <img th:if="${!#strings.isEmpty(backImg)}" height="auto" width="auto" th:src="${backImg}" alt="微信公众号"/>
             </div>
         </div>
diff --git a/theme.yaml b/theme.yaml
index a97ae85..4bbebe0 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -22,6 +22,6 @@ spec:
   settingName: theme-dream-setting
   configMapName: theme-dream-configMap
   # 版本号
-  version: 1.0.3.23
+  version: 1.0.3.24
   # 最低支持的 Halo 版本
   require: ">=2.6.0"
\ No newline at end of file