feat: 登录页优化

app/(tabs)/login.tsx

@@ -2,6 +2,7 @@ import Handers from '@/assets/icons/svg/handers.svg';
 import LoginIP1 from '@/assets/icons/svg/loginIp1.svg';
 import LoginIP2 from '@/assets/icons/svg/loginIp2.svg';
 import ForgetPwd from '@/components/login/forgetPwd';
+import Login from '@/components/login/login';
 import PhoneLogin from '@/components/login/phoneLogin';
 import SignUp from '@/components/login/signUp';
 import { ThemedText } from '@/components/ThemedText';
@@ -19,7 +20,10 @@ const LoginScreen = () => {
     const [error, setError] = useState<string>('123');
     const [containerHeight, setContainerHeight] = useState(0);
     const { height: windowHeight } = useWindowDimensions();
+    // 展示首次输入密码
     const [showPassword, setShowPassword] = useState(false);
+    // 展示二次输入密码
+    const [showSecondPassword, setShowSecondPassword] = useState(false);
     const [keyboardOffset, setKeyboardOffset] = useState(0);
     const insets = useSafeAreaInsets();
     // 判断是否有白边
@@ -77,7 +81,7 @@ const LoginScreen = () => {
                             }}
                         >
                             {
-                                showPassword
+                                (showPassword || showSecondPassword)
                                     ?
                                     <LoginIP2 />
                                     :
@@ -126,6 +130,8 @@ const LoginScreen = () => {
                                         {...commonProps}
                                         setShowPassword={setShowPassword}
                                         showPassword={showPassword}
+                                        setShowSecondPassword={setShowSecondPassword}
+                                        showSecondPassword={showSecondPassword}
                                     />
                                 ),
                                 forgetPwd: (
@@ -134,12 +140,12 @@ const LoginScreen = () => {
                                     />
                                 ),
                                 login: (
-                                    // <Login
+                                    <Login
-                                    //     {...commonProps}
+                                        {...commonProps}
-                                    //     setShowPassword={setShowPassword}
+                                        setShowPassword={setShowPassword}
-                                    //     showPassword={showPassword}
+                                        showPassword={showPassword}
-                                    // />
+                                    />
-                                    <PhoneLogin  {...commonProps} />
+                                    // <PhoneLogin  {...commonProps} />
                                 ),
                                 code: (
                                     <PhoneLogin  {...commonProps} />

components/login/forgetPwd.tsx

@@ -2,7 +2,7 @@ import { fetchApi } from "@/lib/server-api-util";
 import { User } from "@/types/user";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { ActivityIndicator, TextInput, TouchableOpacity, View } from "react-native";
+import { ActivityIndicator, StyleSheet, TextInput, TouchableOpacity, View } from "react-native";
 import { ThemedText } from "../ThemedText";
 
 interface LoginProps {
@@ -15,12 +15,10 @@ interface LoginProps {
 const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
     const { t } = useTranslation();
     const [loading, setLocading] = useState(false);
-    // 发送邮箱后把按钮变为disabled
     const [isDisabled, setIsDisabled] = useState(false);
     const [email, setEmail] = useState('');
     const [countdown, setCountdown] = useState(0);
 
-    // 倒计时效果
     useEffect(() => {
         if (countdown > 0) {
             const timer = setTimeout(() => setCountdown(countdown - 1), 1000);
@@ -30,7 +28,6 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
         }
     }, [countdown, isDisabled]);
 
-    // 发送邮件
     const handleSubmit = () => {
         if (!email) {
             setError(t('auth.forgetPwd.emailPlaceholder', { ns: 'login' }));
@@ -41,7 +38,7 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
         const body = {
             email: email,
         }
-        // 调接口确定邮箱是否正确，是否有该用户邮箱权限
+
         fetchApi<User>('/iam/reset-password-session', {
             method: 'POST',
             body: JSON.stringify(body),
@@ -50,19 +47,17 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
             }
         })
             .then((_) => {
-                // console.log("Password reset email sent successfully");
                 setIsDisabled(true);
-                setCountdown(60); // 开始60秒倒计时
+                setCountdown(60);
             })
             .catch((error) => {
-                // console.error('Failed to send reset email:', error);
                 setError(t('auth.forgetPwd.sendEmailError', { ns: 'login' }));
             })
             .finally(() => {
                 setLocading(false);
             });
     };
-    // 返回登陆
+
     const handleBackToLogin = () => {
         if (setIsSignUp) {
             setIsSignUp('login');
@@ -72,50 +67,95 @@ const ForgetPwd = ({ setIsSignUp, updateUrlParam, setError }: LoginProps) => {
         }
     }
 
-    return <View>
+    return (
-        {/* 邮箱输入框 */}
+        <View style={styles.container}>
-        <View className="mb-5">
+            <View style={styles.inputContainer}>
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
+                <ThemedText style={styles.inputLabel}>
-                {t('auth.forgetPwd.title', { ns: 'login' })}
+                    {t('auth.forgetPwd.title', { ns: 'login' })}
-            </ThemedText>
-            <TextInput
-                className="border border-gray-300 rounded-2xl p-3 text-base bg-inputBackground"
-                placeholder={t('auth.forgetPwd.emailPlaceholder', { ns: 'login' })}
-                placeholderTextColor="#ccc"
-                value={email}
-                onChangeText={setEmail}
-                keyboardType="email-address"
-                autoCapitalize="none"
-            />
-        </View>
-        {/* 发送重置密码邮件 */}
-        <TouchableOpacity
-            className={`w-full bg-[#E2793F] rounded-full p-4 items-center ${isDisabled ? 'opacity-50' : ''}`}
-            onPress={handleSubmit}
-            disabled={isDisabled || loading}
-        >
-            {loading ? (
-                <ActivityIndicator color="#fff" />
-            ) : (
-                <ThemedText className="!text-white font-semibold">
-                    {isDisabled
-                        ? `${t("auth.forgetPwd.sendEmailBtnDisabled", { ns: "login" })} (${countdown}s)`
-                        : t("auth.forgetPwd.sendEmailBtn", { ns: "login" })}
-
                 </ThemedText>
-            )}
+                <TextInput
-        </TouchableOpacity>
+                    style={styles.textInput}
-        {/* 返回登陆 */}
+                    placeholder={t('auth.forgetPwd.emailPlaceholder', { ns: 'login' })}
-        <TouchableOpacity
+                    placeholderTextColor="#ccc"
-            className="self-center mt-6"
+                    value={email}
-            onPress={handleBackToLogin}
+                    onChangeText={setEmail}
-        >
+                    keyboardType="email-address"
-            <ThemedText className="!text-textPrimary text-sm">
+                    autoCapitalize="none"
-                {t('auth.forgetPwd.goback', { ns: 'login' })}
+                />
-            </ThemedText>
+            </View>
-        </TouchableOpacity>
+
-    </View>
+            <TouchableOpacity
+                style={[
+                    styles.submitButton,
+                    (isDisabled || loading) && styles.disabledButton
+                ]}
+                onPress={handleSubmit}
+                disabled={isDisabled || loading}
+            >
+                {loading ? (
+                    <ActivityIndicator color="#fff" />
+                ) : (
+                    <ThemedText style={styles.buttonText}>
+                        {isDisabled
+                            ? `${t("auth.forgetPwd.sendEmailBtnDisabled", { ns: "login" })} (${countdown}s)`
+                            : t("auth.forgetPwd.sendEmailBtn", { ns: "login" })}
+                    </ThemedText>
+                )}
+            </TouchableOpacity>
+
+            <TouchableOpacity
+                style={styles.backButton}
+                onPress={handleBackToLogin}
+            >
+                <ThemedText style={styles.backButtonText}>
+                    {t('auth.forgetPwd.goback', { ns: 'login' })}
+                </ThemedText>
+            </TouchableOpacity>
+        </View>
+    );
 }
 
+const styles = StyleSheet.create({
+    container: {
+        width: '100%',
+    },
+    inputContainer: {
+        marginBottom: 20,
+    },
+    inputLabel: {
+        fontSize: 16,
+        color: '#1F2937',
+        marginBottom: 8,
+        marginLeft: 8,
+    },
+    textInput: {
+        borderRadius: 12,
+        padding: 12,
+        fontSize: 16,
+        backgroundColor: '#FFF8DE',
+    },
+    submitButton: {
+        width: '100%',
+        backgroundColor: '#E2793F',
+        borderRadius: 28,
+        padding: 16,
+        alignItems: 'center',
+    },
+    disabledButton: {
+        opacity: 0.5,
+    },
+    buttonText: {
+        color: '#FFFFFF',
+        fontWeight: '600',
+    },
+    backButton: {
+        alignSelf: 'center',
+        marginTop: 24,
+    },
+    backButtonText: {
+        color: '#1F2937',
+        fontSize: 14,
+    },
+});
 
-export default ForgetPwd
+export default ForgetPwd;

components/login/login.tsx

@@ -2,7 +2,7 @@ import { Ionicons } from "@expo/vector-icons";
 import { router } from "expo-router";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { ActivityIndicator, TextInput, TouchableOpacity, View } from "react-native";
+import { ActivityIndicator, StyleSheet, TextInput, TouchableOpacity, View } from "react-native";
 import { useAuth } from "../../contexts/auth-context";
 import { fetchApi } from "../../lib/server-api-util";
 import { User } from "../../types/user";
@@ -52,6 +52,7 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi
                 router.replace('/user-message');
             }
         } catch (error) {
+            // Handle error
         } finally {
             setIsLoading(false);
         }
@@ -64,93 +65,156 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi
     const handleSignUp = () => {
         updateUrlParam('status', 'signUp');
     };
-    return <View>
+
-        {/* 邮箱输入框 */}
+    return (
-        <View className="mb-5">
+        <View style={styles.container}>
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
+            <View style={[styles.inputContainer, { marginBottom: 20 }]}>
-                {t('auth.login.email', { ns: 'login' })}
+                <ThemedText style={styles.inputLabel}>
-            </ThemedText>
+                    {t('auth.login.email', { ns: 'login' })}
-            <TextInput
+                </ThemedText>
-                className="border border-gray-300 rounded-2xl p-3 text-base bg-inputBackground"
-                placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })}
-                placeholderTextColor="#ccc"
-                value={email}
-                onChangeText={(text) => {
-                    setEmail(text);
-                    setError('123');
-                }}
-                keyboardType="email-address"
-                autoCapitalize="none"
-            />
-        </View>
-        {/* 密码输入框 */}
-        <View className="mb-2">
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
-                {t('auth.login.password', { ns: 'login' })}
-            </ThemedText>
-            <View className="relative">
                 <TextInput
-                    className="border border-gray-300 rounded-2xl p-3 text-base bg-inputBackground pr-12"
+                    style={styles.textInput}
-                    placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })}
+                    placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })}
                     placeholderTextColor="#ccc"
