From 08b475e84d25ff50814d3cc7c1291dc12271ab3b Mon Sep 17 00:00:00 2001
From: qiuchenfan <2035024011@qq.com>
Date: Wed, 19 Nov 2025 08:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/body/ImageGridSection.tsx | 24 +++++++++++++++---------
 app/routes/news.tsx                      |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/components/body/ImageGridSection.tsx b/app/components/body/ImageGridSection.tsx
index 813ca63..c71f167 100644
--- a/app/components/body/ImageGridSection.tsx
+++ b/app/components/body/ImageGridSection.tsx
@@ -7,6 +7,10 @@ const ImageGridSection = () => {
         "/images/carousel-2.jpg",
         "/images/carousel-3.jpg"
     ];
+     {/* 最外 左右两列间 内边 内容最大宽 水平居 微软雅黑
+        2 列+ 2 行 格子间距 固定宽高
+        */} 
+
     const listItems = [
         '新闻标题一：重要政策发布',
         '新闻标题二：经济数据稳步回升',
@@ -23,8 +27,9 @@ const ImageGridSection = () => {
             margin: '0 auto',
             fontFamily: 'Microsoft YaHei, sans-serif'
         }}>
-
-            {/* 左侧：3张图片 + 1个轮播图 2x2 网格 */}
+        
+            {/* 左侧：3张图片 + 1个轮播图 2x2 网格 圆 防溢 拉伸填满
+            保持比例填充 消除底部空白*/}
             <div style={{
                 display: 'grid',
                 gridTemplateColumns: '1fr 1fr',
@@ -32,9 +37,9 @@ const ImageGridSection = () => {
                 gap: '16px',
                 width: '600px',
                 height: '450px',
-                border: '1px solid #ddd', // 可选，用于调试边界
                 boxSizing: 'border-box'   // 确保padding和border不会增加元素的实际宽度和高度
             }}>
+
                 {elements.map((element, index) => (
                     <div
                         key={index}
@@ -43,7 +48,7 @@ const ImageGridSection = () => {
                             overflow: 'hidden',
                             boxShadow: '0 4px 10px rgba(0,0,0,0.1)',
                             display: 'flex',
-                            alignItems: 'stretch' // 确保子元素拉伸填充容器
+                            alignItems: 'stretch' 
                         }}
                     >
                         {typeof element === 'string' ? (
@@ -58,7 +63,8 @@ const ImageGridSection = () => {
                                 }}
                             />
                         ) : (
-                            element // 如果是 React 元素，则直接渲染
+                            element //  占据剩余空间 最小宽度；与左侧高度对齐；垂直布局；内容在垂直方向均匀分布
+                            // 背景色、圆角、阴影、内边距 防撑大
                         )}
                     </div>
                 ))}
@@ -66,10 +72,10 @@ const ImageGridSection = () => {
             <div style={{
                 flex: 1,
                 minWidth: '300px',
-                height: '450px', // 设置与左侧相同的高度
+                height: '450px', 
                 display: 'flex',
                 flexDirection: 'column',
-                justifyContent: 'space-between', // 垂直方向均匀分布内容
+                justifyContent: 'space-between', 
                 background: '#f9f9f9',
                 borderRadius: '8px',
                 boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
@@ -79,8 +85,8 @@ const ImageGridSection = () => {
                 <ul style={{
                     listStyle: 'none',
                     padding: 0,
-                    flexGrow: 1, // 让列表尽可能填满可用空间
-                    overflowY: 'auto' // 当内容超出时启用滚动条
+                    flexGrow: 1, 
+                    overflowY: 'auto' // 当 内 容超出时启用滚动条 填满剩余 文间
                 }}>
                     {listItems.map((item, index) => (
                         <li
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 9411938..76a8479 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -11,6 +11,7 @@ import { FhywPage } from "@/components/FireNews/fhyw";
 import { FhjtPage } from "@/components/FireNews/fhjt";
 import { FhwsPage } from "@/components/FireNews/fhws";
 import { FhrxPage } from "@/components/FireNews/fhrx";
+import { AutoCarouselDemo } from "@/components/AutoCarousel";
 export function meta( ) {
   return [
     { title: "New React Router App" },
@@ -28,13 +29,12 @@ export default function Home() {
       <NewsList />
       <ImageGridSection />
       <GrassrootsDynamics />
-      <GrassrootsDynamics />
       <FhjtPage/>
       <FhwsPage/>
       <FhrxPage />  
+      <AutoCarouselDemo />
       <CultureBgPage />
       <Integrated />
-      <Integrated />
     </div>
   );
 }