Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: f3f8e0056ed07cc8e8c1e9e1f4357a9a8f75a922
+  newTag: f7fe59896103499fc5344043ba5e6dbf1050f891

src/router/router.tsx

@@ -408,6 +408,29 @@ export const routerList: Array<RouteObjectType> = [
       title: '产品商城',
     },
     children: [
+      //  产品商城分类（新）
+      {
+        path: '/mallManage/mallCategoryList',
+        element: withLoadingComponent(<MallCategoryListView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 420,
+          title: '商城分类',
+          icon: <AppstoreOutlined />,
+        },
+      },
+      {
+        path: '/mallManage/mallCategoryList/detail',
+        element: withLoadingComponent(<ServiceCategoryDetail />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 425,
+          title: '分类详情',
+          icon: '',
+          hidden: true,
+          pid: 420,
+        },
+      },
       {
         path: '/mallManage/mallGoods',
         element: withLoadingComponent(<MallGoodsView />),
@@ -454,29 +477,6 @@ export const routerList: Array<RouteObjectType> = [
           pid: 410,
         },
       },
-      //  产品商城分类（新）
-      {
-        path: '/mallManage/mallCategoryList',
-        element: withLoadingComponent(<MallCategoryListView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 420,
-          title: '商城分类',
-          icon: <AppstoreOutlined />,
-        },
-      },
-      {
-        path: '/mallManage/mallCategoryList/detail',
-        element: withLoadingComponent(<ServiceCategoryDetail />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 425,
-          title: '分类详情',
-          icon: '',
-          hidden: true,
-          pid: 420,
-        },
-      },
       {
         path: '/mallManage/productOrder',
         element: withLoadingComponent(<ProductOrderView />),
@@ -534,6 +534,16 @@ export const routerList: Array<RouteObjectType> = [
     },
     children: [
       {
+        path: '/rentManage/rentType',
+        element: withLoadingComponent(<RentTypeView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 520,
+          icon: <ShopOutlined />,
+          title: '租赁分类',
+        },
+      },
+      {
         path: '/rentManage/rentGoods',
         element: withLoadingComponent(<RentListView />),
         errorElement: <ErrorPage />,
@@ -580,16 +590,6 @@ export const routerList: Array<RouteObjectType> = [
         },
       },
       {
-        path: '/rentManage/rentType',
-        element: withLoadingComponent(<RentTypeView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 520,
-          icon: <ShopOutlined />,
-          title: '租赁分类',
-        },
-      },
-      {
         path: '/rentManage/rentMake',
         element: withLoadingComponent(<RentMakeView />),
         errorElement: <ErrorPage />,
@@ -645,6 +645,17 @@ export const routerList: Array<RouteObjectType> = [
       title: '行业服务',
     },
     children: [
+      //  作业服务分类（新）
+      {
+        path: '/serviceManage/serviceCategoryList',
+        element: withLoadingComponent(<ServiceCategoryListView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 620,
+          title: '作业分类',
+          icon: <ShopOutlined />,
+        },
+      },
       {
         path: '/serviceManage/serviceList',
         element: withLoadingComponent(<ServiceListView />),
@@ -667,17 +678,6 @@ export const routerList: Array<RouteObjectType> = [
           pid: 610,
         },
       },
-      //  作业服务分类（新）
-      {
-        path: '/serviceManage/serviceCategoryList',
-        element: withLoadingComponent(<ServiceCategoryListView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 620,
-          title: '作业分类',
-          icon: <ShopOutlined />,
-        },
-      },
       {
         path: '/serviceManage/demandOrderList',
         element: withLoadingComponent(<DemandOrderListView />),