From 8b742bdc340e799ce0cb626774b23fe6b9df7734 Mon Sep 17 00:00:00 2001 From: luorijun Date: Fri, 25 Apr 2025 09:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=96=87=E4=BB=B6=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E8=B0=83=E6=95=B4=20Header=20=E5=92=8C=20Foo?= =?UTF-8?q?ter=20=E7=BB=84=E4=BB=B6=E7=9A=84=E5=AF=BC=E5=85=A5=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/{(root) => (home)}/@footer/page.tsx | 0 src/app/{(root) => (home)}/@header/_client/help.tsx | 0 src/app/{(root) => (home)}/@header/_client/navs.tsx | 0 src/app/{(root) => (home)}/@header/_client/product.tsx | 2 +- src/app/{(root) => (home)}/@header/_client/provider.tsx | 0 src/app/{(root) => (home)}/@header/_client/solution.tsx | 0 src/app/{(root) => (home)}/@header/page.tsx | 2 +- src/app/{(root) => (home)}/collect/page.tsx | 0 src/app/{(root) => (home)}/layout.tsx | 8 ++++---- src/app/{(root) => (home)}/page.tsx | 0 src/app/{(root) => (home)}/product/page.tsx | 0 src/app/layout.tsx | 2 +- 12 files changed, 7 insertions(+), 7 deletions(-) rename src/app/{(root) => (home)}/@footer/page.tsx (100%) rename src/app/{(root) => (home)}/@header/_client/help.tsx (100%) rename src/app/{(root) => (home)}/@header/_client/navs.tsx (100%) rename src/app/{(root) => (home)}/@header/_client/product.tsx (98%) rename src/app/{(root) => (home)}/@header/_client/provider.tsx (100%) rename src/app/{(root) => (home)}/@header/_client/solution.tsx (100%) rename src/app/{(root) => (home)}/@header/page.tsx (75%) rename src/app/{(root) => (home)}/collect/page.tsx (100%) rename src/app/{(root) => (home)}/layout.tsx (60%) rename src/app/{(root) => (home)}/page.tsx (100%) rename src/app/{(root) => (home)}/product/page.tsx (100%) diff --git a/src/app/(root)/@footer/page.tsx b/src/app/(home)/@footer/page.tsx similarity index 100% rename from src/app/(root)/@footer/page.tsx rename to src/app/(home)/@footer/page.tsx diff --git a/src/app/(root)/@header/_client/help.tsx b/src/app/(home)/@header/_client/help.tsx similarity index 100% rename from src/app/(root)/@header/_client/help.tsx rename to src/app/(home)/@header/_client/help.tsx diff --git a/src/app/(root)/@header/_client/navs.tsx b/src/app/(home)/@header/_client/navs.tsx similarity index 100% rename from src/app/(root)/@header/_client/navs.tsx rename to src/app/(home)/@header/_client/navs.tsx diff --git a/src/app/(root)/@header/_client/product.tsx b/src/app/(home)/@header/_client/product.tsx similarity index 98% rename from src/app/(root)/@header/_client/product.tsx rename to src/app/(home)/@header/_client/product.tsx index af399da..92023be 100644 --- a/src/app/(root)/@header/_client/product.tsx +++ b/src/app/(home)/@header/_client/product.tsx @@ -6,7 +6,7 @@ import Link from 'next/link' import {merge} from '@/lib/utils' import prod from '@/assets/header/product/prod.svg' import custom from '@/assets/header/product/custom.svg' -import {HeaderContext} from '@/app/(root)/@header/_client/provider' +import {HeaderContext} from '@/app/(home)/@header/_client/provider' type TabType = 'domestic' | 'oversea' diff --git a/src/app/(root)/@header/_client/provider.tsx b/src/app/(home)/@header/_client/provider.tsx similarity index 100% rename from src/app/(root)/@header/_client/provider.tsx rename to src/app/(home)/@header/_client/provider.tsx diff --git a/src/app/(root)/@header/_client/solution.tsx b/src/app/(home)/@header/_client/solution.tsx similarity index 100% rename from src/app/(root)/@header/_client/solution.tsx rename to src/app/(home)/@header/_client/solution.tsx diff --git a/src/app/(root)/@header/page.tsx b/src/app/(home)/@header/page.tsx similarity index 75% rename from src/app/(root)/@header/page.tsx rename to src/app/(home)/@header/page.tsx index 6b7defe..63b6599 100644 --- a/src/app/(root)/@header/page.tsx +++ b/src/app/(home)/@header/page.tsx @@ -1,4 +1,4 @@ -import Provider from '@/app/(root)/@header/_client/provider' +import Provider from '@/app/(home)/@header/_client/provider' export type HeaderProps = {} diff --git a/src/app/(root)/collect/page.tsx b/src/app/(home)/collect/page.tsx similarity index 100% rename from src/app/(root)/collect/page.tsx rename to src/app/(home)/collect/page.tsx diff --git a/src/app/(root)/layout.tsx b/src/app/(home)/layout.tsx similarity index 60% rename from src/app/(root)/layout.tsx rename to src/app/(home)/layout.tsx index e3be616..1142fb5 100644 --- a/src/app/(root)/layout.tsx +++ b/src/app/(home)/layout.tsx @@ -1,12 +1,12 @@ -import Header from '@/app/(root)/@header/page' -import Footer from '@/app/(root)/@footer/page' +import Header from '@/app/(home)/@header/page' +import Footer from '@/app/(home)/@footer/page' import {ReactNode} from 'react' -export type RootLayoutProps = { +export type HomeLayoutProps = { children: ReactNode } -export default function RootLayout(props: RootLayoutProps) { +export default function HomeLayout(props: HomeLayoutProps) { return (
{/* 页头 */} diff --git a/src/app/(root)/page.tsx b/src/app/(home)/page.tsx similarity index 100% rename from src/app/(root)/page.tsx rename to src/app/(home)/page.tsx diff --git a/src/app/(root)/product/page.tsx b/src/app/(home)/product/page.tsx similarity index 100% rename from src/app/(root)/product/page.tsx rename to src/app/(home)/product/page.tsx diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 5b2d4b0..d79788b 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -24,7 +24,7 @@ export default async function RootLayout({ const user = await getProfile() return ( - + {children}