From 6582a13a67bf5f8e4510a65798295e1957b15121 Mon Sep 17 00:00:00 2001
From: master1lan <278457198@qq.com>
Date: Thu, 16 Mar 2023 13:42:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20fix(custom):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=9B=BE=E7=89=87=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=B6=E9=A1=B5=E9=9D=A2=E5=81=8F=E7=A7=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routers/photo/masonry.tsx | 43 ++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/routers/photo/masonry.tsx b/src/routers/photo/masonry.tsx
index 83ff061..9b29d88 100644
--- a/src/routers/photo/masonry.tsx
+++ b/src/routers/photo/masonry.tsx
@@ -80,38 +80,35 @@ export default function Masonry(props: PhotoRouterMasonryType) {
 
   return (
     <div className={styles["container"]}>
-      <Fade in={!isLoading} className={`${!isLoading ? "" : "hidden"}`}>
-        <div>
-          {!isLoading && (
+      {isLoading ? (
+        <Fade in={isLoading}>
+          <div>
             <Masonic_masonry
-              items={lists}
+              items={loadingLists}
               maxColumnCount={5}
               {...minCount}
               columnGutter={md ? 5 : 10}
               rowGutter={md ? 5 : 10}
               columnWidth={200}
-              render={PhotoCard}
+              render={PhotoLoadingItem}
               overscanBy={Infinity}
               className={styles["container"]}
             />
-          )}
-        </div>
-      </Fade>
-      <Fade in={isLoading} className={`${isLoading ? "" : "hidden"}`}>
-        <div>
-          <Masonic_masonry
-            items={loadingLists}
-            maxColumnCount={5}
-            {...minCount}
-            columnGutter={md ? 5 : 10}
-            rowGutter={md ? 5 : 10}
-            columnWidth={200}
-            render={PhotoLoadingItem}
-            overscanBy={Infinity}
-            className={styles["container"]}
-          />
-        </div>
-      </Fade>
+          </div>
+        </Fade>
+      ) : (
+        <Masonic_masonry
+          items={lists}
+          maxColumnCount={5}
+          {...minCount}
+          columnGutter={md ? 5 : 10}
+          rowGutter={md ? 5 : 10}
+          columnWidth={200}
+          render={PhotoCard}
+          overscanBy={Infinity}
+          className={styles["container"]}
+        />
+      )}
     </div>
   );
 }

From e8ea1e542f26dc0a31348fb87d82cf9e69f2a691 Mon Sep 17 00:00:00 2001
From: master1lan <master1lan@vtb.link>
Date: Thu, 16 Mar 2023 05:47:17 +0000
Subject: [PATCH 2/2] chore(release): 1.2.5

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ed4cde..aa1b835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## 1.2.5 (2023-03-16)
+
+
+### 🐛 Bug Fixes
+
+* **custom**: 修复跳转到图片页面时页面偏移问题 ([6582a13](https://vlink.dev/EOEFANS/eoefans-web/commits/6582a13))
+
+
+
 ## 1.2.4 (2023-03-16)
 
 
diff --git a/package.json b/package.json
index 2ac299a..04c0640 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eoefans-web",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "type": "module",
   "scripts": {
     "dev": "vite --config ./config/vite.dev.config.ts",