-                    value={password}
+                    value={email}
                     onChangeText={(text) => {
-                        setPassword(text);
+                        setEmail(text);
                         setError('123');
                     }}
-                    secureTextEntry={!showPassword}
+                    autoCapitalize="none"
                 />
-                <TouchableOpacity
+            </View>
-                    className="absolute right-3 top-3.5"
+
-                    onPress={() => setShowPassword(!showPassword)}
+            <View style={styles.inputContainer}>
-                >
+                <ThemedText style={styles.inputLabel}>
-                    <Ionicons
+                    {t('auth.login.password', { ns: 'login' })}
-                        name={showPassword ? 'eye' : 'eye-off'}
+                </ThemedText>
-                        size={20}
+                <View style={styles.passwordInputContainer}>
-                        color="#666"
+                    <TextInput
+                        style={[styles.textInput, { paddingRight: 48 }]}
+                        placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })}
+                        placeholderTextColor="#ccc"
+                        value={password}
+                        onChangeText={(text) => {
+                            setPassword(text);
+                            setError('123');
+                        }}
+                        secureTextEntry={!showPassword}
                     />
+                    <TouchableOpacity
+                        style={styles.eyeIcon}
+                        onPress={() => setShowPassword(!showPassword)}
+                    >
+                        <Ionicons
+                            name={showPassword ? 'eye' : 'eye-off'}
+                            size={20}
+                            color="#666"
+                        />
+                    </TouchableOpacity>
+                </View>
+            </View>
+
+            <TouchableOpacity
+                style={styles.forgotPassword}
+                onPress={handleForgotPassword}
+            >
+                <ThemedText style={styles.forgotPasswordText}>
+                    {t('auth.login.forgotPassword', { ns: 'login' })}
+                </ThemedText>
+            </TouchableOpacity>
+
+            <TouchableOpacity
+                style={[styles.loginButton, isLoading && { opacity: 0.7 }]}
+                onPress={handleLogin}
+                disabled={isLoading}
+            >
+                {isLoading ? (
+                    <ActivityIndicator color="#fff" />
+                ) : (
+                    <ThemedText style={styles.loginButtonText}>
+                        {t('auth.login.loginButton', { ns: 'login' })}
+                    </ThemedText>
+                )}
+            </TouchableOpacity>
+
+            <View style={styles.signupContainer}>
+                <ThemedText style={styles.signupText}>
+                    {t('auth.login.signUpMessage', { ns: 'login' })}
+                </ThemedText>
+                <TouchableOpacity onPress={handleSignUp}>
+                    <ThemedText style={styles.signupLink}>
+                        {t('auth.login.signUp', { ns: 'login' })}
+                    </ThemedText>
                 </TouchableOpacity>
             </View>
         </View>
