Merge branch 'main' of http://113.45.67.59:3003/qiuchenfan/news
This commit is contained in:
commit
a2ff340b4d
|
|
@ -7,8 +7,11 @@ export function Hotline() {
|
||||||
<div className=" w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
|
<div className=" w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
|
||||||
<div className="relative left-0 top-0 w-full h-full">
|
<div className="relative left-0 top-0 w-full h-full">
|
||||||
{/* 轮播背景图 */}
|
{/* 轮播背景图 */}
|
||||||
<div className="w-full absolute" style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
|
<div className="w-full h-full absolute" style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
|
||||||
<CarouselDemo />
|
<CarouselDemo
|
||||||
|
paginationPosition="left"
|
||||||
|
paginationStyle="dot"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='top-0 right-0 bg-white h-full'></div>
|
<div className='top-0 right-0 bg-white h-full'></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,11 @@ export function ImportantNews() {
|
||||||
return(
|
return(
|
||||||
<div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
|
<div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
|
||||||
{/* 轮播背景图 - 确保有明确尺寸 */}
|
{/* 轮播背景图 - 确保有明确尺寸 */}
|
||||||
<div className="absolute top-0 left-0 w-full h-225">
|
<div className="absolute top-0 left-0 w-full h-full">
|
||||||
<CarouselDemo />
|
<CarouselDemo
|
||||||
|
paginationPosition="left"
|
||||||
|
paginationStyle="dot"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 固定的烽火要闻 */}
|
{/* 固定的烽火要闻 */}
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,11 @@ export function LectureHall() {
|
||||||
<div className="w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
|
<div className="w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
|
||||||
<div className="relative left-0 top-0 w-full h-full">
|
<div className="relative left-0 top-0 w-full h-full">
|
||||||
{/* 轮播背景图 */}
|
{/* 轮播背景图 */}
|
||||||
<div className="w-full absolute" style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
|
<div className="w-full h-full absolute" style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
|
||||||
<CarouselDemo />
|
<CarouselDemo
|
||||||
|
paginationPosition="left"
|
||||||
|
paginationStyle="dot"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='top-0 right-0 bg-white h-full'></div>
|
<div className='top-0 right-0 bg-white h-full'></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,11 @@ export function MicroVision() {
|
||||||
</div>
|
</div>
|
||||||
<div className="relative w-full h-full">
|
<div className="relative w-full h-full">
|
||||||
{/* 轮播背景图 */}
|
{/* 轮播背景图 */}
|
||||||
<div className="w-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
|
<div className="w-full h-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
|
||||||
<CarouselDemo />
|
<CarouselDemo
|
||||||
|
paginationPosition="right"
|
||||||
|
paginationStyle="dot"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='w-full bg-white h-full'></div>
|
<div className='w-full bg-white h-full'></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,10 @@ const LearnPage = () => {
|
||||||
|
|
||||||
{/* 上右:轮播图 */}
|
{/* 上右:轮播图 */}
|
||||||
<div className="col-span-2 row-span-1 rounded-lg shadow-sm overflow-hidden">
|
<div className="col-span-2 row-span-1 rounded-lg shadow-sm overflow-hidden">
|
||||||
<CarouselDemo />
|
<CarouselDemo
|
||||||
|
paginationPosition="right"
|
||||||
|
paginationStyle="bar"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 下三图 */}
|
{/* 下三图 */}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
export function Footer() {
|
export function Footer() {
|
||||||
return (
|
return (
|
||||||
<div className='w-full h-190 bg-[#0082e9] flex items-center justify-center'
|
<div className='w-full h-190 bg-[#0082e9] flex items-center justify-center'
|
||||||
style={{backgroundImage: "url('/public/images/carousel-4.jpg')"}}
|
style={{}}
|
||||||
>
|
>
|
||||||
<div className='text-white text-2xl'>
|
<div className='text-white text-2xl'>
|
||||||
春风拂面花开满园心情愉悦
|
春风拂面花开满园心情愉悦
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,10 @@ import { Hotline } from "@/components/news/body/FireNews/Hotline";
|
||||||
import { AutoCarouselDemo } from "@/components/AutoCarousel";
|
import { AutoCarouselDemo } from "@/components/AutoCarousel";
|
||||||
import { Footer } from "@/components/news/footer/footer";
|
import { Footer } from "@/components/news/footer/footer";
|
||||||
import { CarouselDemo } from "@/components/Carousel";
|
import { CarouselDemo } from "@/components/Carousel";
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> c14daff3c048d7b97f1a2e62ab201d234aaf0e77
|
||||||
|
|
||||||
export function meta( ) {
|
export function meta( ) {
|
||||||
return [
|
return [
|
||||||
|
|
@ -41,7 +45,6 @@ export default function Home() {
|
||||||
<AutoCarouselDemo />
|
<AutoCarouselDemo />
|
||||||
<CultureBgPage />
|
<CultureBgPage />
|
||||||
<Integrated />
|
<Integrated />
|
||||||
<CarouselDemo />
|
|
||||||
</div>
|
</div>
|
||||||
<Footer />
|
<Footer />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue