From 294849a11156d1079679282c316713312d2d85be Mon Sep 17 00:00:00 2001
From: mackt <1033530438@qq.com>
Date: Tue, 30 Apr 2024 13:04:15 +0800
Subject: [PATCH] =?UTF-8?q?update(vol):=201.=20padding-top=202.=20?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=203.=20?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/vol/[journalId]/page.tsx              | 65 +++++++++----------
 src/components/Journal/JournalCard.tsx        |  6 +-
 .../JournalDetail/VolDetailCoverCard.tsx      |  2 +-
 .../Journal/JournalList/VolListCoverCard.tsx  |  2 +-
 4 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/app/vol/[journalId]/page.tsx b/src/app/vol/[journalId]/page.tsx
index 044906b..cc80197 100644
--- a/src/app/vol/[journalId]/page.tsx
+++ b/src/app/vol/[journalId]/page.tsx
@@ -34,52 +34,45 @@ export default async function JournalDetail({
   }
 
   return (
-    <main className="w-[1200px] mx-auto flex flex-row justify-between pt-[145px]">
+    <main className="w-[1200px] mx-auto flex flex-row justify-between pt-[120px]">
       <div className="w-[712px]">
         {/* 封面 */}
         <VolDetailCoverCard journalInfo={journalInfo} songList={songList} />
-        {/* 期刊号 & 标签 */}
-        <div className="flex flex-row items-center gap-[9px] mt-[30px]">
-          <div className="text-[rgba(0,0,0,0.7)] text-[14px] leading-[19.6px]">{`VOL.${journalInfo?.journalNo.toString().padStart(4, '0')}`}</div>
-          {journalInfo?.tags.length > 0 &&
-            journalInfo.tags.map((tag: string) => (
-              // <Link
-              //   href={`/music/${tag}`}
-              //   key={tag}
-              //   className="block w-auto py-[3px] px-[10px] rounded-[15px] bg-[rgba(0,0,0,0.05)] text-[rgba(0,0,0,0.7)] text-[12px] leading-[12px]"
-              // >
-              //   {tag}
-              // </Link>
+        <div className="flex justify-between items-center w-full  mt-[30px]">
+          {/* 期刊号 & 标签 */}
+          <div className="flex flex-row items-center gap-[9px]">
+            <div className="text-[rgba(0,0,0,0.7)] text-14px leading-20px">{`VOL.${journalInfo?.journalNo.toString().padStart(4, '0')}`}</div>
+            {journalInfo?.tags.length > 0 &&
+              journalInfo.tags.map((tag: string) => (
+                <span
+                  key={tag}
+                  className="block w-fit py-[3px] px-[10px] rounded-[15px] bg-[rgba(0,0,0,0.05)] text-[rgba(0,0,0,0.7)] text-[12px] leading-[12px]"
+                >
+                  {tag}
+                </span>
+              ))}
+          </div>
 
-              <span
-                key={tag}
-                className="block w-fit py-[3px] px-[10px] rounded-[15px] bg-[rgba(0,0,0,0.05)] text-[rgba(0,0,0,0.7)] text-[12px] leading-[12px]"
-              >
-                {tag}
-              </span>
-            ))}
+          {/* 收藏期刊 */}
+          <CollectButton
+            showText
+            id={journalInfo.id}
+            active={journalInfo.haveCollect}
+            count={journalInfo.userCollectCount}
+            text="人收藏"
+            collectType="1"
+            iconPosition="right"
+            gap={9}
+          />
         </div>
 
         <div className="flex flex-row justify-between w-full h-auto">
           {/* 标题 */}
           <div className="w-full">
-            <div className="flex flex-row justify-between items-center w-full h-auto">
-              <div className="w-autp text-[24px] leading-[33.6px] my-[9px] text-base font-bold text-overflow">
-                {journalInfo.title}
-              </div>
-
-              {/* 收藏期刊 */}
-              <CollectButton
-                showText
-                id={journalInfo.id}
-                active={journalInfo.haveCollect}
-                count={journalInfo.userCollectCount}
-                text="人收藏"
-                collectType="1"
-                iconPosition="right"
-                gap={9}
-              />
+            <div className="w-autp text-[24px] leading-[33.6px] my-[9px] text-base font-bold text-overflow">
+              {journalInfo.title}
             </div>
+
             {/* 作者 & 时间 */}
             <div className="flex flex-row item-center text-[rgba(0,0,0,0.4)] text-[12px] leading-[16.8px] gap-[12px]">
               <p>{journalInfo.editor}</p>
diff --git a/src/components/Journal/JournalCard.tsx b/src/components/Journal/JournalCard.tsx
index ee3f5b5..18c7c94 100644
--- a/src/components/Journal/JournalCard.tsx
+++ b/src/components/Journal/JournalCard.tsx
@@ -19,13 +19,15 @@ export default function JournalCard({
   title,
   journalNo,
   showPlay = false,
+  scale = false,
   children,
   className,
 }: {
   image: string;
-  title?: string;
   journalNo: string;
+  title?: string;
   showPlay?: boolean;
+  scale?: boolean;
   children?: React.ReactNode;
   className?: string;
 }) {
@@ -41,7 +43,7 @@ export default function JournalCard({
         src={image}
         unoptimized
         alt={`Vol${journalNo}`}
-        className={`absolute bottom-0  group-hover:transform-scale-103 transition-transform-300`}
+        className={`absolute bottom-0  ${scale && 'group-hover:transform-scale-103 transition-transform-300'}`}
       />
       {/* 标题 */}
       {!!title && (
diff --git a/src/components/Journal/JournalDetail/VolDetailCoverCard.tsx b/src/components/Journal/JournalDetail/VolDetailCoverCard.tsx
index d225e3b..08d2916 100644
--- a/src/components/Journal/JournalDetail/VolDetailCoverCard.tsx
+++ b/src/components/Journal/JournalDetail/VolDetailCoverCard.tsx
@@ -8,7 +8,7 @@ export default function CoverCard({ journalInfo, songList }: { journalInfo: Jour
   return (
     <div className="relative">
       <JournalCard image={image} journalNo={journalNo} />
-      <VolPlayButton className="absolute right-[30px] bottom-[-26px]" journalInfo={journalInfo} songList={songList} />
+      <VolPlayButton className="absolute left-30px bottom-30px" journalInfo={journalInfo} songList={songList} />
     </div>
   );
 }
diff --git a/src/components/Journal/JournalList/VolListCoverCard.tsx b/src/components/Journal/JournalList/VolListCoverCard.tsx
index 6d6ecbc..76559a0 100644
--- a/src/components/Journal/JournalList/VolListCoverCard.tsx
+++ b/src/components/Journal/JournalList/VolListCoverCard.tsx
@@ -4,7 +4,7 @@ import { JournalCard } from '@/components';
 
 export default function CoverCard({ title, img, no }: { title: string; img: string; no: string }) {
   return (
-    <JournalCard image={img} journalNo={no} className="cursor-pointer">
+    <JournalCard image={img} journalNo={no} scale className="cursor-pointer">
       <div className={`absolute bottom-0 w-full h-[126px] ${styles.title_background}`}>
         <p className="absolute bottom-[23px] left-[23px] text-[#fff] text-[20px] leading-[33.6px] font-500">{title}</p>
       </div>