+    );
+};
 
-        {/* 忘记密码链接 */}
+const styles = StyleSheet.create({
-        <TouchableOpacity
+    container: {
-            className="self-end mb-6"
+        flex: 1,
-            onPress={handleForgotPassword}
+    },
-        >
+    inputContainer: {
-            <ThemedText className="!text-textPrimary text-sm">
+        marginBottom: 20,
-                {t('auth.login.forgotPassword', { ns: 'login' })}
+    },
-            </ThemedText>
+    inputLabel: {
-        </TouchableOpacity>
+        fontSize: 16,
+        color: '#1F2937',
+        marginBottom: 8,
+        marginLeft: 8,
+    },
+    textInput: {
+        borderRadius: 12,
+        paddingHorizontal: 16,
+        paddingVertical: 12,
+        fontSize: 16,
+        textAlignVertical: 'center',
+        backgroundColor: '#FFF8DE'
+    },
+    passwordInputContainer: {
+        position: 'relative',
+    },
+    eyeIcon: {
+        position: 'absolute',
+        right: 12,
+        top: 14,
+    },
+    forgotPassword: {
+        alignSelf: 'flex-end',
+        marginBottom: 24,
+    },
+    forgotPasswordText: {
+        color: '#1F2937',
+        fontSize: 14,
+    },
+    loginButton: {
+        width: '100%',
+        backgroundColor: '#E2793F',
+        borderRadius: 28,
+        padding: 16,
+        alignItems: 'center',
+        marginBottom: 24,
+    },
+    loginButtonText: {
+        color: '#FFFFFF',
+        fontWeight: '600',
+    },
+    signupContainer: {
+        flexDirection: 'row',
+        justifyContent: 'center',
+        marginTop: 8,
+    },
+    signupText: {
+        color: '#1F2937',
+        fontSize: 14,
+    },
+    signupLink: {
+        color: '#E2793F',
+        fontSize: 14,
+        fontWeight: '600',
+        marginLeft: 4,
+    },
+});
 
