From 4344a2985d90852ce50255e3b175dd169e6f9ff8 Mon Sep 17 00:00:00 2001
From: luorijun <luorijun@outlook.com>
Date: Mon, 16 Jun 2025 11:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=B1=95=E5=BC=80=E9=81=AE=E7=BD=A9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B6=E5=A2=9E=E5=BC=BA=20alert=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                   |  8 ++++++--
 src/app/admin/_client/layout.tsx            |  4 ++--
 src/components/composites/extract/index.tsx |  2 +-
 src/components/composites/purchase/pay.tsx  | 12 ++++++------
 src/components/ui/alert.tsx                 | 13 ++++++-------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index cbd1e42..da03ded 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 ## TODO
 
-window.matchMedia 问题，需要其他方式在布局绘制前得到屏幕宽度
+后台首页 ：
+- banner 拉伸问题
+- 图表组件高度和查询按钮越界问题
+- 磁贴组件手机视图竖排，删除“套餐”，“数量”
+- 公告查看更多跳转实现
 
 手机端支付页面样式调整为类似电商的底部支付栏
 
@@ -11,7 +15,7 @@ MDX code 块语法高亮
 全局修改断点命名
 
 页头链接完善跳转地址
-W
+
 树组件优化
 
 sse 向客户端推送通知与支付结果等事件
diff --git a/src/app/admin/_client/layout.tsx b/src/app/admin/_client/layout.tsx
index 3b7fd7a..23adf46 100644
--- a/src/app/admin/_client/layout.tsx
+++ b/src/app/admin/_client/layout.tsx
@@ -55,8 +55,8 @@ export default function Layout(props: AdminLayoutProps) {
             `md:hidden`,
             `transition-opacity duration-300 ease-in-out`,
             `col-start-1 row-start-1 col-span-2 row-span-2 bg-black/50 z-10`,
-            `max-md:data-[expand=true]:opacity-100 data-[expand=false]:opacity-0`,
-            `max-md:data-[expand=true]:pointer-events-auto data-[expand=false]:pointer-events-none`,
+            `data-[expand=true]:opacity-100 data-[expand=false]:opacity-0`,
+            `data-[expand=true]:pointer-events-auto data-[expand=false]:pointer-events-none`,
           )}
           onClick={() => setNevBar(false)}
         >
diff --git a/src/components/composites/extract/index.tsx b/src/components/composites/extract/index.tsx
index f05e15f..e9b7035 100644
--- a/src/components/composites/extract/index.tsx
+++ b/src/components/composites/extract/index.tsx
@@ -70,7 +70,7 @@ export default function Extract(props: ExtractProps) {
       )}
     >
       <CardSection>
-        <Alert variant="warn" >
+        <Alert variant="warn">
           <CircleAlert/>
           <AlertTitle>提取IP前需要将本机IP添加到白名单后才可使用</AlertTitle>
         </Alert>
diff --git a/src/components/composites/purchase/pay.tsx b/src/components/composites/purchase/pay.tsx
index a635c6f..d112776 100644
--- a/src/components/composites/purchase/pay.tsx
+++ b/src/components/composites/purchase/pay.tsx
@@ -7,7 +7,7 @@ import balance from './_assets/balance.svg'
 import Image from 'next/image'
 import {useEffect, useRef, useState} from 'react'
 import {useProfileStore} from '@/components/providers/StoreProvider'
-import {Alert, AlertDescription} from '@/components/ui/alert'
+import {Alert, AlertTitle} from '@/components/ui/alert'
 import {ApiResponse, ExtraResp, ExtraReq} from '@/lib/api'
 import {toast} from 'sonner'
 import {Loader} from 'lucide-react'
@@ -172,16 +172,16 @@ export default function Pay(props: PayProps) {
               </div>
 
               {balanceEnough ? (
-                <Alert>
-                  <AlertDescription>
+                <Alert variant="done">
+                  <AlertTitle>
                     检查无误后，点击确认支付按钮完成支付
-                  </AlertDescription>
+                  </AlertTitle>
                 </Alert>
               ) : (
                 <Alert variant="fail">
-                  <AlertDescription>
+                  <AlertTitle>
                     余额不足，请先充值或选择其他支付方式
-                  </AlertDescription>
+                  </AlertTitle>
                 </Alert>
               )}
             </div>
diff --git a/src/components/ui/alert.tsx b/src/components/ui/alert.tsx
index d63f1da..f949ffe 100644
--- a/src/components/ui/alert.tsx
+++ b/src/components/ui/alert.tsx
@@ -8,11 +8,10 @@ const alertVariants = cva(
   {
     variants: {
       variant: {
-        default: 'bg-card text-card-foreground',
-        primary: '',
-        done: '',
-        warn: 'text-warn bg-warn/10',
-        fail: 'text-fail bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-fail/90',
+        default: 'text-primary bg-primary/10 *:data-[slot=alert-description]:text-primary/90',
+        done: 'text-done bg-done/10 *:data-[slot=alert-description]:text-done/90',
+        warn: 'text-warn bg-warn/10 *:data-[slot=alert-description]:text-warn/90',
+        fail: 'text-fail bg-fail/10 *:data-[slot=alert-description]:text-fail/90',
       },
     },
     defaultVariants: {
@@ -30,7 +29,7 @@ function Alert({
     <div
       data-slot="alert"
       role="alert"
-      className={merge(alertVariants({variant}), className, 'py-0')}
+      className={merge(alertVariants({variant}), className)}
       {...props}
     />
   )
@@ -41,7 +40,7 @@ function AlertTitle({className, ...props}: React.ComponentProps<'div'>) {
     <div
       data-slot="alert-title"
       className={merge(
-        'col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight',
+        'col-start-2 line-clamp-1 min-h-4 tracking-tight',
         className,
       )}
       {...props}