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) {
)}>
-
+
+
+
{/* 登录表单 */}
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}
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 (
-
-
-
- )
-}
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 (
-
+
短效动态
长效静态
固定套餐
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">
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 (
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
- )
-}
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">
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 |
-
-
-
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>(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 (