1

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() {
         <CarouselNext className="absolute right-2 top-1/2 -translate-y-1/2 z-10" />
       </Carousel>
 
+      {/* 要闻列表 - 右上角 */}
+      <div className="absolute top-0 right-0 w-1/3 h-full">
+        <Card className="h-full">
+          <CardContent className="h-full p-0">
+            <FireNewsList />
+          </CardContent>
+        </Card>
+      </div>
+
       {/* 分页指示器 - 右下角 */}
       <div className="absolute bottom-4 right-4 flex gap-2 z-10">
         {Array.from({ length: count }).map((_, index) => (

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() {
       <TopNav />
       <CarouselDemo />
       <NewsList />
-<<<<<<< HEAD
-      <ImageGridSection />
-      {/* <Integrated /> */}
-      <CultureBgPage />
-=======
->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8
     </div>
   );
 }