Merge branch 'main' of http://113.45.67.59:3003/qiuchenfan/news

app/components/news/body/GrassrootsDynamics.tsx

@@ -1,21 +1,24 @@
 import React from 'react';
-import List from '@/components/list/List';
+import List from '@/components/news/list/List';
+
+
 
 export default function GrassrootsDynamics() {
   return (
-    <div className="flex  rounded-2xl  mx-auto w-4/5 h-140 mt-10 p-10">
+    <div className="flex  rounded-2xl  mx-auto w-4/5 h-140  pt-20 mb-20 ">
       <div className="w-2/5 p-6 flex flex-col items-center justify-center relative">
-        <div >
+        <div className="w-140  ">
           <img
             src="/images/carousel-1.jpg"
             alt="基层动态"
-            className="w-full h-full "
+
           />
         </div>
       </div>
 
       {/* 右边列表 */}
-      <div className="w-3/5 p-6 flex flex-col bg-[#0e93df] text-white">
+      <div className="w-3/5 p-6 flex flex-col bg-[#0e93df]  rounded-2xl h-130
+      ">
         <List />
       </div>
     </div>

app/components/news/list/List.tsx

@@ -19,11 +19,11 @@ const NewsItem: React.FC<NewsProps> = ({ title = '', time = '', url = '' }) => {
         {/* 标题部分：左侧 */}
         <div className="flex items-center">
           <div className="w-2 h-2 bg-white rounded-full mr-2"></div>
-          <h3 className="text-lg font-semibold text-white hover:text-blue-600">{title}</h3>
+          <h3 className="text-xl font-semibold text-white hover:text-blue-600">{title}</h3>
         </div>
 
         {/* 时间部分：右侧 */}
-        <p className="text-sm text-white hover:text-blue-600 text-right">{time}</p>
+        <p className="text-xl text-white hover:text-blue-600 text-right">{time}</p>
       </div>
     </div>
   );

app/components/news/list/NewsList.tsx

@@ -28,7 +28,7 @@ const NewsList: React.FC = () => {
   const educationNews = mockNewsData.filter((news) => news.type === "教育");
 
   return (
-    <div className="bg-gray-50 p-8 rounded-2xl shadow-xl w-4/5 mx-auto">
+    <div className=" p-8 rounded-2xl  w-4/5 mx-auto">
       {/* 使用 Flexbox 将两个列表放在一行 */}
       <div className="flex gap-8">
         {/* 科技新闻 */}

app/routes/news.tsx

@@ -4,7 +4,7 @@ import Integrated from "@/components/news/body/Integrated";
 import CultureBgPage from "@/components/news/body/Culturebg";
 import {Header} from "@/components/news/header/Header";
 import {TopNav} from "@/components/news/header/TopNav";
-import NewsList from "@/components/list/NewsList";
+import NewsList from "@/components/news/list/NewsList";
 import ImageGridSection from "@/components/news/body/ImageGridSection";
 import GrassrootsDynamics from "@/components/news/body/GrassrootsDynamics";
 import { FhywPage } from "@/components/news/body/FireNews/fhyw";