Merge pull request #228 from jiewenhuang/dev

fix:图片重复加载问题
jiewenhuang · Mar 7, 2024 · e694d26 · e694d26
2 parents 12221a1 + e4435ea
commit e694d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/templates/photos.html b/templates/photos.html
@@ -32,15 +32,13 @@
                 <div class="wrapper">
                     <div class="grid" id="image-grid" th:data-total="${photos.totalPages}" th:data-index="${photos.page}">
                         <!-- 预留空间 -->
-                        <th:block th:each="group : ${groups}">
-                        <div class="grid-item wow fadeIn" th:each="photo : ${group.photos}" th:data-sjsel="${group.metadata.name}">
+                        <div class="grid-item wow fadeIn" th:each="photo : ${photos.items}" th:data-sjsel="${photo.spec.groupName}">
                             <div class="card__picture">
                                 <a class="item animated wow jg-entry" th:href="${photo.spec.url}" data-fancybox="gallery">
                                     <img class="lazy-load" th:data-src="${photo.spec.url}" th:alt="${photo.spec.displayName}" th:src="@{/assets/img/photo_loading.gif}">
                                 </a>
                             </div>
                         </div>
-                        </th:block>
                     </div>
                     <th:block th:replace="~{modules/macro/loading :: loading}"/>
                 </div>

diff --git a/theme.yaml b/theme.yaml
@@ -13,7 +13,7 @@ spec:
   repo: "https://github.com/jiewenhuang/halo-theme-joe3.0"
   settingName: "theme-Joe-setting"
   configMapName: "theme-Joe-configMap"
-  version: "1.2.1"
+  version: "1.2.2"
   require: ">=2.11.0"
   customTemplates:
     page: