diff --git a/code/base-project/base-app/src/app/_layout.tsx b/code/base-project/base-app/src/app/_layout.tsx index eb473a3d..7b26423f 100644 --- a/code/base-project/base-app/src/app/_layout.tsx +++ b/code/base-project/base-app/src/app/_layout.tsx @@ -56,7 +56,7 @@ export default function RootLayout() { // 如果没有 token,则跳转登录页 if (token === null) { - router.replace('/auth/login') + // router.replace('/auth/login') } } }, [fontsLoaded, storeLoaded, token]) @@ -83,8 +83,7 @@ export default function RootLayout() { diff --git a/code/base-project/base-app/src/app/auth/login.tsx b/code/base-project/base-app/src/app/auth/login.tsx index d2a37af8..987313e3 100644 --- a/code/base-project/base-app/src/app/auth/login.tsx +++ b/code/base-project/base-app/src/app/auth/login.tsx @@ -1,9 +1,12 @@ import { Text, View } from 'react-native' +import CustomLayout from '@/components/custom/layout' export default function AuthLogin() { return ( - - Login - + + + 登录 + + ) } diff --git a/code/base-project/base-app/src/components/custom/layout.tsx b/code/base-project/base-app/src/components/custom/layout.tsx new file mode 100644 index 00000000..4c007115 --- /dev/null +++ b/code/base-project/base-app/src/components/custom/layout.tsx @@ -0,0 +1,21 @@ +import { useRouter } from 'expo-router' +// components/Layout.tsx +import { Pressable, Text, View } from 'react-native' +import { SafeAreaView } from 'react-native-safe-area-context' + +interface LayoutProps { + title: string + children: React.ReactNode + showBack?: boolean + right?: React.ReactNode +} + +export default function CustomLayout({ title, children, showBack = true, right }: LayoutProps) { + const router = useRouter() + + return ( + + {children} + + ) +} diff --git a/code/base-project/base-app/src/static/images/network-lost.svg b/code/base-project/base-app/src/static/images/server-lost.svg similarity index 100% rename from code/base-project/base-app/src/static/images/network-lost.svg rename to code/base-project/base-app/src/static/images/server-lost.svg diff --git a/logo (2).png b/logo (2).png new file mode 100644 index 00000000..0fd90bc0 Binary files /dev/null and b/logo (2).png differ diff --git a/logo.png b/logo.png new file mode 100644 index 00000000..173c4e27 Binary files /dev/null and b/logo.png differ