From f534c101dd2431352dfab638603828c4f53b272a Mon Sep 17 00:00:00 2001
From: speakeloudest <speakeloudest@gmail.com>
Date: Sun, 27 Jul 2025 00:18:31 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E5=87=BA=E7=89=88?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/user/app/(main)/page.tsx                 |   9 -
 .../auth/EmailAuthDialog/EmailAuthDialog.tsx  |  40 ++++
 .../user/app/auth/{page.tsx => auth-page.tsx} |   0
 apps/user/app/auth/email/login-form.tsx       |  73 ++++--
 apps/user/app/auth/email/register-form.tsx    | 222 ++++++++++--------
 apps/user/app/auth/email/reset-form.tsx       | 166 +++++++------
 apps/user/app/auth/send-code.tsx              |   9 +-
 .../app/bind/[platform]/certification.tsx     |   2 +-
 .../app/oauth/[platform]/certification.tsx    |   2 +-
 .../components/CustomIcon/icons/close.svg     |   3 +
 apps/user/components/Header/NewHeader.tsx     |  66 +++---
 apps/user/components/Header/header.tsx        |   2 +-
 apps/user/components/Header/image.png         | Bin 6544 -> 4018 bytes
 apps/user/components/main/FooterCopyright.tsx |  29 ++-
 apps/user/components/main/HomeContent.tsx     |  23 +-
 .../components/main/OfferDialog/index.tsx     |  39 +++
 apps/user/components/main/hero.tsx            |   2 +-
 apps/user/locales/zh-CN/auth.json             |   2 +-
 apps/user/utils/common.ts                     |   2 +-
 packages/ui/src/components/dialog.tsx         |  11 +-
 20 files changed, 444 insertions(+), 258 deletions(-)
 create mode 100644 apps/user/app/auth/EmailAuthDialog/EmailAuthDialog.tsx
 rename apps/user/app/auth/{page.tsx => auth-page.tsx} (100%)
 create mode 100644 apps/user/components/CustomIcon/icons/close.svg
 create mode 100644 apps/user/components/main/OfferDialog/index.tsx

diff --git a/apps/user/app/(main)/page.tsx b/apps/user/app/(main)/page.tsx
index 45ee755..dbee382 100644
--- a/apps/user/app/(main)/page.tsx
+++ b/apps/user/app/(main)/page.tsx
@@ -10,7 +10,6 @@ import { redirect } from 'next/navigation';
 import FooterCopyright from '@/components/main/FooterCopyright';
 import FullScreenVideoBackground from '@/components/main/FullScreenVideoBackground';
 import HomeContent from '@/components/main/HomeContent';
-import Image from 'next/image';
 
 export default async function Home() {
   const Authorization = (await cookies()).get('Authorization')?.value;
@@ -39,14 +38,6 @@ export default async function Home() {
         <HomeContent />
       </main>
       <FooterCopyright />
-      <Image
-        src={'./logo.png'}
-        height={37}
-        width={28}
-        className={'fixed bottom-8 left-1/2 -translate-x-1/2'}
-        alt='logo'
-        unoptimized
-      ></Image>
     </>
   );
 }
