Merge pull request #18 from liuzhihang/dev

fix 推荐专栏不能使用
chengzhongxue · Dec 4, 2022 · 47a3e48 · 47a3e48
2 parents 02cf268 + 6ba4b1d
commit 47a3e48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-hao",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "dependencies": {
   }
 }
diff --git a/settings.yaml b/settings.yaml
@@ -88,17 +88,20 @@ spec:
           label: 必看精选
           placeholder: 请输入地址
           validation: "url"
+          value: "/"
         - $formkit: url
           if: "$get(recentTop).value"
           name: remen
           label: 热门文章
           placeholder: 请输入地址
+          value: "/"
           validation: "url"
         - $formkit: url
           if: "$get(recentTop).value"
           name: shiyong
           label: 实用教程
           placeholder: 请输入地址
+          value: "/"
           validation: "url"
         - $formkit: radio
           if: "$get(recentTop).value"

diff --git a/templates/modules/widgets/banner-group.html b/templates/modules/widgets/banner-group.html
@@ -163,19 +163,19 @@
     <div class="categoryGroup">
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-blue)">
             <a class="categoryButton CB1 bikan"
-               th:href="@{${#strings.isEmpty(theme.config.top.bikan)? theme.config.top.bikan : 'javascript:void(0);'}}">
+               th:href="@{${theme.config.top.bikan}}">
                 <span class="categoryButtonText">必看精选</span><i class="iconfont icon-book"></i>
             </a>
         </div>
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-red)">
             <a class="categoryButton remen"
-               th:href="@{${#strings.isEmpty(theme.config.top.remen)? theme.config.top.remen : 'javascript:void(0);'}}">
+               th:href="@{${theme.config.top.remen}}">
                 <span class="categoryButtonText">热门文章</span><i class="iconfont icon-burn"></i>
             </a>
         </div>
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-green)">
             <a class="categoryButton shiyong"
-               th:href="@{${#strings.isEmpty(theme.config.top.shiyong)? theme.config.top.shiyong : 'javascript:void(0);'}}">
+               th:href="@{${theme.config.top.shiyong}}">
                 <span class="categoryButtonText">实用教程</span><i class="iconfont icon-book"></i>
             </a>
         </div>

diff --git a/theme.yaml b/theme.yaml
@@ -13,5 +13,5 @@ spec:
   repo: 'https://github.com/liuzhihang/halo-theme-hao'
   settingName: "theme-hao-setting"
   configMapName: "theme-hao-configMap"
-  version: 1.0.0
+  version: 1.0.1
   require: 2.0.0