-        {/* 登录按钮 */}
+export default Login;
-        <TouchableOpacity
-            className={`w-full bg-[#E2793F] rounded-full text-[#fff] p-4 items-center mb-6 ${isLoading ? 'opacity-70' : ''}`}
-            onPress={handleLogin}
-            disabled={isLoading}
-        >
-            {isLoading ? (
-                <ActivityIndicator color="#fff" />
-            ) : (
-                <ThemedText className="!text-white font-semibold">
-                    {t('auth.login.loginButton', { ns: 'login' })}
-                </ThemedText>
-            )}
-        </TouchableOpacity>
-
-        {/* 注册链接 */}
-        <View className="flex-row justify-center mt-2">
-            <ThemedText className="!text-textPrimary text-sm">
-                {t('auth.login.signUpMessage', { ns: 'login' })}
-            </ThemedText>
-            <TouchableOpacity onPress={handleSignUp}>
-                <ThemedText className="!text-[#E2793F] text-sm font-semibold ml-1">
-                    {t('auth.login.signUp', { ns: 'login' })}
-                </ThemedText>
-            </TouchableOpacity>
-        </View>
-    </View>
-}
-
-
-export default Login

components/login/signUp.tsx

@@ -2,7 +2,7 @@ import { Ionicons } from "@expo/vector-icons";
 import { useLocalSearchParams, useRouter } from "expo-router";
 import { useEffect, useState } from 'react';
 import { useTranslation } from "react-i18next";
-import { ActivityIndicator, TextInput, TouchableOpacity, View } from 'react-native';
+import { ActivityIndicator, StyleSheet, TextInput, TouchableOpacity, View } from 'react-native';
 import { useAuth } from "../../contexts/auth-context";
 import { fetchApi } from "../../lib/server-api-util";
 import { User } from "../../types/user";
@@ -14,9 +14,11 @@ interface LoginProps {
     setError: (error: string) => void;
     setShowPassword: (showPassword: boolean) => void;
     showPassword: boolean;
+    setShowSecondPassword: (showSecondPassword: boolean) => void;
+    showSecondPassword: boolean;
 }
 
