合并master代码

components/filter/index.tsx

 import CategoryItem from "./compoents/categoryItem";
-import { FilterOptionResp, leasingApi, mallApi } from "./api";
+import { FilterOptionResp, RegionResp } from "./api";
 import ResultItem from "./compoents/resultItem";
 import RegionItem from "./compoents/regionItem";
 import styles from "./index.module.scss";
@@ -10,7 +10,12 @@ import PartItem from "./compoents/partItem";
 import QualityItem from "./compoents/qualityItem";
 
 export type FilterResult = {
-  category?: FilterOptionResp | undefined;
+  region?: RegionResp;
+  brand?: FilterOptionResp;
+  category?: FilterOptionResp;
+  part?: FilterOptionResp;
+  model?: FilterOptionResp;
+  quality?: FilterOptionResp;
 };
 
 type itemType = "类目" | "地域" | "品牌" | "部件" | "型号" | "成色";
@@ -86,6 +91,3 @@ export default function Filter(props: Props) {
     </>
   );
 }
-
-Filter.mallApi = mallApi;
-Filter.leasingApi = leasingApi;

pages/equipmentLeasing/detail/components/picture-preview/index.tsx

 import React , {useState,useRef} from 'react'
 import {Box} from './styled';
 import { LeftOutlined , RightOutlined } from '@ant-design/icons';
-export default function index() {
+export default function PicturePreview() {
     const mask =useRef<HTMLDivElement>(null!)
     const moveBox =useRef<HTMLDivElement>(null!)
     const big =useRef<HTMLImageElement>(null!)

pages/equipmentLeasing/index.page.tsx

@@ -8,13 +8,18 @@ import Filter, { FilterResult } from "~/components/filter";
 import { FilterOptionResp } from "~/components/filter/api";
 
 // 此函数在构建时被调用
-export async function getServerSideProps() {
+export async function getStaticProps() {
+  //获取筛选数据，进行静态渲染
   return {
-    props: {},
+    props: {
+    },
   };
 }
 
-export default function EquipmentLeasing() {
+type Props = {
+};
+
+export default function EquipmentLeasing(props:Props) {
   const router = useRouter();
 
   const leftDom = <div className='item' onClick={() => router.push('/equipmentLeasing/detail/1')}>

pages/home/waterfallFlowBody/index.tsx

@@ -5,7 +5,7 @@ import { Box } from "./styled";
 import ContentBox from "~/components/contentBox";
 import RotationChart from "./components/rotationChart";
 import Map from "./components/map";
-import icon from "./assets/icon.png";
+import icon from "./assets/图标.png";
 // const icon = "error";
 export default function WaterfallFlowBody() {
   const onMoreChange = (value: string) => {

pages/mall/index.page.tsx

 import React, { useEffect, useState } from "react";
-import { Button, Select, Space, Tag } from "antd";
+import { Button, Pagination, Select, Space, Tag } from "antd";
 import Layout from "~/components/layout";
 import styles from "./index.module.scss";
 import { useRouter } from "next/router";
 import Image from "next/image";
 import Filter, { FilterResult } from "~/components/filter";
-import api, { Goods } from "./api";
+import api, { Goods, ListPageGoodsInfoParams } from "./api";
 
 // 此函数在构建时被调用
 export async function getServerSideProps() {
@@ -20,22 +20,40 @@ export default function Mall(props: Props) {
   const router = useRouter();
   const [productList, setProductList] = useState(Array<Goods>);
   const [filterResult, setFilterResult] = useState<FilterResult>({});
+  const [pageParams, setPageParams] = useState({
+    pageNo: 1,
+    pageSize: 16,
+  });
+  const [count, setCount] = useState(0);
 
   useEffect(() => {
     api
       .listPageGoodsInfo({
-        brandId: 1,
-        pageNo: 1,
-        pageSize: 10,
+        brandId: filterResult.brand?.id,
+        districtId: filterResult.region?.id,
+        modelId: filterResult.model?.id,
+        partsId: filterResult.part?.id,
+        productCategoryId: filterResult.category?.id,
+        qualityId: filterResult.quality?.id,
+        ...pageParams,
       })
       .then((res) => {
         setProductList(res.result?.list || []);
+        setCount(res.result?.totalCount);
       });
-  }, []);
+  }, [filterResult, pageParams]);
 
   const onFilterChange = (filterResult: FilterResult) => {
     console.log("filterResult", filterResult);
+    setFilterResult(filterResult);
   };
+
+  const onPageChange = (page: number, pageSize: number) => {
+    setPageParams({
+      ...pageParams,
+      pageNo: page,
+    })
+  }
   return (
     <Layout>
       <div className="page" style={{ paddingTop: "18px" }}>
@@ -65,10 +83,17 @@ export default function Mall(props: Props) {
                       ></Image>
                     </div>
                     <div className={styles.title}>{item.goodsName}</div>
-                    <div className={styles.sellCount}>半年售12987</div>
+                    <div className={styles.sellCount}>半年售{(Math.floor(Math.random() * 901) + 100).toFixed(0)}</div>
                   </li>
                 );
               })}
+              <Pagination
+                current={pageParams.pageNo}
+                showSizeChanger={false}
+                showQuickJumper
+                total={count}
+                onChange={onPageChange}
+              />
             </ul>
             <div className={styles.adList}>
               <div className={styles.ad}></div>