From 87621202a9b57ac7f44ae95ecaaf392f6fec4929 Mon Sep 17 00:00:00 2001
From: luorijun <luorijun@outlook.com>
Date: Tue, 10 Jun 2025 09:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=9B=E7=A7=BB=E9=99=A4=20mdx=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 ++
 src/app/(auth)/login/page.tsx                 |  5 +++-
 src/app/admin/_client/layout.tsx              |  5 ++--
 src/app/test/page.tsx                         | 10 -------
 src/components/composites/purchase/index.tsx  |  2 +-
 .../composites/purchase/long/center.tsx       |  2 +-
 src/components/composites/purchase/nav.tsx    | 26 -----------------
 .../composites/purchase/short/center.tsx      |  2 +-
 src/components/docs/qqwwee.mdx                | 28 -------------------
 src/components/providers/StoreProvider.tsx    |  3 +-
 10 files changed, 13 insertions(+), 72 deletions(-)
 delete mode 100644 src/app/test/page.tsx
 delete mode 100644 src/components/composites/purchase/nav.tsx
 delete mode 100644 src/components/docs/qqwwee.mdx

diff --git a/README.md b/README.md
index 822cd34..cbd1e42 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ## TODO
 
+window.matchMedia 问题，需要其他方式在布局绘制前得到屏幕宽度
+
 手机端支付页面样式调整为类似电商的底部支付栏
 
 MDX code 块语法高亮
diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index 23de5d6..cae9bfb 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -28,6 +28,7 @@ import {Label} from '@/components/ui/label'
 import logo from '@/assets/logo.webp'
 import bg from './_assets/bg.webp'
 import {useProfileStore} from '@/components/providers/StoreProvider'
+import Link from 'next/link'
 
 export type LoginPageProps = {}
 
@@ -207,7 +208,9 @@ export default function LoginPage(props: LoginPageProps) {
     )}>
       <Image src={bg} alt="背景图" fill priority className="absolute -z-10 object-cover"/>
 
-      <Image src={logo} alt="logo" priority height={64} className="absolute top-8 left-8"/>
+      <Link href="/">
+        <Image src={logo} alt="logo" priority height={64} className="absolute top-8 left-8"/>
+      </Link>
 
       {/* 登录表单 */}
       <Card className="w-96 mx-4 shadow-lg">
diff --git a/src/app/admin/_client/layout.tsx b/src/app/admin/_client/layout.tsx
index 47534b9..3b7fd7a 100644
--- a/src/app/admin/_client/layout.tsx
+++ b/src/app/admin/_client/layout.tsx
@@ -2,7 +2,6 @@
 import {ReactNode} from 'react'
 import {useLayoutStore} from '@/components/providers/StoreProvider'
 import {merge} from '@/lib/utils'
-import {Slot} from '@radix-ui/react-slot'
 
 type AdminLayoutProps = {
   navbar: ReactNode
@@ -71,8 +70,8 @@ export default function Layout(props: AdminLayoutProps) {
           `transition-[margin] duration-300 ease-in-out`,
           `absolute inset-0 overflow-hidden`,
           `mt-[64px]`,
-          `md:data-[expand=true]:ml-[200px]`,
-          `md:data-[expand=false]:ml-[64px]`,
+          `md:ml-[64px]`,
+          `lg:data-[expand=true]:ml-[200px]`,
         )}>
         {props.content}
       </div>