-const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword }: LoginProps) => {
+const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword, setShowSecondPassword, showSecondPassword }: LoginProps) => {
     const { t } = useTranslation();
     const { login } = useAuth();
     const router = useRouter();
@@ -32,7 +34,6 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword }: Log
     // 从 URL 参数中获取 task_id 和 steps
     const params = useLocalSearchParams<{ task_id?: string; steps?: string }>();
     const taskId = params.task_id;
-    const steps = params.steps;
 
     const handlePasswordChange = (value: string) => {
         setPassword(value);
@@ -139,208 +140,302 @@ const SignUp = ({ updateUrlParam, setError, setShowPassword, showPassword }: Log
     // 初始化
     useEffect(() => {
         setShowPassword(false)
+        setShowSecondPassword(false)
     }, [])
 
-    return <View className="w-full">
+    return (
-        {/* 邮箱输入 */}
+        <View style={styles.container}>
-        <View className="mb-4">
+            {/* 邮箱输入 */}
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
+            <View style={styles.inputContainer}>
-                {t('auth.login.email', { ns: 'login' })}
+                <ThemedText style={styles.inputLabel}>
-            </ThemedText>
+                    {t('auth.login.email', { ns: 'login' })}
-            <View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden">
-                <TextInput
-                    className="p-3 text-base flex-1"
-                    placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })}
-                    placeholderTextColor="#ccc"
-                    value={email}
-                    onChangeText={(value) => {
-                        setEmail(value)
-                        setError('123')
-                    }}
-                    keyboardType="email-address"
-                    autoCapitalize="none"
-                />
-            </View>
-        </View>
-
-        {/* 密码输入 */}
-        <View className="mb-4">
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
-                {t('auth.login.password', { ns: 'login' })}
-            </ThemedText>
-            <View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden flex-row items-center">
-                <TextInput
-                    className="p-3 text-base flex-1"
-                    placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })}
-                    placeholderTextColor="#ccc"
-                    value={password}
-                    onChangeText={(value) => {
-                        handlePasswordChange(value)
-                        setError('123')
-                    }}
-                    secureTextEntry={!showPassword}
-                />
-                <TouchableOpacity
-                    onPress={() => setShowPassword(!showPassword)}
-                    className="px-3 py-2"
-                >
-                    <Ionicons
-                        name={showPassword ? 'eye' : 'eye-off'}
-                        size={20}
-                        color="#666"
-                    />
-                </TouchableOpacity>
-            </View>
-        </View>
-
-        {/* 确认密码 */}
-        <View className="mb-6">
-            <ThemedText className="text-base !text-textPrimary mb-2 ml-2">
-                {t('auth.signup.confirmPassword', { ns: 'login' })}
-            </ThemedText>
-            <View className="border border-gray-300 rounded-2xl bg-inputBackground overflow-hidden flex-row items-center">
-                <TextInput
-                    className="p-3 text-base flex-1"
-                    placeholder={t('auth.signup.confirmPasswordPlaceholder', { ns: 'login' })}
-                    placeholderTextColor="#ccc"
-                    value={confirmPassword}
-                    onChangeText={(value) => {
-                        handleConfirmPasswordChange(value)
-                        setError('123')
-                    }}
-                    secureTextEntry={!showPassword}
-                />
-                <TouchableOpacity
-                    onPress={() => setShowPassword(!showPassword)}
-                    className="px-3 py-2"
-                >
-                    <Ionicons
-                        name={showPassword ? 'eye' : 'eye-off'}
-                        size={20}
-                        color="#666"
-                    />
-                </TouchableOpacity>
-            </View>
-        </View>
-
-        {/* 注册按钮 */}
-        <TouchableOpacity
-            className={`w-full bg-[#E2793F] rounded-full p-4 items-center ${loading ? 'opacity-70' : ''}`}
-            onPress={handleSubmit}
-            disabled={loading}
-        >
-            {loading ? (
-                <ActivityIndicator color="#fff" />
-            ) : (
-                <ThemedText className="!text-white font-semibold">
-                    {t("auth.signup.signupButton", { ns: 'login' })}
                 </ThemedText>
-            )}
+                <View style={styles.inputWrapper}>
-        </TouchableOpacity>
+                    <TextInput
-        <View style={{ flexDirection: 'row', alignItems: 'center', marginVertical: 10 }}>
+                        style={styles.textInput}
-            <TouchableOpacity
+                        placeholder={t('auth.login.accountPlaceholder', { ns: 'login' })}
-                onPress={() => {
+                        placeholderTextColor="#ccc"
-                    const newValue = !checked;
+                        value={email}
-                    setChecked(newValue);
+                        onChangeText={(value) => {
-                    if (!newValue) {
+                            setEmail(value)
-                        setError(t('auth.signup.checkedRequired', { ns: 'login' }));
+                            setError('123')
-                        return
+                        }}
-                    } else {
+                        keyboardType="email-address"
-                        setError("123")
+                        autoCapitalize="none"
-                    }
+                    />
+                </View>
+            </View>
 
-                }}
+            {/* 密码输入 */}
-                style={{
+            <View style={styles.inputContainer}>
-                    width: 20,
+                <ThemedText style={styles.inputLabel}>
-                    height: 20,
+                    {t('auth.login.password', { ns: 'login' })}
-                    borderRadius: 10,
+                </ThemedText>
-                    borderWidth: 2,
+                <View style={styles.passwordInputContainer}>
-                    borderColor: checked ? '#E2793F' : '#ccc',
+                    <TextInput
-                    backgroundColor: checked ? '#E2793F' : 'transparent',
+                        style={[styles.textInput, { flex: 1 }]}
-                    justifyContent: 'center',
+                        placeholder={t('auth.login.passwordPlaceholder', { ns: 'login' })}
-                    alignItems: 'center',
+                        placeholderTextColor="#ccc"
-                    marginRight: 8,
+                        value={password}
-                }}
+                        onChangeText={(value) => {
+                            handlePasswordChange(value)
+                            setError('123')
+                        }}
+                        secureTextEntry={!showPassword}
+                    />
+                    <TouchableOpacity
+                        onPress={() => setShowPassword(!showPassword)}
+                        style={styles.eyeIcon}
+                    >
+                        <Ionicons
+                            name={showPassword ? 'eye' : 'eye-off'}
+                            size={20}
+                            color="#666"
+                        />
+                    </TouchableOpacity>
+                </View>
+            </View>
+
+            {/* 确认密码 */}
+            <View style={[styles.inputContainer, { marginBottom: 24 }]}>
+                <ThemedText style={styles.inputLabel}>
+                    {t('auth.signup.confirmPassword', { ns: 'login' })}
+                </ThemedText>
+                <View style={styles.passwordInputContainer}>
+                    <TextInput
+                        style={[styles.textInput, { flex: 1 }]}
+                        placeholder={t('auth.signup.confirmPasswordPlaceholder', { ns: 'login' })}
+                        placeholderTextColor="#ccc"
+                        value={confirmPassword}
+                        onChangeText={(value) => {
+                            handleConfirmPasswordChange(value)
+                            setError('123')
+                        }}
+                        secureTextEntry={!showSecondPassword}
+                    />
+                    <TouchableOpacity
+                        onPress={() => setShowSecondPassword(!showSecondPassword)}
+                        style={styles.eyeIcon}
+                    >
+                        <Ionicons
+                            name={showSecondPassword ? 'eye' : 'eye-off'}
+                            size={20}
+                            color="#666"
+                        />
+                    </TouchableOpacity>
+                </View>
+            </View>
+
+            {/* 注册按钮 */}
+            <TouchableOpacity
+                style={[styles.signupButton, loading && { opacity: 0.7 }]}
+                onPress={handleSubmit}
+                disabled={loading}
             >
