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

app/components/news/body/FireNews/fhjt.tsx

@@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList";
 
 export function FhjtPage() {
     return(
-    <div className=" w-full overflow-hidden flex justify-center h-200 mb-10">
+    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
         <div className="relative">
 			{/* 轮播背景图 */}
 			<div className="w-200 absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>

app/components/news/body/FireNews/fhrx.tsx

@@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList";
 
 export function FhrxPage() {
     return(
-    <div className=" w-full overflow-hidden flex justify-center h-200 mb-10">
+    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
         <div className="relative">
 			{/* 轮播背景图 */}
 			<div className="w-200 absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>

app/components/news/body/FireNews/fhws.tsx

@@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList";
 
 export function FhwsPage() {
     return(
-    <div className=" w-full overflow-hidden flex justify-center h-200 mb-10">
+    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
         <div className="w-120 h-full bg-white relative" >
 			{/* 标题部分 */}
 			<div className="relative pt-6 pl-8">

app/components/news/body/FireNews/fhyw.tsx

@@ -1,17 +1,16 @@
 import { CarouselDemo } from "@/components/Carousel";
 import {FireNewsList} from "./FireNewsList";
 
-
 export function FhywPage() {
     return(
-    <div className="relative w-full max-w-4xl mx-auto overflow-hidden aspect-square">
-        {/* 轮播背景图 */}
-        <div className="absolute inset-0 z-0">
+    <div className="relative w-350 h-225 mx-auto overflow-hidden bg-sky-700">
+        {/* 轮播背景图 - 确保有明确尺寸 */}
+        <div className="absolute top-0 left-0 w-full h-200">
             <CarouselDemo />
         </div>
         
         {/* 固定的烽火要闻 */}
-        <div className="absolute top-0 right-0 w-1/3 h-full p-1">
+        <div className="absolute top-0 right-0 w-1/3 h-200 p-1">
             <FireNewsList />
         </div>
     </div>

app/components/news/header/TopNav.tsx

@@ -1,6 +1,6 @@
 import { Search } from 'lucide-react';
-import React, { useState, useEffect } from 'react';
-
+import React, { useState,useEffect} from 'react';
+import { Button } from '@/ui/button';
 interface MenuItem {
   label: string;
   key: string;
@@ -29,15 +29,7 @@ export function TopNav({
   const [internalActiveKey, setInternalActiveKey] = useState('home');
   const currentActiveKey = externalActiveKey !== undefined ? externalActiveKey : internalActiveKey;
   const [searchKeyword, setSearchKeyword] = useState('');
-  const [activeIndex, setActiveIndex] = useState(0);
-  const [prevIndex, setPrevIndex] = useState(0);
-
-  // 监听激活项变化，更新索引和动画方向
-  useEffect(() => {
-    const currentIndex = menuItems.findIndex(item => item.key === currentActiveKey);
-    setPrevIndex(activeIndex);
-    setActiveIndex(currentIndex);
-  }, [currentActiveKey, menuItems, activeIndex]);
+ 
 
   const handleSearchSubmit = (e: React.FormEvent) => {
     e.preventDefault();
@@ -52,61 +44,53 @@ export function TopNav({
   };
 
   return (
-    <div className="h-20 flex items-center justify-center px-8 bg-white">
+    // 将组件宽度调整为1514px，并保持居中
+    <div className="h-20 w-[1514px] mx-auto flex items-center px-8 bg-white border-t-16 border-b-16 border-[#1f79bf]">
       {/* 搜索框与导航菜单组合 */}
-      <div className="flex items-center space-x-4">
+      <div className="flex items-center justify-start w-full gap-5">
         {/* 搜索框 */}
-        <form onSubmit={handleSearchSubmit} className="relative">
-          <div className="relative">
-            <input
-              type="text"
-              value={searchKeyword}
-              onChange={(e) => setSearchKeyword(e.target.value)}
-              placeholder="搜索..."
-              className="pl-10 pr-4 py-2 text-sm border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm"
-            />
-            <span className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400">
-              <Search className="w-5 h-5" />
-            </span>
-          </div>
-        </form>
+        
+        <div className="relative overflow-hidden bg-gray-100 ">
+          <Button variant="default" className="absolute rounded-none right-0 top-1/2 transform -translate-y-1/2 bg-[#1f79bf] hover:bg-[#1a68a0] text-white border-0 "
+                 onClick={handleSearchSubmit}
+                 
+                 >
+            <Search className="w-5 h-5" />
+          </Button>
 
-        {/* 导航菜单 */}
-        <ul className="flex space-x-8 relative">
-          {/* 滑动背景层 */}
-          <div 
-            className="absolute inset-y-0 z-0 transition-all duration-500 ease-out"
-            style={{
-              left: `${activeIndex * (100 / menuItems.length)}%`,
-              width: `${100 / menuItems.length}%`,
-              clipPath: 'polygon(0% 0%, 80% 0%, 100% 100%, 20% 100%)', // 向左倾斜的平行四边形
-              background: 'linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%)',
-              transform: `translateX(${(prevIndex - activeIndex) * 100}%)`,
-            }}
-          />
-          
-          {menuItems.map((item, index) => {
+          <input type="text" 
+                 placeholder='请输入关键词'
+                 value={searchKeyword}
+                 onChange={(e) => setSearchKeyword(e.target.value)}
+                className="pl-5 pr-4 py-2 text-sm h-full border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm" />
+        </div>
+ 
+         
+          {/* 导航菜单 */}
+        <ul className="flex space-x-20 relative">
+          {menuItems.map((item) => {
             const isActive = currentActiveKey === item.key;
             return (
-              <li 
-                key={item.key} 
-                className="relative z-10"
-                style={{ width: `${100 / menuItems.length}%` }}
-              >
+              <li key={item.key} className="relative">
                 <button
                   onClick={() => handleItemClick(item)}
-                  className={`w-full h-full px-4 py-2 text-2xl transition-all duration-300 ${
-                    isActive
-                      ? 'text-white' // 激活状态文字颜色
-                      : 'text-gray-600 hover:text-black cursor-pointer' // 非激活状态样式
+                  className={`px-4 py-2 text-2xl font-extralight transition-all duration-500 relative z-10 ${
+                    isActive ? 'text-white' : 'text-gray-600 hover:font-bold'
                   }`}
                 >
-                  {item.label}
+                  {/* 激活状态背景层 */}
+                  {isActive && (
+                    <span className="absolute inset-0 bg-gradient-to-br from-blue-500 to-blue-700 transform skew-x-12  rounded-none z-0"></span>
+                  )}
+                  <span className="relative z-20">{item.label}</span>
                 </button>
               </li>
             );
           })}
         </ul>
+
+
+
       </div>
     </div>
   );