From 1d49f000efd9f3e6ac13da4e459b8e1e600c3335 Mon Sep 17 00:00:00 2001
From: qiuchenfan <2035024011@qq.com>
Date: Tue, 18 Nov 2025 17:13:49 +0800
Subject: [PATCH] part2

---
 app/components/{untils => }/Carousel.tsx |   0
 app/components/body/ImageGridSection.tsx | 103 +++++++++++++++++++++++
 app/components/body/learn.tsx            |   0
 app/routes/news.tsx                      |   7 +-
 4 files changed, 108 insertions(+), 2 deletions(-)
 rename app/components/{untils => }/Carousel.tsx (100%)
 create mode 100644 app/components/body/ImageGridSection.tsx
 delete mode 100644 app/components/body/learn.tsx

diff --git a/app/components/untils/Carousel.tsx b/app/components/Carousel.tsx
similarity index 100%
rename from app/components/untils/Carousel.tsx
rename to app/components/Carousel.tsx
diff --git a/app/components/body/ImageGridSection.tsx b/app/components/body/ImageGridSection.tsx
new file mode 100644
index 0000000..6625297
--- /dev/null
+++ b/app/components/body/ImageGridSection.tsx
@@ -0,0 +1,103 @@
+import { CarouselDemo } from "@/components/Carousel";
+const ImageGridSection = () => {
+    // 替换为你自己的图片路径
+    const elements = [
+        "/images/carousel-1.jpg",
+        <CarouselDemo />,
+        "/images/carousel-2.jpg",
+        "/images/carousel-3.jpg"
+    ];
+    const listItems = [
+        '新闻标题一：重要政策发布',
+        '新闻标题二：经济数据稳步回升',
+        '新闻标题三：科技创新成果显著',
+        '新闻标题四：民生工程持续推进',
+        '新闻标题五：国际交流合作深化'
+    ];
+    return (
+        <div style={{
+            display: 'flex',
+            gap: '24px',
+            padding: '20px',
+            maxWidth: '1200px',
+            margin: '0 auto',
+            fontFamily: 'Microsoft YaHei, sans-serif'
+        }}>
+
+            {/* 左侧：3张图片 + 1个轮播图 2x2 网格 */}
+            <div style={{
+                display: 'grid',
+                gridTemplateColumns: '1fr 1fr',
+                gridTemplateRows: '1fr 1fr',
+                gap: '16px',
+                width: '600px',
+                height: '450px',
+                border: '1px solid #ddd', // 可选，用于调试边界
+                boxSizing: 'border-box'   // 确保padding和border不会增加元素的实际宽度和高度
+            }}>
+                {elements.map((element, index) => (
+                    <div
+                        key={index}
+                        style={{
+                            borderRadius: '8px',
+                            overflow: 'hidden',
+                            boxShadow: '0 4px 10px rgba(0,0,0,0.1)',
+                            display: 'flex',
+                            alignItems: 'stretch' // 确保子元素拉伸填充容器
+                        }}
+                    >
+                        {typeof element === 'string' ? (
+                            <img
+                                src={element}
+                                alt={`图片 ${index + 1}`}
+                                style={{
+                                    width: '100%',
+                                    height: '100%',
+                                    objectFit: 'cover',
+                                    display: 'block'
+                                }}
+                            />
+                        ) : (
+                            element // 如果是 React 元素，则直接渲染
+                        )}
+                    </div>
+                ))}
+            </div>
+            <div style={{
+                flex: 1,
+                minWidth: '300px',
+                height: '450px', // 设置与左侧相同的高度
+                display: 'flex',
+                flexDirection: 'column',
+                justifyContent: 'space-between', // 垂直方向均匀分布内容
+                background: '#f9f9f9',
+                borderRadius: '8px',
+                boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
+                padding: '16px',
+                boxSizing: 'border-box'
+            }}>
+                <ul style={{
+                    listStyle: 'none',
+                    padding: 0,
+                    flexGrow: 1, // 让列表尽可能填满可用空间
+                    overflowY: 'auto' // 当内容超出时启用滚动条
+                }}>
+                    {listItems.map((item, index) => (
+                        <li
+                            key={index}
+                            style={{
+                                marginBottom: '12px',
+                                color: '#333',
+                                fontSize: '16px'
+                            }}
+                        >
+                            <span style={{ color: '#c00', marginRight: '8px' }}>•</span>
+                            {item}
+                        </li>
+                    ))}
+                </ul>
+            </div>
+        </div>
+    );
+};
+export default ImageGridSection;
\ No newline at end of file
diff --git a/app/components/body/learn.tsx b/app/components/body/learn.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index eaba461..dd1e84b 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -1,8 +1,9 @@
-import { CarouselDemo } from "@/components/untils/Carousel";
+import { CarouselDemo } from "@/components/Carousel";
 import type { Route } from "./+types/news";
 import {Header} from "@/components/header/Header";
 import {TopNav} from "@/components/header/TopNav";
 import NewsList from "@/components/list/NewsList";
+import ImageGridSection from "@/components/body/ImageGridSection";
 export function meta( ) {
   return [
     { title: "New React Router App" },
@@ -13,8 +14,10 @@ export function meta( ) {
 export default function Home() {
   return (
     <div>
-      <CarouselDemo />
+      <Header />
+      <TopNav />
       <NewsList />
+      <ImageGridSection />
     </div>
   );
 }