-                {checked && (
+                {loading ? (
-                    <Ionicons name="checkmark" size={14} color="white" />
+                    <ActivityIndicator color="#fff" />
+                ) : (
+                    <ThemedText style={styles.signupButtonText}>
+                        {t("auth.signup.signupButton", { ns: 'login' })}
+                    </ThemedText>
                 )}
             </TouchableOpacity>
-            <View style={{ flexDirection: 'row', flexWrap: 'wrap', flex: 1 }}>
+            <View style={styles.termsContainer}>
-                <ThemedText className="text-sm !text-textPrimary">
+                <TouchableOpacity
-                    {t("auth.telLogin.agree", { ns: 'login' })}
+                    onPress={() => {
-                </ThemedText>
+                        const newValue = !checked;
-                <TouchableOpacity onPress={() => {
+                        setChecked(newValue);
-                    setModalType('terms');
+                        if (!newValue) {
-                    setPrivacyModalVisible(true);
+                            setError(t('auth.signup.checkedRequired', { ns: 'login' }));
-                }}>
+                            return
-                    <ThemedText className="text-sm !text-[#E2793F]">
+                        } else {
-                        {t("auth.telLogin.terms", { ns: 'login' })}
+                            setError("123")
-                    </ThemedText>
+                        }
+
+                    }}
+                    style={[
+                        styles.checkbox,
+                        checked && styles.checkboxChecked
+                    ]}
+                >
+                    {checked && (
+                        <Ionicons name="checkmark" size={14} color="white" />
+                    )}
                 </TouchableOpacity>
-                <ThemedText className="text-sm !text-textPrimary">
+                <View style={styles.termsTextContainer}>
-                    {t("auth.telLogin.and", { ns: 'login' })}
+                    <ThemedText style={styles.termsText}>
-                </ThemedText>
+                        {t("auth.telLogin.agree", { ns: 'login' })}
-                <TouchableOpacity onPress={() => {
-                    setModalType('privacy');
-                    setPrivacyModalVisible(true);
-                }}>
-                    <ThemedText className="text-sm !text-[#E2793F]">
-                        {t("auth.telLogin.privacyPolicy", { ns: 'login' })}
                     </ThemedText>
-                </TouchableOpacity>
+                    <TouchableOpacity onPress={() => {
-                <ThemedText className="text-sm !text-textPrimary">
+                        setModalType('terms');
-                    {t("auth.telLogin.and", { ns: 'login' })}
+                        setPrivacyModalVisible(true);
-                </ThemedText>
+                    }}>
-                <TouchableOpacity onPress={() => {
+                        <ThemedText style={styles.termsLink}>
-                    setModalType('user');
+                            {t("auth.telLogin.terms", { ns: 'login' })}
-                    setPrivacyModalVisible(true);
+                        </ThemedText>
-                }}>
+                    </TouchableOpacity>
-                    <ThemedText className="text-sm !text-[#E2793F]">
+                    <ThemedText style={styles.termsText}>
-                        {t("auth.telLogin.userAgreement", { ns: 'login' })}
+                        {t("auth.telLogin.and", { ns: 'login' })}
                     </ThemedText>
-                </TouchableOpacity>
+                    <TouchableOpacity onPress={() => {
-                <ThemedText className="text-sm !text-textPrimary">
+                        setModalType('privacy');
-                    {t("auth.telLogin.and", { ns: 'login' })}
+                        setPrivacyModalVisible(true);
-                </ThemedText>
+                    }}>
-                <TouchableOpacity onPress={() => {
+                        <ThemedText style={styles.termsLink}>
-                    setModalType('ai');
+                            {t("auth.telLogin.privacyPolicy", { ns: 'login' })}
-                    setPrivacyModalVisible(true);
+                        </ThemedText>
-                }}>
+                    </TouchableOpacity>
-                    <ThemedText className="text-sm !text-[#E2793F]">
+                    <ThemedText style={styles.termsText}>
-                        {t("auth.telLogin.aiAgreement", { ns: 'login' })}
+                        {t("auth.telLogin.and", { ns: 'login' })}
                     </ThemedText>
-                </TouchableOpacity>
+                    <TouchableOpacity onPress={() => {
-                <ThemedText className="text-sm !text-textPrimary">
+                        setModalType('user');
-                    {t("auth.telLogin.agreement", { ns: 'login' })}
+                        setPrivacyModalVisible(true);
-                </ThemedText>
+                    }}>
-                <ThemedText className="text-sm !text-[#E2793F]">
+                        <ThemedText style={styles.termsLink}>
-                    {t("common.name")}
+                            {t("auth.telLogin.userAgreement", { ns: 'login' })}
-                </ThemedText>
+                        </ThemedText>
-                <ThemedText className="text-sm !text-textPrimary">
+                    </TouchableOpacity>
-                    {t("auth.telLogin.getPhone", { ns: 'login' })}
+                    <ThemedText style={styles.termsText}>
-                </ThemedText>
+                        {t("auth.telLogin.and", { ns: 'login' })}
+                    </ThemedText>
+                    <TouchableOpacity onPress={() => {
+                        setModalType('ai');
+                        setPrivacyModalVisible(true);
+                    }}>
+                        <ThemedText style={styles.termsLink}>
+                            {t("auth.telLogin.aiAgreement", { ns: 'login' })}
+                        </ThemedText>
+                    </TouchableOpacity>
+                    <ThemedText style={styles.termsText}>
+                        {t("auth.telLogin.agreement", { ns: 'login' })}
+                    </ThemedText>
+                    <ThemedText style={styles.termsLink}>
+                        {t("common.name")}
+                    </ThemedText>
+                    <ThemedText style={styles.termsText}>
+                        {t("auth.telLogin.getPhone", { ns: 'login' })}
+                    </ThemedText>
+                </View>
             </View>
-        </View>
+            {/* 已有账号 */}
-        {/* 已有账号 */}
+            <View style={styles.loginContainer}>
-        <View className="flex-row justify-center mt-6">
+                <ThemedText style={styles.loginText}>
-            <ThemedText className="text-sm !text-textPrimary">
+                    {t("auth.signup.haveAccount", { ns: 'login' })}
-                {t("auth.signup.haveAccount", { ns: 'login' })}
-            </ThemedText>
-            <TouchableOpacity
-                onPress={() => {
-                    updateUrlParam("status", "login");
-                }}
-            >
-                <ThemedText className="!text-[#E2793F] text-sm font-semibold ml-1">
-                    {t("auth.signup.login", { ns: 'login' })}
                 </ThemedText>
-            </TouchableOpacity>
+                <TouchableOpacity
+                    onPress={() => {
+                        updateUrlParam("status", "login");
+                    }}
+                >
+                    <ThemedText style={styles.loginLink}>
+                        {t("auth.signup.login", { ns: 'login' })}
+                    </ThemedText>
+                </TouchableOpacity>
+            </View>
+
+            {/* 协议弹窗 */}
+            <PrivacyModal modalVisible={privacyModalVisible} setModalVisible={setPrivacyModalVisible} type={modalType} />
         </View>
+    );
+};
 
