Merge branch 'develop' of http://git.mmcuav.cn/iuav/csf-admin into 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: f03a38646e715ed4c4498e678f6530dd79273cd3
+  newTag: 2eddcb1f9e1bce4eb0d8442b2c66584dfac698bc

src/components/layout/menu/index.tsx

@@ -62,7 +62,7 @@ export function MenuView() {
     // 设置侧边栏数据
     authRouterList().then((value) => {
       // 除了数据看板，其他没有子项的菜单全部过滤掉
-      const arr = getItem(value)?.filter((i: any) => i?.key === 2) || [];
+      const arr = getItem(value)?.filter((i: any) => i?.key === 100) || [];
       const brr = getItem(value)?.filter((i: any) => i?.children?.length) || [];
       // 设置要展示的菜单列表
       setItems([...arr, ...brr]);

src/pages/mallManage/serviceManage/serviceList/index.tsx

@@ -95,11 +95,11 @@ const ServiceListView = () => {
   };
   // 新增服务
   const handleAdd = () => {
-    navigate('/mallManage/serviceDetail');
+    navigate('/serviceManage/serviceDetail');
   };
   // 跳转详情
   const handleDetail = (record: TableType[0]) => {
-    navigate(`/mallManage/serviceDetail?id=${record.id}`);
+    navigate(`/serviceManage/serviceDetail?id=${record.id}`);
   };
   // 删除服务
   const handleDelete = (record: TableType[0]) => {

src/pages/orderManage/demandOrder/orderList/index.tsx

@@ -125,7 +125,7 @@ const DemandOrderList = () => {
   };
   // 订单详情
   const toOrderDetail = (record: demandOrderListType[0]) => {
-    navigate({ pathname: '/orderManage/demandOrderDetail', search: `id=${record.id}` });
+    navigate({ pathname: '/serviceManage/demandOrderDetail', search: `id=${record.id}` });
   };
   //分页
   const paginationChange = (pageNo: number, pageSize: number) => {

src/pages/orderManage/equipmentOrder/index.tsx

@@ -90,7 +90,7 @@ function EquipmentOrderView() {
   // 跳转订单详情
   const handleDetail = (record: TableType[0]) => {
     const search = { id: record.id, orderNo: record.orderNo };
-    navigate(`/orderManage/equipmentOrder/detail?${qs.stringify(search)}`);
+    navigate(`/rentManage/equipmentOrder/detail?${qs.stringify(search)}`);
   };
   // 获取订单状态
   const getOrderStatus = () => {

src/pages/orderManage/procurementOrder/orderList/index.tsx

@@ -320,7 +320,7 @@ const ProcurementOrderList = () => {
   // 跳转采购订单详情
   const toProcurementOrderDetail = (record: procurementOrderListType[0]) => {
     navigate({
-      pathname: '/orderManage/procurementOrder/detail',
+      pathname: '/mallManage/procurementOrder/detail',
       search: qs.stringify({ id: record.id }),
     });
   };

src/pages/orderManage/productOrder/orderList/index.tsx

@@ -126,7 +126,7 @@ function ProductOrderView() {
   };
   // 跳转订单详情
   const handleDetail = (record: TableType[0]) => {
-    navigate(`/orderManage/productOrder/detail?${qs.stringify({ id: record.id })}`);
+    navigate(`/mallManage/productOrder/detail?${qs.stringify({ id: record.id })}`);
   };
   // 获取商城订单状态列表
   const getMallOrderStatusList = () => {