修该首页
This commit is contained in:
parent
e6b12574b4
commit
132d005bb1
|
|
@ -5,12 +5,9 @@ import CultureBgPage from "@/components/news/body/Culturebg";
|
||||||
import {Header} from "@/components/news/header/Header";
|
import {Header} from "@/components/news/header/Header";
|
||||||
import {TopNav} from "@/components/news/header/TopNav";
|
import {TopNav} from "@/components/news/header/TopNav";
|
||||||
import NewsList from "@/components/list/NewsList";
|
import NewsList from "@/components/list/NewsList";
|
||||||
<<<<<<< HEAD
|
|
||||||
import ImageGridSection from "@/components/body/ImageGridSection";
|
import ImageGridSection from "@/components/body/ImageGridSection";
|
||||||
import { CarouselDemo } from "@/components/Carousel";
|
import { CarouselDemo } from "@/components/Carousel";
|
||||||
=======
|
|
||||||
import GrassrootsDynamics from "@/components/body/GrassrootsDynamics";
|
import GrassrootsDynamics from "@/components/body/GrassrootsDynamics";
|
||||||
>>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
|
|
||||||
export function meta( ) {
|
export function meta( ) {
|
||||||
return [
|
return [
|
||||||
{ title: "New React Router App" },
|
{ title: "New React Router App" },
|
||||||
|
|
@ -26,12 +23,9 @@ export default function Home() {
|
||||||
<TopNav />
|
<TopNav />
|
||||||
<CarouselDemo />
|
<CarouselDemo />
|
||||||
<NewsList />
|
<NewsList />
|
||||||
<<<<<<< HEAD
|
|
||||||
<ImageGridSection />
|
<ImageGridSection />
|
||||||
{/* <Integrated /> */}
|
<Integrated />
|
||||||
<CultureBgPage />
|
<CultureBgPage />
|
||||||
=======
|
|
||||||
>>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue