update v1.1.7 from upstream #2

Merged
zhengyi merged 42 commits from merge into main 2023-12-15 16:58:32 +08:00
2 changed files with 20 additions and 2 deletions
Showing only changes of commit 856a07cc90 - Show all commits

View File

@ -1876,6 +1876,15 @@ spec:
label: 微信二维码
value: ""
help: "打赏用的微信收款二维码链接,不填不显示"
- $formkit: attachment
# if: "$get(enable_donate).value === true"
name: qrcode_qq
label: QQ二维码
value: ""
help: "打赏用的QQ收款二维码链接不填不显示"
- group: tags
label: 标签页
formSchema:

View File

@ -7,10 +7,19 @@
<ol class="joe_donate_list"
th:classappend="${theme.config.post.qrcode_zfb != '' && theme.config.post.qrcode_wx != '' ?'two':''}">
<th:block th:if="${theme.config.post.qrcode_zfb}">
<li><img th:src="${theme.config.post.qrcode_zfb}" alt="qrcode alipay"/></li>
<li>
<p>支付宝打赏</p>
<img th:src="${theme.config.post.qrcode_zfb}" alt="qrcode alipay"/></li>
</th:block>
<th:block th:if="${theme.config.post.qrcode_wx}">
<li><img th:src="${theme.config.post.qrcode_wx}" alt="qrcode weixin"/></li>
<li>
<p>微信打赏</p>
<img th:src="${theme.config.post.qrcode_wx}" alt="qrcode weixin"/></li>
</th:block>
<th:block th:if="${theme.config.post.qrcode_qq}">
<li>
<p>QQ打赏</p>
<img th:src="${theme.config.post.qrcode_qq}" alt="qrcode qq"/></li>
</th:block>
</ol>
</th:block>