From 9c4ed619778dca584fc8fa537c2d1b4882bb82c8 Mon Sep 17 00:00:00 2001
From: Eamon-meng <17516219072@163.com>
Date: Wed, 11 Jun 2025 14:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/dashboard.ts                     |  2 +-
 src/app/(auth)/login/page.tsx                |  4 +--
 src/app/admin/(dashboard)/_client/charts.tsx | 27 ++++++++++----------
 src/components/composites/recharge/index.tsx | 12 ++++-----
 src/components/ui/alert.tsx                  |  2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/actions/dashboard.ts b/src/actions/dashboard.ts
index 5a53c4a..e3327a0 100644
--- a/src/actions/dashboard.ts
+++ b/src/actions/dashboard.ts
@@ -28,7 +28,7 @@ export async function listInitialization(props: {
 }
 
 type listAccountReq = {
-  resource_no: number
+  resource_no: string
   create_after: Date
   create_before: Date
 }
diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index cae9bfb..a826b6c 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -206,10 +206,10 @@ export default function LoginPage(props: LoginPageProps) {
       `h-screen w-screen xl:pr-64 bg-cover bg-left`,
       `flex justify-center xl:justify-end items-center`,
     )}>
-      <Image src={bg} alt="背景图" fill priority className="absolute -z-10 object-cover"/>
+      <Image src={bg} alt="背景图" fill priority className="absolute -z-20 object-cover"/>
 
       <Link href="/">
-        <Image src={logo} alt="logo" priority height={64} className="absolute top-8 left-8"/>
+        <Image src={logo} alt="logo" priority height={64} className="absolute top-8 left-8 -z-10"/>
       </Link>
 
       {/* 登录表单 */}
diff --git a/src/app/admin/(dashboard)/_client/charts.tsx b/src/app/admin/(dashboard)/_client/charts.tsx
index 9e12b86..dea0b89 100644
--- a/src/app/admin/(dashboard)/_client/charts.tsx
+++ b/src/app/admin/(dashboard)/_client/charts.tsx
@@ -42,7 +42,7 @@ export default function Charts() {
   ]
 
   const formSchema = zod.object({
-    resource_no: zod.number().min(11, '请输入正确的套餐编号').max(11, '请输入正确的套餐编号').optional(),
+    resource_no: zod.string().min(11, '请输入正确的套餐编号').max(11, '请输入正确的套餐编号').optional(),
     create_after: zod.date().optional(),
     create_before: zod.date().optional(),
   })
@@ -55,8 +55,9 @@ export default function Charts() {
   })
   const handler = form.handleSubmit(
     async (value) => {
+      console.log(value, 'value')
       const res = {
-        resource_no: value.resource_no ?? 0,
+        resource_no: value.resource_no ?? '',
         create_after: value.create_after ?? new Date(),
         create_before: value.create_before ?? new Date(),
       }
@@ -69,7 +70,7 @@ export default function Charts() {
         let time = new Date()
         time = addDays(time, i)
         return {
-          time: format(time, `MM/dd`),
+          time: format(time, `YYYY年-MM月-dd日`),
           count: Math.floor(Math.random() * 100) + 1,
         }
       })
@@ -88,13 +89,11 @@ export default function Charts() {
             <TabsTrigger value="static" className="data-[state=active]:text-primary">静态 IP 套餐</TabsTrigger>
           </TabsList>
           <Form<FormValues> className={merge(`flex items-end gap-4 flex-wrap`)} handler={handler} form={form} >
-            <div>
-              <FormField name="resource_no" label={<span className="text-sm">套餐编号</span>} >
-                {({field}) => (
-                  <Input {...field} className="w-52 "/>
-                )}
-              </FormField>
-            </div>
+            <FormField name="resource_no" label={<span className="text-sm">套餐编号</span>}>
+              {({field}) => (
+                <Input {...field} className="h-9"/>
+              )}
+            </FormField>
             <div className="flex flex-col gap-2">
               <Label className="text-sm">时间范围筛选</Label>
               <div className="flex items-center">
@@ -119,11 +118,13 @@ export default function Charts() {
                     />
                   )}
                 </FormField>
-                <Button className="h-9 w-20" type="submit">
-                  <span>查询</span>
-                </Button>
               </div>
             </div>
+            <div className="flex gap-4">
+              <Button className="h-9" type="submit">
+                <span>查询</span>
+              </Button>
+            </div>
           </Form>
           <TabsContent value="dynamic" className="overflow-hidden">
             {submittedData && <DashboardChart data={submittedData}/>}
diff --git a/src/components/composites/recharge/index.tsx b/src/components/composites/recharge/index.tsx
index 5386232..627cc51 100644
--- a/src/components/composites/recharge/index.tsx
+++ b/src/components/composites/recharge/index.tsx
@@ -182,21 +182,21 @@ export default function RechargeModal(props: RechargeModelProps) {
                       value="20"
                       label="20元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                     <FormOption
                       id={`${id}-50`}
                       value="50"
                       label="50元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                     <FormOption
                       id={`${id}-100`}
                       value="100"
                       label="100元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                   </div>
 
@@ -206,21 +206,21 @@ export default function RechargeModal(props: RechargeModelProps) {
                       value="200"
                       label="200元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                     <FormOption
                       id={`${id}-500`}
                       value="500"
                       label="500元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                     <FormOption
                       id={`${id}-1000`}
                       value="1000"
                       label="1000元"
                       compare={String(field.value)}
-                      className="flex-1"
+                      className="flex-1 max-sm:text-sm max-sm:px-0"
                     />
                   </div>
                 </RadioGroup>
diff --git a/src/components/ui/alert.tsx b/src/components/ui/alert.tsx
index bf059ab..d63f1da 100644
--- a/src/components/ui/alert.tsx
+++ b/src/components/ui/alert.tsx
@@ -30,7 +30,7 @@ function Alert({
     <div
       data-slot="alert"
       role="alert"
-      className={merge(alertVariants({variant}), className)}
+      className={merge(alertVariants({variant}), className, 'py-0')}
       {...props}
     />
   )