diff --git a/src/app/test/page.tsx b/src/app/test/page.tsx
deleted file mode 100644
index 3739db7..0000000
--- a/src/app/test/page.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qqwwee from '@/components/docs/qqwwee.mdx'
-import Markdown from '@/components/markdown'
-
-export default async function TestPage() {
-  return (
-    <Markdown>
-      <Qqwwee/>
-    </Markdown>
-  )
-}
diff --git a/src/components/composites/purchase/index.tsx b/src/components/composites/purchase/index.tsx
index 7b1b052..dc89b25 100644
--- a/src/components/composites/purchase/index.tsx
+++ b/src/components/composites/purchase/index.tsx
@@ -10,7 +10,7 @@ export default async function Purchase(props: PurchaseProps) {
   return (
     <div className="flex flex-col gap-4">
       <Tabs defaultValue="short" className="gap-4">
-        <TabsList className="w-full p-2 bg-white rounded-lg justify-center">
+        <TabsList className="w-full p-2 bg-white rounded-lg justify-start md:justify-center overflow-auto">
           <Tab value="short">短效动态</Tab>
           <Tab value="long">长效静态</Tab>
           <Tab value="fixed">固定套餐</Tab>
diff --git a/src/components/composites/purchase/long/center.tsx b/src/components/composites/purchase/long/center.tsx
index c8ddc92..51175b4 100644
--- a/src/components/composites/purchase/long/center.tsx
+++ b/src/components/composites/purchase/long/center.tsx
@@ -58,7 +58,7 @@ export default function Center() {
             id={id}
             defaultValue={field.value}
             onValueChange={field.onChange}
-            className="flex gap-4 flex-wrap">
+            className="grid grid-cols-[repeat(auto-fill,minmax(120px,1fr))] gap-4">
 
             <FormOption id={`${id}-1`} value="1" label="1 小时" description="￥0.3/IP" compare={field.value}/>
             <FormOption id={`${id}-4`} value="4" label="4 小时" description="￥0.8/IP" compare={field.value}/>
diff --git a/src/components/composites/purchase/nav.tsx b/src/components/composites/purchase/nav.tsx
deleted file mode 100644
index 1e74529..0000000
--- a/src/components/composites/purchase/nav.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-'use client'
-import {ReactNode, useState} from 'react'
-
-export type NavProps = {
-}
-
-export default function Nav(props: NavProps) {
-  const [type, setType] = useState()
-
-  return (
-    <ul role="tablist" className="flex justify-center items-stretch bg-white rounded-lg">
-      <li role="tab">
-        <button className="h-14 px-8 text-lg">短效动态套餐</button>
-      </li>
-      <li role="tab">
-        <button className="h-14 px-8 text-lg">长效静态套餐</button>
-      </li>
-      <li role="tab">
-        <button className="h-14 px-8 text-lg">固定套餐</button>
-      </li>
-      <li role="tab">
-        <button className="h-14 px-8 text-lg">定制套餐</button>
-      </li>
-    </ul>
-  )
-}
diff --git a/src/components/composites/purchase/short/center.tsx b/src/components/composites/purchase/short/center.tsx
index 36b5200..4b5874a 100644
--- a/src/components/composites/purchase/short/center.tsx
+++ b/src/components/composites/purchase/short/center.tsx
@@ -58,7 +58,7 @@ export default function Center() {
             id={id}
             defaultValue={field.value}
             onValueChange={field.onChange}
-            className="flex gap-4 flex-wrap">
+            className="grid grid-cols-[repeat(auto-fill,minmax(120px,1fr))] gap-4">
 
             <FormOption id={`${id}-3`} value="180" label="3 分钟" description="￥0.005/IP" compare={field.value}/>
             <FormOption id={`${id}-5`} value="300" label="5 分钟" description="￥0.01/IP" compare={field.value}/>
diff --git a/src/components/docs/qqwwee.mdx b/src/components/docs/qqwwee.mdx
deleted file mode 100644
index 4e36386..0000000
--- a/src/components/docs/qqwwee.mdx
+++ /dev/null
@@ -1,28 +0,0 @@
-import {Button} from '@/components/ui/button';
-
-# qweqwe
-
-`dasdasd`
-
-```typescript
-console.log('Hello, world!');
-```
-
-## awdasdasd
-
-### zxczxczxc
-
-afsdfasf
-
-- qweqwe
-- awdasdasd
-- zxczxc
-
-- [ ] asd
-
-| qwe | asd | zxc |
-| --- | --- | --- |
-| 111 | 222 | 333 |
-
-<Button>哈哈</Button>
-
diff --git a/src/components/providers/StoreProvider.tsx b/src/components/providers/StoreProvider.tsx
index b6f065e..7e4cd57 100644
--- a/src/components/providers/StoreProvider.tsx
+++ b/src/components/providers/StoreProvider.tsx
@@ -28,7 +28,8 @@ export default function StoreProvider(props: ProfileProviderProps) {
   const layout = useRef<StoreApi<LayoutStore>>(null)
   if (!layout.current) {
     console.log('📦 create layout store')
-    layout.current = createLayoutStore(window.matchMedia(`(min-width: 1024px)`).matches)
+    const expand = window ? window.matchMedia(`(min-width: 1024px)`).matches : true
+    layout.current = createLayoutStore(expand)
   }
 
   return (