diff --git a/apps/user/app/auth/EmailAuthDialog/EmailAuthDialog.tsx b/apps/user/app/auth/EmailAuthDialog/EmailAuthDialog.tsx
new file mode 100644
index 0000000..3f9e5f0
--- /dev/null
+++ b/apps/user/app/auth/EmailAuthDialog/EmailAuthDialog.tsx
@@ -0,0 +1,40 @@
+import EmailAuthForm from '@/app/auth/email/auth-form';
+import CloseSvg from '@/components/CustomIcon/icons/close.svg';
+import { Dialog, DialogContent, DialogTitle } from '@workspace/ui/components/dialog';
+import Image from 'next/image';
+import { forwardRef, useImperativeHandle, useState } from 'react';
+
+export interface EmailAuthDialogRef {
+  show: () => void;
+  hide: () => void;
+}
+
+const EmailAuthDialog = forwardRef<EmailAuthDialogRef>((props, ref) => {
+  const [open, setOpen] = useState(false);
+
+  useImperativeHandle(ref, () => ({
+    show: () => setOpen(true),
+    hide: () => setOpen(false),
+  }));
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogContent
+        className={
+          'rounded-0 h-full w-full px-12 py-[4.5rem] md:h-auto md:w-[496px] md:!rounded-[50px]'
+        }
+        closeIcon={<Image src={CloseSvg} alt={'close'} />}
+        closeClassName={
+          'right-[40px] top-[30px] font-bold text-black opacity-100 focus:ring-0 focus:ring-offset-0'
+        }
+      >
+        <DialogTitle className={'sr-only'}>title</DialogTitle>
+        <div className={'min-h-[524px]'}>
+          <EmailAuthForm />
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+});
+
+export default EmailAuthDialog;
diff --git a/apps/user/app/auth/page.tsx b/apps/user/app/auth/auth-page.tsx
similarity index 100%
rename from apps/user/app/auth/page.tsx
rename to apps/user/app/auth/auth-page.tsx
diff --git a/apps/user/app/auth/email/login-form.tsx b/apps/user/app/auth/email/login-form.tsx
index ece2a19..4bda980 100644
--- a/apps/user/app/auth/email/login-form.tsx
+++ b/apps/user/app/auth/email/login-form.tsx
@@ -49,15 +49,21 @@ export default function LoginForm({
 
   return (
     <>
+      <div className={'pb-9 pt-16 text-4xl font-bold'}>账户验证</div>
       <Form {...form}>
-        <form onSubmit={handleSubmit} className='grid gap-6'>
+        <form onSubmit={handleSubmit} className=''>
           <FormField
             control={form.control}
             name='email'
             render={({ field }) => (
-              <FormItem>
+              <FormItem className={'mb-5'}>
                 <FormControl>
-                  <Input placeholder='Enter your email...' type='email' {...field} />
+                  <Input
+                    className={'h-[60px] text-xl'}
+                    placeholder='Email'
+                    type='email'
+                    {...field}
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -67,9 +73,14 @@ export default function LoginForm({
             control={form.control}
             name='password'
             render={({ field }) => (
-              <FormItem>
+              <FormItem className={'mb-2'}>
                 <FormControl>
-                  <Input placeholder='Enter your password...' type='password' {...field} />
+                  <Input
+                    className={'h-[60px] text-xl'}
+                    placeholder='password'
+                    type='password'
+                    {...field}
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -80,7 +91,7 @@ export default function LoginForm({
               control={form.control}
               name='cf_token'
               render={({ field }) => (
-                <FormItem>
+                <FormItem className={'last:mb-0'}>
                   <FormControl>
                     <CloudFlareTurnstile id='login' {...field} ref={turnstile} />
                   </FormControl>
@@ -89,27 +100,39 @@ export default function LoginForm({
               )}
             />
           )}
-          <Button type='submit' disabled={loading}>
-            {loading && <Icon icon='mdi:loading' className='animate-spin' />}
-            {t('title')}
-          </Button>
+          <div className='flex w-full justify-between text-sm'>
+            <Button
+              variant='link'
+              type='button'
+              className='p-0'
+              onClick={() => onSwitchForm('reset')}
+            >
+              {t('forgotPassword')}
+            </Button>
+            <Button
+              variant='link'
+              className='p-0'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('register');
+              }}
+            >
+              {t('registerAccount')}
+            </Button>
+          </div>
+
+          <div className='mt-6 flex justify-center'>
+            <Button
+              type='submit'
+              disabled={loading}
+              className='h-[64px] w-[219px] rounded-full border-[#0F2C53] bg-[#0F2C53] text-2xl font-bold hover:bg-[#225BA9] hover:text-white'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </Button>
+          </div>
         </form>
       </Form>
-      <div className='mt-4 flex w-full justify-between text-sm'>
-        <Button variant='link' type='button' className='p-0' onClick={() => onSwitchForm('reset')}>
-          {t('forgotPassword')}
-        </Button>
-        <Button
-          variant='link'
-          className='p-0'
-          onClick={() => {
-            setInitialValues(undefined);
-            onSwitchForm('register');
-          }}
-        >
-          {t('registerAccount')}
-        </Button>
-      </div>
     </>
   );
 }
diff --git a/apps/user/app/auth/email/register-form.tsx b/apps/user/app/auth/email/register-form.tsx
index fba20ce..14bf83a 100644
--- a/apps/user/app/auth/email/register-form.tsx
+++ b/apps/user/app/auth/email/register-form.tsx
@@ -87,132 +87,156 @@ export default function RegisterForm({
 
   return (
     <>
+      <div className={'pb-9 text-4xl font-bold'}>注册账户</div>
+
       {auth.register.stop_register ? (
         <Markdown>{t('message')}</Markdown>
       ) : (
         <Form {...form}>
-          <form onSubmit={handleSubmit} className='grid gap-6'>
-            <FormField
-              control={form.control}
-              name='email'
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Input placeholder='Enter your email...' type='email' {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name='password'
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Input placeholder='Enter your password...' type='password' {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name='repeat_password'
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      disabled={loading}
-                      placeholder='Enter password again...'
-                      type='password'
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            {auth.email.enable_verify && (
+          <form onSubmit={handleSubmit}>
+            <div className='grid gap-5'>
               <FormField
                 control={form.control}
-                name='code'
+                name='email'
                 render={({ field }) => (
                   <FormItem>
                     <FormControl>
-                      <div className='flex items-center gap-2'>
-                        <Input
-                          disabled={loading}
-                          placeholder='Enter code...'
-                          type='text'
-                          {...field}
-                          value={field.value as string}
-                        />
-                        <SendCode
-                          type='email'
-                          params={{
-                            ...form.getValues(),
-                            type: 1,
-                          }}
-                        />
-                      </div>
+                      <Input
+                        className={'h-[60px] text-xl'}
+                        placeholder='Enter your email...'
+                        type='email'
+                        {...field}
+                      />
                     </FormControl>
                     <FormMessage />
                   </FormItem>
                 )}
               />
-            )}
-            <FormField
-              control={form.control}
-              name='invite'
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      disabled={loading || !!localStorage.getItem('invite')}
-                      placeholder={t('invite')}
-                      {...field}
-                      value={field.value || ''}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            {verify.enable_register_verify && (
               <FormField
                 control={form.control}
-                name='cf_token'
+                name='password'
                 render={({ field }) => (
                   <FormItem>
                     <FormControl>
-                      <CloudFlareTurnstile id='register' {...field} ref={turnstile} />
+                      <Input
+                        className={'h-[60px] text-xl'}
+                        placeholder='Enter your password...'
+                        type='password'
+                        {...field}
+                      />
                     </FormControl>
                     <FormMessage />
                   </FormItem>
                 )}
               />
-            )}
-            <Button type='submit' disabled={loading}>
-              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
-              {t('title')}
-            </Button>
+              <FormField
+                control={form.control}
+                name='repeat_password'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <Input
+                        className={'h-[60px] text-xl'}
+                        disabled={loading}
+                        placeholder='Enter password again...'
+                        type='password'
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              {auth.email.enable_verify && (
+                <FormField
+                  control={form.control}
+                  name='code'
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormControl>
+                        <div className='flex items-center gap-8'>
+                          <Input
+                            disabled={loading}
+                            className={'h-[60px] flex-1 text-xl'}
+                            placeholder='Enter code...'
+                            type='text'
+                            {...field}
+                            value={field.value as string}
+                          />
+                          <SendCode
+                            type='email'
+                            params={{
+                              ...form.getValues(),
+                              type: 1,
+                            }}
+                          />
+                        </div>
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              )}
+              <FormField
+                control={form.control}
+                name='invite'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <Input
+                        className={'h-[60px] text-xl'}
+                        disabled={loading || !!localStorage.getItem('invite')}
+                        placeholder={t('invite')}
+                        {...field}
+                        value={field.value || ''}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              {verify.enable_register_verify && (
+                <FormField
+                  control={form.control}
+                  name='cf_token'
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormControl>
+                        <CloudFlareTurnstile id='register' {...field} ref={turnstile} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              )}
+            </div>
+
+            <div className='text-right text-sm'>
+              {t('existingAccount')}&nbsp;
+              <Button
+                variant='link'
+                className='p-0'
+                onClick={() => {
+                  setInitialValues(undefined);
+                  onSwitchForm('login');
+                }}
+              >
+                {t('switchToLogin')}
+              </Button>
+            </div>
+            <div className='mt-6 flex justify-center'>
+              <Button
+                type='submit'
+                disabled={loading}
+                className='h-[64px] w-[219px] rounded-full border-[#0F2C53] bg-[#0F2C53] text-2xl font-bold hover:bg-[#225BA9] hover:text-white'
+              >
+                {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+                {t('title')}
+              </Button>
+            </div>
           </form>
         </Form>
       )}
-      <div className='mt-4 text-right text-sm'>
-        {t('existingAccount')}&nbsp;
-        <Button
-          variant='link'
-          className='p-0'
-          onClick={() => {
-            setInitialValues(undefined);
-            onSwitchForm('login');
-          }}
-        >
-          {t('switchToLogin')}
-        </Button>
-      </div>
     </>
   );
 }
diff --git a/apps/user/app/auth/email/reset-form.tsx b/apps/user/app/auth/email/reset-form.tsx
index c5bc9c2..887c563 100644
--- a/apps/user/app/auth/email/reset-form.tsx
+++ b/apps/user/app/auth/email/reset-form.tsx
@@ -54,92 +54,112 @@ export default function ResetForm({
 
   return (
     <>
+      <div className={'pb-9 pt-10 text-4xl font-bold'}>找回账户</div>
       <Form {...form}>
-        <form onSubmit={handleSubmit} className='grid gap-6'>
-          <FormField
-            control={form.control}
-            name='email'
-            render={({ field }) => (
-              <FormItem>
-                <FormControl>
-                  <Input placeholder='Enter your email...' type='email' {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name='code'
-            render={({ field }) => (
-              <FormItem>
-                <FormControl>
-                  <div className='flex items-center gap-2'>
-                    <Input
-                      disabled={loading}
-                      placeholder='Enter code...'
-                      type='text'
-                      {...field}
-                      value={field.value as string}
-                    />
-                    <SendCode
-                      type='email'
-                      params={{
-                        ...form.getValues(),
-                        type: 2,
-                      }}
-                    />
-                  </div>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name='password'
-            render={({ field }) => (
-              <FormItem>
-                <FormControl>
-                  <Input placeholder='Enter your new password...' type='password' {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          {verify.enable_reset_password_verify && (
+        <form onSubmit={handleSubmit}>
+          <div className='grid gap-5'>
             <FormField
               control={form.control}
-              name='cf_token'
+              name='email'
               render={({ field }) => (
                 <FormItem>
                   <FormControl>
-                    <CloudFlareTurnstile id='reset' {...field} ref={turnstile} />
+                    <Input
+                      className={'h-[60px] text-xl'}
+                      placeholder='Enter your email...'
+                      type='email'
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
               )}
             />
-          )}
-          <Button type='submit' disabled={loading}>
-            {loading && <Icon icon='mdi:loading' className='animate-spin' />}
-            {t('title')}
-          </Button>
+            <FormField
+              control={form.control}
+              name='code'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <div className='flex items-center gap-8'>
+                      <Input
+                        className={'h-[60px] flex-1 text-xl'}
+                        disabled={loading}
+                        placeholder='Enter code...'
+                        type='text'
+                        {...field}
+                        value={field.value as string}
+                      />
+                      <SendCode
+                        type='email'
+                        params={{
+                          ...form.getValues(),
+                          type: 2,
+                        }}
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[60px] text-xl'}
+                      placeholder='Enter your new password...'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            {verify.enable_reset_password_verify && (
+              <FormField
+                control={form.control}
+                name='cf_token'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <CloudFlareTurnstile id='reset' {...field} ref={turnstile} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            )}
+          </div>
+          <div className='text-right text-sm'>
+            {t('existingAccount')}&nbsp;
+            <Button
+              variant='link'
+              className='p-0'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('login');
+              }}
+            >
+              {t('switchToLogin')}
+            </Button>
+          </div>
+          <div className='mt-6 flex justify-center'>
+            <Button
+              type='submit'
+              disabled={loading}
+              className='h-[64px] w-[219px] rounded-full border-[#0F2C53] bg-[#0F2C53] text-2xl font-bold hover:bg-[#225BA9] hover:text-white'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </Button>
+          </div>
         </form>
       </Form>
-      <div className='mt-4 text-right text-sm'>
-        {t('existingAccount')}&nbsp;
-        <Button
-          variant='link'
-          className='p-0'
-          onClick={() => {
-            setInitialValues(undefined);
-            onSwitchForm('login');
-          }}
-        >
-          {t('switchToLogin')}
-        </Button>
-      </div>
     </>
   );
 }
diff --git a/apps/user/app/auth/send-code.tsx b/apps/user/app/auth/send-code.tsx
index a9e426d..fcdf987 100644
--- a/apps/user/app/auth/send-code.tsx
+++ b/apps/user/app/auth/send-code.tsx
@@ -81,7 +81,14 @@ export default function SendCode({ type, params }: SendCodeProps) {
     (type === 'email' ? !params.email : !params.telephone || !params.telephone_area_code);
 
   return (
-    <Button type='button' onClick={handleSendCode} disabled={disabled}>
+    <Button
+      type='button'
+      className={
+        'h-[60px] w-[109px] rounded-full border-[#A8D4ED] bg-[#A8D4ED] text-xl hover:bg-[#225BA9] hover:text-white'
+      }
+      onClick={handleSendCode}
+      disabled={disabled}
+    >
       {seconds > 0 ? `${seconds}s` : t('get')}
     </Button>
   );
diff --git a/apps/user/app/bind/[platform]/certification.tsx b/apps/user/app/bind/[platform]/certification.tsx
index 7c43d8f..f572d2d 100644
--- a/apps/user/app/bind/[platform]/certification.tsx
+++ b/apps/user/app/bind/[platform]/certification.tsx
@@ -25,7 +25,7 @@ export default function Certification({ platform, children }: CertificationProps
         router.refresh();
       })
       .catch((error) => {
-        router.replace('/auth');
+        router.replace('/');
       });
   }, [pathname]);
 
diff --git a/apps/user/app/oauth/[platform]/certification.tsx b/apps/user/app/oauth/[platform]/certification.tsx
index 5bc0748..b3366ff 100644
--- a/apps/user/app/oauth/[platform]/certification.tsx
+++ b/apps/user/app/oauth/[platform]/certification.tsx
@@ -30,7 +30,7 @@ export default function Certification({ platform, children }: CertificationProps
         router.refresh();
       })
       .catch((error) => {
-        router.replace('/auth');
+        router.replace('/');
       });
   }, [pathname]);
 
diff --git a/apps/user/components/CustomIcon/icons/close.svg b/apps/user/components/CustomIcon/icons/close.svg
new file mode 100644
index 0000000..4bea31a
--- /dev/null
+++ b/apps/user/components/CustomIcon/icons/close.svg
@@ -0,0 +1,3 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.7312 7.88871L23.124 10.2816L17.9056 15.5L23.124 20.7185L20.7312 23.1113L15.5127 17.8929L10.2688 23.1368L7.87598 20.7439L13.1199 15.5L7.87598 10.2561L10.2688 7.86325L15.5127 13.1072L20.7312 7.88871Z" fill="black"/>
+</svg>
diff --git a/apps/user/components/Header/NewHeader.tsx b/apps/user/components/Header/NewHeader.tsx
index 1f8a8fc..4a2569d 100644
--- a/apps/user/components/Header/NewHeader.tsx
+++ b/apps/user/components/Header/NewHeader.tsx
@@ -8,44 +8,56 @@ import Image from 'next/legacy/image';
 import Link from 'next/link';
 import LanguageSwitch from '../language-switch';
 // import ThemeSwitch from '../theme-switch';
+import EmailAuthDialog, { EmailAuthDialogRef } from '@/app/auth/EmailAuthDialog/EmailAuthDialog';
+import { useRef } from 'react';
 import { UserNav } from '../user-nav';
 import ImageLogo from './image.png';
 
-export default function Header() {
+export default function Header(props) {
   const t = useTranslations('common');
 
   const { user } = useGlobalStore();
   const Logo = (
-    <Link href='/' className='flex items-center gap-2 text-lg font-bold'>
-      <Image src={ImageLogo} width={172} height={49} alt='logo' unoptimized />
+    <Link href='/' className='-mt-2.5 flex items-center gap-2 font-bold'>
+      <Image src={ImageLogo} width={102} height={49} alt='logo' unoptimized />
     </Link>
   );
+
+  const dialogRef = useRef<EmailAuthDialogRef>(null);
+
   return (
-    <header className='fixed top-10 z-50 w-full'>
-      <div className='container flex h-[73px] items-center justify-between rounded-[50px] bg-white pl-7 pr-1'>
-        <nav className='flex-col gap-6 text-lg font-medium md:flex md:flex-row md:items-center md:gap-5 md:text-sm lg:gap-6'>
-          {Logo}
-        </nav>
-        <div className='flex h-full flex-1 items-center justify-end gap-2 py-1'>
-          <LanguageSwitch />
-          {/*<ThemeSwitch />*/}
-          <UserNav />
-          {!user && (
-            <Link
-              href='/auth'
-              className={cn(
-                buttonVariants({
-                  size: 'lg',
-                  variant: 'outline',
-                }),
-                'h-full rounded-[50px] border-2 border-[#0F2C53] bg-[#0F2C53] px-14 text-2xl font-bold text-white transition hover:bg-white hover:text-[#0F2C53]',
+    <>
+      <header className='fixed top-10 z-50 w-full'>
+        <div className={'container'}>
+          <div className='flex h-[73px] items-center justify-between rounded-[50px] bg-white pl-4 pr-1 md:pl-7'>
+            <nav className='flex-col gap-6 font-medium md:flex md:flex-row md:items-center md:gap-5 md:text-sm lg:gap-6'>
+              {Logo}
+            </nav>
+            <div className='flex h-full flex-1 items-center justify-end gap-2 py-1'>
+              <LanguageSwitch />
+              {/*<ThemeSwitch />*/}
+              <UserNav />
+              {!user && (
+                <Link
+                  href='#'
+                  onClick={() => dialogRef.current?.show()}
+                  className={cn(
+                    buttonVariants({
+                      size: 'lg',
+                      variant: 'outline',
+                    }),
+                    'h-full rounded-[50px] border-0 border-[#0F2C53] bg-[#0F2C53] px-5 text-xl font-bold text-white transition hover:bg-[#225BA9] hover:text-white md:px-14 md:text-2xl',
+                  )}
+                >
+                  {t('login')}
+                </Link>
               )}
-            >
-              {t('login')}
-            </Link>
-          )}
+            </div>
+          </div>
         </div>
-      </div>
-    </header>
+      </header>
+      {/*  登录注册弹窗 */}
+      <EmailAuthDialog ref={dialogRef} />
+    </>
   );
 }
diff --git a/apps/user/components/Header/header.tsx b/apps/user/components/Header/header.tsx
index 19ab244..658df64 100644
--- a/apps/user/components/Header/header.tsx
+++ b/apps/user/components/Header/header.tsx
@@ -34,7 +34,7 @@ export default function Header() {
           <UserNav />
           {!user && (
             <Link
-              href='/auth'
+              href='/'
               className={buttonVariants({
                 size: 'sm',
               })}
diff --git a/apps/user/components/Header/image.png b/apps/user/components/Header/image.png
index 9301f17297c1499a6f2882c71bb60a3c07c6cd19..9b9c7c73ddcc9240b2225572bf2e1d9036fd2471 100644
GIT binary patch
delta 4005
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
LNkvXXu0mjf6^n$~

literal 6544
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
C6HHS8

diff --git a/apps/user/components/main/FooterCopyright.tsx b/apps/user/components/main/FooterCopyright.tsx
index 4c25e35..d83b6cc 100644
--- a/apps/user/components/main/FooterCopyright.tsx
+++ b/apps/user/components/main/FooterCopyright.tsx
@@ -2,6 +2,7 @@
 
 import useGlobalStore from '@/config/use-global';
 import { useTranslations } from 'next-intl';
+import Image from 'next/image';
 import Link from 'next/link';
 
 export default function FooterCopyright() {
@@ -11,15 +12,25 @@ export default function FooterCopyright() {
 
   return (
     <footer className={'fixed bottom-6 z-50 w-full'}>
-      <div className={'container pr-0 text-right'}>
-        <strong className='text-foreground'>{site.site_name}</strong> © All rights reserved.
-        <div>
-          <Link href='/tos' className='underline'>
-            {t('tos')}
-          </Link>
-          <Link href='/privacy-policy' className='ml-2 underline'>
-            {t('privacyPolicy')}
-          </Link>
+      <div className={'container relative flex justify-center text-right md:block'}>
+        <Image
+          src={'./logo.png'}
+          height={37}
+          width={28}
+          className={`h-[37px] w-[28px] flex-shrink-0 object-contain md:absolute md:left-1/2 md:-translate-x-1/2`}
+          alt='logo'
+          unoptimized
+        ></Image>
+        <div className={'ml-2.5'}>
+          <strong className='text-foreground'>{site.site_name}</strong> © All rights reserved.
+          <div>
+            <Link href='/tos' className='underline'>
+              {t('tos')}
+            </Link>
+            <Link href='/privacy-policy' className='ml-2 underline'>
+              {t('privacyPolicy')}
+            </Link>
+          </div>
         </div>
       </div>
     </footer>
diff --git a/apps/user/components/main/HomeContent.tsx b/apps/user/components/main/HomeContent.tsx
index fe0ad8b..6ccca2d 100644
--- a/apps/user/components/main/HomeContent.tsx
+++ b/apps/user/components/main/HomeContent.tsx
@@ -1,10 +1,16 @@
+'use client';
+
 import { Button } from '@workspace/ui/components/button';
+import { useRef } from 'react';
+import OfferDialog, { OfferDialogRef } from './OfferDialog/index';
 
 export default function HomeContent() {
+  const dialogRef = useRef<OfferDialogRef>(null);
+
   return (
     <div className='flex min-h-[calc(100vh-73px)] flex-col items-center justify-center pt-8'>
       {/* 大标题 */}
-      <h1 className='mb-10 text-6xl font-extrabold leading-tight text-white'>
+      <h1 className='mb-10 text-5xl font-bold !leading-tight text-white md:text-6xl'>
         连接
         <br />
         任何时间
@@ -12,19 +18,24 @@ export default function HomeContent() {
         任何地点
       </h1>
       {/* 副标题 */}
-      <div className='mb-16 text-center text-sm font-bold leading-6 text-white'>
-        <p>
-          <span className='mr-2 text-xs text-white'>
+      <div className='mb-16 text-left text-[17px] leading-normal text-white md:text-center md:font-bold'>
+        <p className={'w-[255px] md:w-full'}>
+          <span className='mr-2 text-white'>
             Airo<sup className='text-[8px]'>™</sup>Port
           </span>
           <span>提供极稳，极简，极速的网络服务</span>
         </p>
-        <p>获取订阅地址，开始顶级的私密网络体验</p>
+        <p className={'mt-1 w-[255px] md:mt-0 md:w-full'}>获取订阅地址，开始顶级的私密网络体验</p>
       </div>
       {/* 按钮 */}
-      <Button className='mb-8 h-[64px] w-[219px] rounded-full border-2 border-white bg-white/10 text-2xl font-bold text-white transition hover:bg-white/20'>
+      <Button
+        onClick={() => dialogRef.current?.show()}
+        className='mb-8 h-[64px] w-[219px] rounded-full border-2 border-white bg-white/10 text-2xl font-bold text-white transition hover:bg-white/20'
+      >
         查看订阅套餐
       </Button>
+
+      <OfferDialog ref={dialogRef} />
     </div>
   );
 }
diff --git a/apps/user/components/main/OfferDialog/index.tsx b/apps/user/components/main/OfferDialog/index.tsx
new file mode 100644
index 0000000..bbba377
--- /dev/null
+++ b/apps/user/components/main/OfferDialog/index.tsx
@@ -0,0 +1,39 @@
+import CloseSvg from '@/components/CustomIcon/icons/close.svg';
+import { Dialog, DialogContent, DialogTitle } from '@workspace/ui/components/dialog';
+import Image from 'next/image';
+import { forwardRef, useImperativeHandle, useState } from 'react';
+
+export interface OfferDialogRef {
+  show: () => void;
+  hide: () => void;
+}
+
+const OfferDialog = forwardRef<OfferDialogRef>((props, ref) => {
+  const [open, setOpen] = useState(false);
+
+  useImperativeHandle(ref, () => ({
+    show: () => setOpen(true),
+    hide: () => setOpen(false),
+  }));
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogContent
+        className={
+          'rounded-0 !container h-full w-full px-12 py-[4.5rem] md:h-auto md:w-[496px] md:!rounded-[50px]'
+        }
+        closeIcon={<Image src={CloseSvg} alt={'close'} />}
+        closeClassName={
+          'right-[40px] top-[30px] font-bold text-black opacity-100 focus:ring-0 focus:ring-offset-0'
+        }
+      >
+        <DialogTitle className={'text-center text-5xl font-bold text-[#0F2C53]'}>
+          选择套餐
+        </DialogTitle>
+        <div className={'min-h-[524px]'}>套餐内容</div>
+      </DialogContent>
+    </Dialog>
+  );
+});
+
+export default OfferDialog;
diff --git a/apps/user/components/main/hero.tsx b/apps/user/components/main/hero.tsx
index e4ebdf7..7ab7bf4 100644
--- a/apps/user/components/main/hero.tsx
+++ b/apps/user/components/main/hero.tsx
@@ -38,7 +38,7 @@ export function Hero() {
             className='*:text-muted-foreground mb-8 max-w-xl'
           />
         )}
-        <Link href={user ? '/dashboard' : '/auth'}>
+        <Link href={user ? '/dashboard' : '/'}>
           <HoverBorderGradient
             containerClassName='rounded-full'
             as='button'
diff --git a/apps/user/locales/zh-CN/auth.json b/apps/user/locales/zh-CN/auth.json
index 29599be..24e2697 100644
--- a/apps/user/locales/zh-CN/auth.json
+++ b/apps/user/locales/zh-CN/auth.json
@@ -33,7 +33,7 @@
     "message": "#### 尊敬的用户，您好！\n\n感谢您对我们的关注和支持。由于站点运营策略的调整，我们已关闭新用户注册功能。在此期间，现有用户的使用不会受到任何影响。\n\n我们致力于为您提供更好的服务和体验，因此将在关闭注册期间进行全面的系统优化和功能升级。未来，我们将以更优质的内容和服务迎接您的到来。\n\n请关注我们的网站和社交媒体平台，获取最新的动态和通知。感谢您的理解与支持。\n\n如有任何疑问或需要帮助，请随时联系我们的客服团队。\n\n**再次感谢您的支持与理解。**",
     "passwordMismatch": "两次密码输入不一致",
     "success": "注册成功,已自动登录!",
-    "switchToLogin": "登录/重置邮箱",
+    "switchToLogin": "登录",
     "title": "注册",
     "whitelist": "电子邮件域名不在允许的白名单中。"
   },
diff --git a/apps/user/utils/common.ts b/apps/user/utils/common.ts
index 932315f..12cb748 100644
--- a/apps/user/utils/common.ts
+++ b/apps/user/utils/common.ts
@@ -56,7 +56,7 @@ export function Logout() {
     !pathname.startsWith('/oauth/')
   ) {
     setRedirectUrl(location.pathname);
-    location.href = `/auth`;
+    location.href = `/`;
   }
 }
 
diff --git a/packages/ui/src/components/dialog.tsx b/packages/ui/src/components/dialog.tsx
index 9322af4..438e6f4 100644
--- a/packages/ui/src/components/dialog.tsx
+++ b/packages/ui/src/components/dialog.tsx
@@ -32,7 +32,7 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
+>(({ className, closeClassName, closeIcon, children, ...props }, ref) => (
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
@@ -44,8 +44,13 @@ const DialogContent = React.forwardRef<
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className='ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none'>
-        <X className='h-4 w-4' />
+      <DialogPrimitive.Close
+        className={cn(
+          'ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none',
+          closeClassName,
+        )}
+      >
+        {closeIcon || <X className='h-4 w-4' />}
         <span className='sr-only'>Close</span>
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>