From 4d694f781989e06a296d4f0e7297875bf4675fb0 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Fri, 29 Nov 2024 12:20:56 +0800
Subject: [PATCH] list by date done

---
 themes/beauty/views/list/bydate.php | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/themes/beauty/views/list/bydate.php b/themes/beauty/views/list/bydate.php
index e24ff17..f110e71 100644
--- a/themes/beauty/views/list/bydate.php
+++ b/themes/beauty/views/list/bydate.php
@@ -22,6 +22,7 @@ $selectedId = $viewData['para_year'];
 if (!empty($viewData['para_month'])) {
     $selectedId = $viewData['para_month'];
 }
+
 ?><!-- 顶部导航栏模块 -->
 <nav class="navbar navbar-default navbar-fixed-top navbarJS">
     <div class="container-fluid">
@@ -177,11 +178,16 @@ eof;
 
 
         //显示图片、视频、音乐
-        foreach($cacheData as $month => $files) {        //按月份输出
+        $allFiles = [];
+        foreach($cacheData as $month => $files) {
+        	$allFiles = array_merge($allFiles, $files);
+        }
+
+        if(!empty($allFiles)) {        //输出所有文件
             $pageStartIndex = ($viewData['page']-1) * $viewData['pageSize'];
             $index = 0;
 
-            foreach ($files as $file) {
+            foreach ($allFiles as $file) {
                 if (empty($file['extension']) || !in_array($file['extension'], $supportedExts)) {
                     continue;
                 }
@@ -283,7 +289,7 @@ eof;
                     if (!empty($file['snapshot'])) {
                         $snapshot = $file['snapshot'];
                     }else {     //尝试找出同名的图片文件
-                        $matchedImage = Html::searchImageByFilename($file['filename'], $viewData['allFiles'], $imgExts);
+                        $matchedImage = Html::searchImageByFilename($file['filename'], $allFiles, $imgExts);
                         if (!empty($matchedImage)) {
                             $snapshot = $matchedImage['path'];
                         }
@@ -309,7 +315,18 @@ eof;
             }
         }
 ?>
-	</div>
+	</div><!--im_mainl-->
+</div><!--img_main-->
 
+<div class="text-center">
+<?php
+if ($total > $viewData['pageSize']) {
+    $pagination = Html::getPaginationHtmlCode($viewData['page'], $viewData['pageSize'], $total);
+    echo $pagination;
+}
+?>
+</div>
 
-</div>
\ No newline at end of file
+<script type="text/template" id="btn_show1to1_tmp">
+    <button title="Toggle zoom 1 to 1" class="f-button"><svg tabindex="-1" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M3.51 3.07c5.74.02 11.48-.02 17.22.02 1.37.1 2.34 1.64 2.18 3.13 0 4.08.02 8.16 0 12.23-.1 1.54-1.47 2.64-2.79 2.46-5.61-.01-11.24.02-16.86-.01-1.36-.12-2.33-1.65-2.17-3.14 0-4.07-.02-8.16 0-12.23.1-1.36 1.22-2.48 2.42-2.46Z"></path><path d="M5.65 8.54h1.49v6.92m8.94-6.92h1.49v6.92M11.5 9.4v.02m0 5.18v0"></path></svg></button>
+</script>
\ No newline at end of file