qiuchenfan
/
news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Li1304553726 2025-11-19 10:39:18 +08:00
parent e82570dcb2 3d40e0842b
commit 94da72d1c0
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/components/FireNews/FireNewsList.tsx → app/components/news/body/FireNews/FireNewsList.tsx
View File

5
app/components/FireNews/fhjt.tsx → app/components/news/body/FireNews/fhjt.tsx
View File

@ -1,5 +1,10 @@
<<<<<<< HEAD:app/components/FireNews/fhjt.tsx
import { CarouselDemo } from "../Carousel"; import { CarouselDemo } from "../Carousel";
=======
import { CarouselDemo } from "@/components/Carousel";
import {FireNewsList} from "./FireNewsList";
>>>>>>> 3d40e0842bfbc0f98f28bff855cbd548b078cc8f:app/components/news/body/FireNews/fhjt.tsx
export function FhjtPage() { export function FhjtPage() {

2
app/components/FireNews/fhrx.tsx → app/components/news/body/FireNews/fhrx.tsx
View File

@ -1,4 +1,4 @@
import { CarouselDemo } from "../Carousel"; import { CarouselDemo } from "@/components/Carousel";
import {FireNewsList} from "./FireNewsList"; import {FireNewsList} from "./FireNewsList";

2
app/components/FireNews/fhws.tsx → app/components/news/body/FireNews/fhws.tsx
View File

@ -1,4 +1,4 @@
import { CarouselDemo } from "../Carousel"; import { CarouselDemo } from "@/components/Carousel";
import {FireNewsList} from "./FireNewsList"; import {FireNewsList} from "./FireNewsList";

2
app/components/FireNews/fhyw.tsx → app/components/news/body/FireNews/fhyw.tsx
View File

@ -1,4 +1,4 @@
import { CarouselDemo } from "../Carousel"; import { CarouselDemo } from "@/components/Carousel";
import {FireNewsList} from "./FireNewsList"; import {FireNewsList} from "./FireNewsList";

2
app/components/body/GrassrootsDynamics.tsx → app/components/news/body/GrassrootsDynamics.tsx
View File

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import List from '../list/List'; import List from '@/components/list/List';
export default function GrassrootsDynamics() { export default function GrassrootsDynamics() {
return ( return (

0
app/components/body/ImageGridSection.tsx → app/components/news/body/ImageGridSection.tsx
View File

12
app/routes/news.tsx
View File

@ -5,12 +5,12 @@ import CultureBgPage from "@/components/news/body/Culturebg";
import {Header} from "@/components/news/header/Header"; import {Header} from "@/components/news/header/Header";
import {TopNav} from "@/components/news/header/TopNav"; import {TopNav} from "@/components/news/header/TopNav";
import NewsList from "@/components/list/NewsList"; import NewsList from "@/components/list/NewsList";
import ImageGridSection from "@/components/body/ImageGridSection"; import ImageGridSection from "@/components/news/body/ImageGridSection";
import GrassrootsDynamics from "@/components/body/GrassrootsDynamics"; import GrassrootsDynamics from "@/components/news/body/GrassrootsDynamics";
import { FhywPage } from "@/components/FireNews/fhyw"; import { FhywPage } from "@/components/news/body/FireNews/fhyw";
import { FhjtPage } from "@/components/FireNews/fhjt"; import { FhjtPage } from "@/components/news/body/FireNews/fhjt";
import { FhwsPage } from "@/components/FireNews/fhws"; import { FhwsPage } from "@/components/news/body/FireNews/fhws";
import { FhrxPage } from "@/components/FireNews/fhrx"; import { FhrxPage } from "@/components/news/body/FireNews/fhrx";
import { AutoCarouselDemo } from "@/components/AutoCarousel"; import { AutoCarouselDemo } from "@/components/AutoCarousel";
export function meta( ) { export function meta( ) {
return [ return [