소스 검색

冲突问题

zhangzf 1 주 전
부모
커밋
e09718e54d

+ 0 - 3
src/app/(public)/_components/HomeBestSellers.tsx

@@ -1,9 +1,6 @@
 // import { Swiper, SwiperSlide } from "swiper/react";
 // import { Navigation, Pagination } from "swiper/modules";
 import { OpenAddToCartModalButton } from "@/components/common/AddToCartModal/OpenAddToCartModalButton";
-// 导入Swiper基础样式
-import "swiper/css";
-import "swiper/css/navigation";
 import type { HomeProduct,HomeSection } from "@/types/home/type";
 import Link from "next/link";
 import Image from "next/image";

+ 8 - 10
src/app/(public)/_components/HomeContent.tsx

@@ -1,7 +1,7 @@
 "use client";
 // import { Swiper, SwiperSlide } from "swiper/react";
 // import { Navigation } from "swiper/modules";
-import {useState} from "react";
+// import {useState} from "react";
 import JinGangSwiper from "./JinGangSwiper";
 import TopImageSwiper from "./TopImageSwiper"
 import HomeBestSellers from "./HomeBestSellers"
@@ -11,11 +11,9 @@ import MiddleImageSwiper from "./MiddleImageSwiper";
 import Trending from "./Trending";
 import RecommendedProducts from "./RecommendedProducts";
 // import CategoryTabSwiper  from "./CategoryTabSwiper ";
-import "swiper/css";
-import "swiper/css/navigation";
 import type {HomeApiData,HomeProduct } from "@/types/home/type"
 import {CustomerService} from "@/components/common/CustomerService/CustomerService";
-import AddToCartModalNew from "@/components/common/AddToCartModal/AddToCartModalNew";
+// import AddToCartModalNew from "@/components/common/AddToCartModal/AddToCartModalNew";
 // 定义组件入参类型
 interface HomeContentProps {
   homeData: HomeApiData;
@@ -127,10 +125,10 @@ export default function HomeContent({ homeData }: HomeContentProps) {
   const recommendedSection = sections.find(sec => sec.name === "Recommended_For_You");
   // const recommended: HomeProduct[] = recommendedSection?.products ?? [];
 
-  const [isOpen, setIsOpen] = useState(false);
-  const closeHandler = () => {
-    setIsOpen(false);
-  } 
+  // const [isOpen, setIsOpen] = useState(false);
+  // const closeHandler = () => {
+  //   setIsOpen(false);
+  // } 
   return (<>
     <div className="min-h-screen pt-[162px] bg-white font-sans">
       {/* 顶部Banner */}
@@ -159,10 +157,10 @@ export default function HomeContent({ homeData }: HomeContentProps) {
       {/* <CategoryTabSwiper /> */}
     </div>
     <CustomerService />
-    <button onClick={() => setIsOpen(true)}>test</button>
+    {/* <button onClick={() => setIsOpen(true)}>test</button>
     <AddToCartModalNew
         isOpen={isOpen}
         onClose={closeHandler}
-    />
+    /> */}
   </>);
 }

+ 0 - 2
src/app/(public)/_components/HomeMiddleBanner.tsx

@@ -2,8 +2,6 @@
 // import { useState } from "react";
 // import { Swiper, SwiperSlide } from "swiper/react";
 // import { Navigation } from "swiper/modules";
-import "swiper/css";
-import "swiper/css/navigation";
 import Image from "next/image";
 import type { HomeSectionImage } from "@/types/home/type";
 interface middleBannerProps {

+ 0 - 3
src/app/(public)/_components/HomeNewArrival.tsx

@@ -1,8 +1,5 @@
 
 import { OpenAddToCartModalButton } from "@/components/common/AddToCartModal/OpenAddToCartModalButton";
-// 导入Swiper基础样式
-// import "swiper/css";
-// import "swiper/css/navigation";
 import Link from "next/link";
 import Image from "next/image";
 import type {HomeProduct,HomeSection} from "@/types/home/type"

+ 0 - 3
src/app/(public)/_components/JinGangSwiper.tsx

@@ -3,9 +3,6 @@ import { useState, useRef } from "react";
 import { Swiper, SwiperSlide } from "swiper/react";
 import type { Swiper as SwiperType } from "swiper/types";
 // import { Navigation } from "swiper/modules";
-import "swiper/css";
-import "swiper/css/navigation";
-import "swiper/css";
 import Image from "next/image";
 import Link from "next/link";
 import type { HomeSectionImage,HomeSection } from "@/types/home/type";

+ 1 - 5
src/app/(public)/_components/MiddleImageSwiper.tsx

@@ -1,10 +1,6 @@
 
 import { Swiper, SwiperSlide } from "swiper/react";
 // import {  Pagination  } from "swiper/modules";
-import "swiper/css";
-import "swiper/css/pagination";
-import "swiper/css/navigation";
-import "./css/swiper-custom.css";
 import { OpenAddToCartModalButton } from "@/components/common/AddToCartModal/OpenAddToCartModalButton";
 import type {HomeProduct,HomeSectionImage} from "@/types/home/type"
 interface zeroWearProps {
@@ -161,7 +157,7 @@ const MiddleImageSwiper = ({ zeroWear,zeroWearImage }: zeroWearProps) => {
             //   type: "progressbar",
             //   el: ".my-progress-bar",
             // }}
-            className="mySwiper"
+            className="mySwiper middle-image-swiper"
             breakpoints={{
               480: { slidesPerView: 1 },
               768: { slidesPerView: 2 },

+ 0 - 3
src/app/(public)/_components/Trending.tsx

@@ -2,9 +2,6 @@ import { useState, useRef, useEffect } from "react";
 import { Swiper, SwiperSlide } from "swiper/react";
 import type { Swiper as SwiperType } from "swiper/types";
 // import { Navigation } from "swiper/modules";
-import "swiper/css";
-import "swiper/css/navigation";
-import "swiper/css";
 import Image from "next/image";
 // import Link from "next/link";
 import { OpenAddToCartModalButton } from "@/components/common/AddToCartModal/OpenAddToCartModalButton";

+ 0 - 1
src/components/common/AddToCartModal/ImgSwiperInAddToCartModal.tsx

@@ -1,7 +1,6 @@
 "use client";
 import { memo } from "react";
 import { Swiper, SwiperSlide } from 'swiper/react';
-import 'swiper/css';
 import Image from "next/image";
 import type { ProductMediaType } from "@/components/catalog/type";