Merge branch 'main' into dev

feature/artists
mackt 5 months ago
commit 1be94c67c1

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 25 KiB

@ -31,15 +31,26 @@ export default async function About() {
{/* about */}
<div className="w-full pt-[110px]">
<h2 className="text-[32px] leading-[50px] font-bold"></h2>
<p className="mt-[6px] mb-[41px] text-[rgba(0,0,0,0.4)] text-[15px] leading-[24px]">APP</p>
<div className="text-[15px] leading-[24px]">
<p className="font-bold">
</p>
<p className="mt-[9px]">
<br />
Indie but not in die
</p>
<p className="mt-[6px] text-[rgba(0,0,0,0.4)] text-[15px] leading-[24px]">APP</p>
<p className="mt-[41px] mb-[26px] font-bold text-[15px] leading-[24px]">
{' '}
</p>
<div className="text-[15px] leading-[30px] font-400">
200303
<br />
200807
<br /> 201010
<br /> 201311 线AppAndroidiOSWindows Phone
<br /> 201401 100
<br /> 201709 emoApp
<br /> 201712 670
<br />
201801
<br />
202309
<br />
202403 App
<br />
</div>
</div>

@ -10,11 +10,13 @@ export const metadata: Metadata = {
const qrCodeList: Array<DownloadQrcodeCard> = [
{
id: 'apple',
platform: 'APP Store',
iconUrl: '/img/download/logo_apple.svg',
qrCode: '',
qrCode: '/img/download/qrcode_apple.svg',
},
{
id: 'android',
platform: 'Android',
iconUrl: '/img/download/logo_android.svg',
qrCode: '/img/download/qrcode_android.svg',
@ -41,8 +43,8 @@ export default function Download() {
{/* APP二维码 */}
<div className="flex flex-row">
{qrCodeList.map(({ platform, iconUrl, qrCode }) => (
<DownloadCard key={platform} platform={platform} iconUrl={iconUrl} qrCode={qrCode} />
{qrCodeList.map((item: DownloadQrcodeCard) => (
<DownloadCard key={item.id} {...item} />
))}
</div>
</div>

@ -1,4 +1,5 @@
import { Metadata, Viewport } from 'next';
import Script from 'next/script';
import { Toaster } from '@/components/ui/toaster';
@ -37,6 +38,8 @@ export default function RootLayout({ children }: Readonly<{ children: React.Reac
<ScrollTopButton className="fixed right-[50%] transform-translate-x-[600px] bottom-[160px] right-[124px]" />
<Toaster />
</body>
<Script src="https://hm.baidu.com/hm.js?89d54ff4e336c923a74ee045cc600c6a" async />
</html>
);
}

@ -0,0 +1,80 @@
import Image from 'next/image';
import DownloadCard from '@/app/download/components/DownloadCard';
const qrCodeList: Array<DownloadQrcodeCard> = [
{
id: 'apple',
platform: 'APP Store',
iconUrl: '/img/download/logo_apple.svg',
qrCode: '/img/download/qrcode_apple.svg',
},
{
id: 'android',
platform: 'Android',
iconUrl: '/img/download/logo_android.svg',
qrCode: '/img/download/qrcode_android.svg',
},
];
export default function Download() {
return (
<main className="w-full flex flex-col items-center pb-[104px] font-normal">
{/* 首屏 */}
<div className="relative w-full h-min-[1000px] h-screen flex flex-col items-center pt-[30vh] bg-[url(/img/download/background_1.jpg)] bg-center bg-cover bg-no-repeat text-[#fff]">
{/* slogan */}
<div className="flex flex-col items-center mb-[40px]">
<Image width={410} height={50} src="/img/download/slogan_line1.svg" alt="为独立音乐,雀跃" />
<Image
className="w-[6px] h-[20px] mt-[30px] mb-[30px] overflow-hidden"
width={6}
height={20}
src="/img/download/slogan_line2.svg"
alt="/"
/>
<Image width={143} height={24} src="/img/download/slogan_line3.svg" alt="独立 不独于世" />
</div>
{/* APP二维码 */}
<div className="flex flex-row">
{qrCodeList.map((item: DownloadQrcodeCard) => (
<DownloadCard key={item.id} {...item} />
))}
</div>
</div>
{/* 第二屏 */}
<div className="relative w-full h-[1000px] h-screen pl-[45.7vw] flex flex-col bg-[url(/img/download/background_2.jpg)] bg-center bg-cover bg-no-repeat">
{/* 花体字-“我们回来了” */}
<Image
className="w-[226px] h-[46px] mt-[16.67vh] mb-[50px]"
width={306}
height={46}
src="/img/download/back.svg"
alt="back"
/>
{/* 诗歌 */}
<p className="text-[#000] text-[15px] leading-[28px] text-left">
<br />
<br />
<br />
<br />
<br />
<br />
<br />
便
<br />
</p>
</div>
</main>
);
}

@ -15,6 +15,7 @@ declare type IFooterLink = {
};
declare interface DownloadQrcodeCard {
id: 'apple' | 'android';
platform: 'APP Store' | 'Android';
iconUrl: string;
qrCode: string;

Loading…
Cancel
Save