fix: 修改品类导航页排序

src/pages/pageCustomized/categoryNavigation/common/hooks/useGetLayout.tsx

@@ -54,10 +54,18 @@ function useGetLayout() {
       const configKey = startKey + _index;
       dataFromRequest[_item.id] = _item;
       tabKeys.push(configKey.toString());
-      // const children = Object.keys(_item.children);
-      // console.log(children);
 
-      const children = ['secondary', 'flashSale', 'saleRanking', 'brand', 'suggestProduct'];
+      /** [{ name: 'secondary', sort: 1 }] */
+      const withSortedChildren = Object.keys(_item.children).map((_typeName: string) => {
+        const { sort } = _item.children[_typeName];
+        return {
+          name: _typeName,
+          sort: sort,
+        };
+      });
+      // const children = ['secondary', 'flashSale', 'saleRanking', 'brand', 'suggestProduct'];
+      const children = withSortedChildren.sort((a, b) => a.sort - b.sort).map((_sortItem) => _sortItem.name);
+
       const tabConfig: any = {
         componentName: tabName,
         title: _item.name,

src/pages/pageCustomized/categoryNavigation/components/Layout/Tabs/index.tsx

@@ -27,6 +27,9 @@ const CustomizeTabs: React.FC<Iprops> & { TabItem: typeof TabItem } = (props: Ip
   // };
 
   const getActivityProduct = async (ids: number[]) => {
+    if(ids.length === 0) {
+      return null;
+    }
     return PublicApi.getMarketingAdornActivityGoodsAdorn({ids: ids as any});
   };
 
@@ -157,6 +160,7 @@ const CustomizeTabs: React.FC<Iprops> & { TabItem: typeof TabItem } = (props: Ip
       ...resultData
     };
     const cloneDeepPageConfig = cloneDeep(pageConfig);
+    console.log(cloneDeepPageConfig);
     Object.keys(resultDataWithSecondary).forEach((_item) => {
       const parentKey = domKeyMap2Type.get(_item);
       if (!parentKey) {

src/pages/pageCustomized/categoryNavigation/index.tsx

@@ -81,7 +81,7 @@ const CategoryNavigation = () => {
     /** domKey 从7开始都是tab 的值 */
     setLoading(true);
     const tabChildren = pageConfig[4].childNodes.slice(1);
-    const result = tabChildren.map((_nodeKey) => {
+    const result = tabChildren.map((_nodeKey: string) => {
       if (!pageConfig[_nodeKey]) {
         return ;
       }
@@ -100,13 +100,14 @@ const CategoryNavigation = () => {
       };
       const tabItemData = {};
       const tabItemChild = pageConfig[_nodeKey].childNodes;
-      tabItemChild.forEach(element => {
+      tabItemChild.forEach((element, _index) => {
         const { otherProps: { type }, props, childNodes } = pageConfig[element];
-        const rest = type === 'suggestProduct' ? { type: props.type, num: props.num } : {};
+        const rest = type === 'suggestProduct' ? { type: props.type || 1, num: props.num || 50 } : {};
 
         tabItemData[type] = {
           title: props?.title || TITLE_MAP[type],
           ...rest,
+          sort: _index + 1,
           children: childNodes.map((_son) => {
             const sonData = pageConfig[_son];