-        {/* 协议弹窗 */}
+const styles = StyleSheet.create({
-        <PrivacyModal modalVisible={privacyModalVisible} setModalVisible={setPrivacyModalVisible} type={modalType} />
+    container: {
-    </View>
+        width: '100%',
-}
+    },
+    inputContainer: {
+        marginBottom: 16,
+    },
+    inputWrapper: {
+        borderRadius: 12,
+        backgroundColor: '#FFF8DE',
+        overflow: 'hidden',
+    },
+    inputLabel: {
+        fontSize: 16,
+        color: '#1F2937',
+        marginBottom: 8,
+        marginLeft: 8,
+    },
+    textInput: {
+        padding: 12,
+        fontSize: 16,
+        color: '#1F2937',
+    },
+    passwordInputContainer: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        borderRadius: 12,
+        backgroundColor: '#FFF8DE',
+        overflow: 'hidden',
+    },
+    eyeIcon: {
+        paddingHorizontal: 12,
+        paddingVertical: 8,
+    },
+    signupButton: {
+        width: '100%',
+        backgroundColor: '#E2793F',
+        borderRadius: 28,
+        padding: 16,
+        alignItems: 'center',
+        marginBottom: 16,
+    },
+    signupButtonText: {
+        color: '#FFFFFF',
+        fontWeight: '600',
+    },
+    termsContainer: {
+        flexDirection: 'row',
+        alignItems: 'flex-start',
+        marginVertical: 10,
+    },
+    checkbox: {
+        width: 20,
+        height: 20,
+        borderRadius: 10,
+        borderWidth: 2,
+        borderColor: '#E5E7EB',
+        justifyContent: 'center',
+        alignItems: 'center',
+        marginRight: 8,
+        marginTop: 2,
+    },
+    checkboxChecked: {
+        backgroundColor: '#E2793F',
+        borderColor: '#E2793F',
+    },
+    termsTextContainer: {
+        flexDirection: 'row',
+        flexWrap: 'wrap',
+        flex: 1,
+    },
+    termsText: {
+        fontSize: 14,
+        color: '#1F2937',
+        lineHeight: 20,
+    },
+    termsLink: {
+        fontSize: 14,
+        color: '#E2793F',
+        lineHeight: 20,
+    },
+    loginContainer: {
+        flexDirection: 'row',
+        justifyContent: 'center',
+        marginTop: 24,
+    },
+    loginText: {
+        fontSize: 14,
+        color: '#1F2937',
+    },
+    loginLink: {
+        color: '#E2793F',
+        fontSize: 14,
+        fontWeight: '600',
+        marginLeft: 4,
+    },
+});
 
-export default SignUp
+export default SignUp;