Merge remote-tracking branch 'origin/main'

# Conflicts:
#	templates/assets/js/heo.js
#	templates/assets/zhheo/blogex.js

README.md

@@ -15,7 +15,7 @@
 <!-- 快捷导航 -->
 <p align="center">
 
-[主题预览](#-预览) | [快速上手](#-安装) | [使用文档](https://docs.liuzhihang.com) | [加入我们](#-讨论)
+[主题预览](#-预览) | [快速上手](#-安装) | [使用文档](https://www.yuque.com/liuzhihangs/halo-theme-hao) | [加入我们](#-讨论)
 
 </p>
 </div>

templates/assets/js/heo.js

@@ -77,7 +77,6 @@ var heo = {
             htmlText += `<a class='footer-item' href='${item.spec.url}'  target="_blank" rel="noopener nofollow">${item.spec.displayName}</a>`;
         }
         htmlText += `<a class='footer-item' href='${linksUrl}'>更多</a>`
-        document.getElementById("friend-links-in-footer").innerHTML = htmlText;
         if(document.getElementById("friend-links-in-footer")){
             document.getElementById("friend-links-in-footer").innerHTML = htmlText;
         }

templates/assets/zhheo/blogex.js

@@ -660,6 +660,7 @@ function initBlog() {
     heo.stopImgRightDrag(),
     heo.onlyHome(),
     heo.addNavBackgroundInit(),
+    heo.reflashEssayWaterFall(),
     heo.darkModeStatus(),
     heo.initThemeColor(),
     //隐藏加载动画
@@ -859,8 +860,13 @@ document.addEventListener('pjax:send', function () {
         heo.showLoading();
     }
 
-})
-document.addEventListener('DOMContentLoaded', function () {
-    heo.reflashEssayWaterFall()
+
 })
 
+document.addEventListener('DOMContentLoaded', function () {
+    //页脚友联
+    if(GLOBAL_CONFIG.isFriendLinksInFooter){
+        heo.addFriendLinksInFooter()
+    }
+    heo.reflashEssayWaterFall()
+})

templates/moments.html

@@ -62,7 +62,6 @@
                     </section>
                     <!--  分页还没写 -->
                 </div>
-                <script>heo.reflashEssayWaterFall();</script>
                 <hr/>
                 <!--/* 评论组件 */-->
                 <th:block