diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx
index 02dff13..bc6b333 100755
--- a/app/components/Carousel.tsx
+++ b/app/components/Carousel.tsx
@@ -1,3 +1,4 @@
+// src/components/CarouselDemo.tsx
import * as React from "react";
import Autoplay from "embla-carousel-autoplay";
@@ -68,6 +69,15 @@ export function CarouselDemo() {
+ {/* 要闻列表 - 右上角 */}
+
+
+
+
+
+
+
+
{/* 分页指示器 - 右下角 */}
{Array.from({ length: count }).map((_, index) => (
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index bcddb69..1e35ecd 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -5,12 +5,7 @@ import CultureBgPage from "@/components/news/body/Culturebg";
import {Header} from "@/components/header/Header";
import {TopNav} from "@/components/header/TopNav";
import NewsList from "@/components/list/NewsList";
-<<<<<<< HEAD
-import ImageGridSection from "@/components/body/ImageGridSection";
-import { CarouselDemo } from "@/components/Carousel";
-=======
import GrassrootsDynamics from "@/components/body/GrassrootsDynamics";
->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
export function meta( ) {
return [
{ title: "New React Router App" },
@@ -26,12 +21,6 @@ export default function Home() {
-<<<<<<< HEAD
-
- {/* */}
-
-=======
->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
);
}