Merge branch 'feature/chuck'

# Conflicts:
#	next.config.js

next.config.js

@@ -21,16 +21,16 @@ const nextConfig = {
         destination: '/home',
         permanent: true,
       },
-    ]
+    ];
   },
   async rewrites() {
     return [
       {
         source: '/local/:path*',
         //destination: "https://iuav.mmcuav.cn/:path*",
-        destination: 'https://www.iuav.shop/:path*',
+        destination: 'https://test.iuav.shop/:path*',
       },
-    ]
+    ];
   },
   images: {
     remotePatterns: [
@@ -45,6 +45,6 @@ const nextConfig = {
     ],
   },
   pageExtensions: ['page.tsx', 'page.ts', 'page.jsx', 'page.js'],
-}
+};
 
-module.exports = nextConfig
+module.exports = nextConfig;

pages/equipmentLeasing/index.page.tsx

@@ -112,7 +112,10 @@ export default function EquipmentLeasing(props: Props) {
   }, [abort]);
 
   const onFilterChange = (filterResult: FilterResult, adapterFilterResult: AdapterResult) => {
-    console.log('filterResult', filterResult, adapterFilterResult);
+    setPageParams({
+      ...pageParams,
+      pageNo: 1,
+    });
     adapterFilterResult.categoryId = adapterFilterResult.categoryId?.map((item) => item.id);
     setFilterResult(adapterFilterResult);
   };

pages/jobServices/styled.tsx

@@ -32,6 +32,9 @@ export const Box = styled.div`
             font-weight: bold;
             color: #333333;
             line-height: 24px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
         }
         &-right {

pages/mall/index.page.tsx

@@ -70,7 +70,10 @@ export default function Mall(props: Props) {
   }, []);
 
   const onFilterChange = (filterResult: FilterResult, adapterFilterResult: AdapterResult) => {
-    console.log('filterResult', filterResult, adapterFilterResult);
+    setPageParams({
+      ...pageParams,
+      pageNo: 1,
+    });
     adapterFilterResult.categoryId = adapterFilterResult.categoryId?.map((item) => item.id);
     setFilterResult(adapterFilterResult);
   };
@@ -103,8 +106,6 @@ export default function Mall(props: Props) {
                             alt=''
                             src={item.images}
                             className={styles.img}
-                            width={116}
-                            height={116}
                             preview={false}
                           ></Image>
                         </div>