fix: footer样式问题

TeamVastsea · Aug 16, 2024 · e355be6 · e355be6
1 parent d2eb39a
commit e355be6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/app/(index)/layout.tsx b/app/(index)/layout.tsx
@@ -7,6 +7,7 @@ import { Notifications } from '@mantine/notifications';
 import { theme } from '@/theme';
 import '@mantine/notifications/styles.css';
 import Header from '@/components/Header';
+import Footer from '@/components/Footer';
 
 export default function RootLayout({ children }: { children: any }) {
   return (
@@ -20,24 +21,24 @@ export default function RootLayout({ children }: { children: any }) {
         />
           <title>苦力怕论坛 | 问卷系统</title>
       </head>
-      <body>
+      <body style={{
+        overflow: 'hidden',
+      }}>
         <MantineProvider theme={theme}>
             <Notifications position="top-right" />
             <AppShell
-              style={{
-                    scrollSnapType: 'y mandatory',
-                    overflowY: 'scroll',
-                    height: '100vh',
-                }}
               header={{ height: 60 }}
             >
                 <AppShell.Header>
                     <Header />
                 </AppShell.Header>
 
                 <AppShell.Main>
-                    {children}
+                  {children}
                 </AppShell.Main>
+                <AppShell.Footer mah={120}>
+                  <Footer />
+                </AppShell.Footer>
             </AppShell>
         </MantineProvider>
       </body>

diff --git a/app/(index)/page.tsx b/app/(index)/page.tsx
@@ -45,6 +45,11 @@ export default function HomePage() {
     return (
         <>
             <div
+              style={{
+                  scrollSnapType: 'y mandatory',
+                  overflowY: 'scroll',
+                  height: '100vh',
+                }}
             >
                 <Center
                   style={{
@@ -102,8 +107,8 @@ export default function HomePage() {
                         minHeight: '100vh',
                         scrollSnapAlign: 'start',
                         scrollSnapStop: 'always',
-                        paddingTop: 60,
                     }}
+                  pb={120}
                 >
                     <Stack>
                         <Center>
@@ -126,7 +131,6 @@ export default function HomePage() {
                                 ))}
                             </SimpleGrid>
                         </Center>
-                        <Footer />
                     </Stack>
                 </Center>
             </div>