Skip to content

A
admin
提交 f3f8e005 作者: bax
操作

Merge branch 'develop' of http://git.mmcuav.cn/iuav/csf-admin into develop

上级 7a7fa701 5628dd35
流水线 #6888 已通过 于阶段
in 1 分 39 秒
正在显示 包含 494 行增加 和 504 行删除
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 = () => {
......
src/router/router.tsx
......@@ -4,23 +4,17 @@ import ErrorPage from '~/pages/common/error';
import LayoutView from '~/components/layout';
import {
MacCommandOutlined,
BarsOutlined,
ShoppingOutlined,
ShopOutlined,
CreditCardOutlined,
SmileOutlined,
TeamOutlined,
ReconciliationOutlined,
SolutionOutlined,
RedEnvelopeOutlined,
SettingOutlined,
UserOutlined,
SendOutlined,
RocketOutlined,
AppstoreAddOutlined,
AppstoreOutlined,
CoffeeOutlined,
UnorderedListOutlined,
BookOutlined,
SketchOutlined,
DribbbleOutlined,
......@@ -62,8 +56,8 @@ import { PointDetail } from '~/pages/pointManage/pointList/detail';
// const ActivityList = React.lazy(() => import('src/pages/activityManage/activityList')); //活动管理
// 客户管理
import CustomListView from '~/pages/customManage/customList';
import CustomMoneyView from '~/pages/customManage/customMoney';
import CustomMoneyDetail from '~/pages/customManage/customMoney/detail';
// import CustomMoneyView from '~/pages/customManage/customMoney';
// import CustomMoneyDetail from '~/pages/customManage/customMoney/detail';
const CustomVerificationView = React.lazy(
() => import('~/pages/customManage/customVerification/list'),
); //实名认证
......@@ -92,9 +86,9 @@ const TopicListView = React.lazy(() => import('~/pages/forumManage/topicList'));
// 订单
const ProductOrderView = React.lazy(() => import('src/pages/orderManage/productOrder/orderList')); //销售订单
const EquipmentOrderView = React.lazy(() => import('src/pages/orderManage/equipmentOrder')); //设备订单
const ServiceOrderView = React.lazy(() => import('src/pages/orderManage/serviceOrder')); //服务订单
// const ServiceOrderView = React.lazy(() => import('src/pages/orderManage/serviceOrder')); //服务订单
const ProductOrderDetail = React.lazy(() => import('~/pages/orderManage/productOrder/orderDetail'));
const ServiceOrderDetail = React.lazy(() => import('~/pages/orderManage/serviceOrder/detail'));
// const ServiceOrderDetail = React.lazy(() => import('~/pages/orderManage/serviceOrder/detail'));
const EquipmentOrderDetail = React.lazy(() => import('~/pages/orderManage/equipmentOrder/detail'));
const PilotTrainingOrderView = React.lazy(() => import('~/pages/orderManage/pilotTrainingOrder'));
const DemandOrderListView = React.lazy(() => import('~/pages/orderManage/demandOrder/orderList')); //需求订单
......@@ -129,20 +123,18 @@ const MallAddOrEditOrDetailView = React.lazy(
); //商城商品新增、编辑
const MallGoodsDetailsView = React.lazy(() => import('~/pages/mallManage/mallGoods/goodsDetails')); //商城商品（新）
const ProduceListView = React.lazy(() => import('~/pages/mallManage/produceManage/produceList')); //产品列表
const ProduceDetailView = React.lazy(
() => import('~/pages/mallManage/produceManage/produceDetail'),
); //产品详情
const MakeListView = React.lazy(() => import('~/pages/mallManage/makeManage/makeList'));
// const ProduceListView = React.lazy(() => import('~/pages/mallManage/produceManage/produceList')); //产品列表
// const ProduceDetailView = React.lazy(() => import('~/pages/mallManage/produceManage/produceDetail')); //产品详情
// const MakeListView = React.lazy(() => import('~/pages/mallManage/makeManage/makeList'));
// 分类管理
const MallCategoryListView = React.lazy(() => import('~/pages/categoryManage/mallCategoryList')); //商城分类
const ServiceCategoryListView = React.lazy(
() => import('~/pages/categoryManage/serviceCategoryList'),
); //服务分类
const CategoryManage = React.lazy(() => import('~/pages/categoryManage/category'));
const CategoryDetail = React.lazy(() => import('~/pages/categoryManage/category/detail'));
// const CategoryDetail = React.lazy(() => import('~/pages/categoryManage/category/detail'));
// 目录管理
const DirectoryManage = React.lazy(() => import('~/pages/categoryManage/directoryManage'));
// const DirectoryManage = React.lazy(() => import('~/pages/categoryManage/directoryManage'));
//执照培训
const InstitutionsListView = React.lazy(
......@@ -244,7 +236,7 @@ export const routerList: Array<RouteObjectType> = [
meta: {
icon: <BarChartOutlined />,
title: '数据看板',
id: 2,
id: 100,
},
},
{
......@@ -262,7 +254,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<CustomListView />),
errorElement: <ErrorPage />,
meta: {
id: 220,
id: 210,
title: '用户列表',
icon: <SolutionOutlined />,
},
......@@ -272,7 +264,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<CustomVerificationView />),
errorElement: <ErrorPage />,
meta: {
id: 260,
id: 220,
title: '实名认证',
icon: <SolutionOutlined />,
},
......@@ -302,33 +294,11 @@ export const routerList: Array<RouteObjectType> = [
},
},
{
path: '/customManage/customMoney',
element: withLoadingComponent(<CustomMoneyView />),
errorElement: <ErrorPage />,
meta: {
id: 26200,
title: '现金管理',
icon: <RedEnvelopeOutlined />,
},
},
{
path: '/customManage/customMoney/detail',
element: withLoadingComponent(<CustomMoneyDetail />),
errorElement: <ErrorPage />,
meta: {
id: 26210,
title: '现金变更',
icon: <RedEnvelopeOutlined />,
hidden: true,
pid: 26200,
},
},
{
path: '/customManage/flyerList',
element: withLoadingComponent(<FlyerListView />),
errorElement: <ErrorPage />,
meta: {
id: 1810,
id: 230,
title: '飞手列表',
icon: <SolutionOutlined />,
},
......@@ -338,11 +308,11 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<FlyerAuthDailyView />),
errorElement: <ErrorPage />,
meta: {
id: 1815,
id: 235,
title: '认证日志',
hidden: true,
icon: <UserOutlined />,
pid: 1810,
pid: 230,
},
},
{
......@@ -350,11 +320,11 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<FlyerDetailsView />),
errorElement: <ErrorPage />,
meta: {
id: 1816,
id: 236,
title: '飞手详情',
hidden: true,
icon: <UserOutlined />,
pid: 1810,
pid: 230,
},
},
{
......@@ -362,11 +332,11 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<FlyerDetailsView />),
errorElement: <ErrorPage />,
meta: {
id: 1817,
id: 237,
title: '飞手审批',
hidden: true,
icon: <UserOutlined />,
pid: 1810,
pid: 230,
},
},
{
......@@ -379,6 +349,29 @@ export const routerList: Array<RouteObjectType> = [
icon: <AuditOutlined />,
},
},
// {
// path: '/customManage/customMoney',
// element: withLoadingComponent(<CustomMoneyView />),
// errorElement: <ErrorPage />,
// meta: {
// id: 26200,
// title: '现金管理',
// icon: <RedEnvelopeOutlined />,
// hidden: true,
// },
// },
// {
// path: '/customManage/customMoney/detail',
// element: withLoadingComponent(<CustomMoneyDetail />),
// errorElement: <ErrorPage />,
// meta: {
// id: 26210,
// title: '现金变更',
// icon: <RedEnvelopeOutlined />,
// hidden: true,
// pid: 26200,
// },
// },
],
},
{
......@@ -386,7 +379,7 @@ export const routerList: Array<RouteObjectType> = [
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1800,
id: 300,
icon: <ContactsOutlined />,
title: '飞手管理',
// develop: true,
......@@ -397,7 +390,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<FlyerTeamView />),
errorElement: <ErrorPage />,
meta: {
id: 1820,
id: 310,
title: '飞手团队',
icon: <UsergroupAddOutlined />,
// develop: true,
......@@ -406,370 +399,331 @@ export const routerList: Array<RouteObjectType> = [
],
},
{
path: '/resourceManage',
path: '/mallManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 400,
icon: <DribbbleOutlined />,
title: '资源管理',
icon: <ShopOutlined />,
title: '产品商城',
},
children: [
{
path: '/resourceManage/requirementsGathering',
element: withLoadingComponent(<GatheringListView />),
path: '/mallManage/mallGoods',
element: withLoadingComponent(<MallGoodsView />),
errorElement: <ErrorPage />,
meta: {
id: 410,
title: '需求收集',
icon: <MonitorOutlined />,
hidden: true,
icon: <ShopOutlined />,
title: '商城商品',
},
},
{
path: '/resourceManage/gatherDetail',
element: withLoadingComponent(<GatherDetailView />),
path: '/mallManage/mallGoods/add',
element: withLoadingComponent(<MallAddOrEditOrDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 415,
title: '需求详情',
icon: <SmileOutlined />,
title: '商城商品新增',
hidden: true,
icon: <MonitorOutlined />,
pid: 410,
},
},
{
path: '/resourceManage/materielManage',
element: withLoadingComponent(<MaterielManageView />),
path: '/mallManage/mallGoods/edit',
element: withLoadingComponent(<MallAddOrEditOrDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 420,
title: '宣传管理',
icon: <PictureOutlined />,
id: 415,
icon: <SmileOutlined />,
title: '商城商品编辑',
hidden: true,
pid: 410,
},
},
{
path: '/resourceManage/materielManage/detail',
element: withLoadingComponent(<MaterielManageDetail />),
path: '/mallManage/mallGoods/detail',
element: withLoadingComponent(<MallGoodsDetailsView />),
errorElement: <ErrorPage />,
meta: {
id: 30100,
title: '宣传管理详情',
icon: <SketchOutlined />,
id: 415,
icon: <SmileOutlined />,
title: '商城商品详情',
hidden: true,
pid: 420,
pid: 410,
},
},
// 产品商城分类（新）
{
path: '/resourceManage/tagManage',
element: withLoadingComponent(<TagManageView />),
path: '/mallManage/mallCategoryList',
element: withLoadingComponent(<MallCategoryListView />),
errorElement: <ErrorPage />,
meta: {
id: 430,
title: '标签管理',
icon: <PaperClipOutlined />,
id: 420,
title: '商城分类',
icon: <AppstoreOutlined />,
},
},
{
path: '/resourceManage/industryNews',
element: withLoadingComponent(<IndustryNewsView />),
path: '/mallManage/mallCategoryList/detail',
element: withLoadingComponent(<ServiceCategoryDetail />),
errorElement: <ErrorPage />,
meta: {
id: 440,
title: '行业新闻',
icon: <ReadOutlined />,
id: 425,
title: '分类详情',
icon: '',
hidden: true,
pid: 420,
},
},
{
path: '/resourceManage/tenderManage',
element: withLoadingComponent(<TenderManageView />),
path: '/mallManage/productOrder',
element: withLoadingComponent(<ProductOrderView />),
errorElement: <ErrorPage />,
meta: {
id: 450,
title: '招标快讯',
icon: <CoffeeOutlined />,
id: 430,
title: '商城订单',
icon: <ShoppingOutlined />,
},
},
{
path: '/resourceManage/tenderManage/detail',
element: withLoadingComponent(<TenderManageDetail />),
path: '/mallManage/productOrder/detail',
element: withLoadingComponent(<ProductOrderDetail />),
errorElement: <ErrorPage />,
meta: {
id: 30500,
title: '招标快讯详情',
icon: <CoffeeOutlined />,
id: 431,
title: '商城订单 / 详情',
icon: <ShoppingOutlined />,
hidden: true,
pid: 450,
pid: 430,
},
},
{
path: '/resourceManage/tenderManage/feedback',
element: withLoadingComponent(<TenderManageFeedback />),
path: '/mallManage/procurementOrder/list',
element: withLoadingComponent(<ProcurementOrder />),
errorElement: <ErrorPage />,
meta: {
id: 30500,
title: '用户反馈',
icon: <CoffeeOutlined />,
hidden: true,
pid: 450,
id: 440,
title: '采购订单',
icon: <ShoppingOutlined />,
},
},
{
path: '/resourceManage/businessCaseManage',
element: withLoadingComponent(<BusinessCaseManage />),
path: '/mallManage/procurementOrder/detail',
element: withLoadingComponent(<ProcurementOrderDetail />),
errorElement: <ErrorPage />,
meta: {
id: 460,
title: '业务案例',
icon: <AliwangwangOutlined />,
id: 441,
title: '采购订单详情',
icon: <ShoppingOutlined />,
hidden: true,
pid: 440,
},
},
],
},
{
path: '/activityManage',
path: '/rentManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 500,
icon: <FireOutlined />,
title: '营销管理',
icon: <ShopOutlined />,
title: '租赁管理',
},
children: [
{
path: '/activityManage/rewardsManage',
element: withLoadingComponent(<RewardsManageView />),
path: '/rentManage/rentGoods',
element: withLoadingComponent(<RentListView />),
errorElement: <ErrorPage />,
meta: {
id: 510,
title: '签到奖励',
icon: <InsertRowAboveOutlined />,
},
},
{
path: '/activityManage/activityList',
element: withLoadingComponent(<ActivityListView />),
errorElement: <ErrorPage />,
meta: {
id: 520,
title: '活动管理',
icon: <WechatOutlined />,
develop: true,
icon: <SmileOutlined />,
title: '租赁商品',
},
},
{
path: '/activityManage/activityList/detail',
element: withLoadingComponent(<ActivityListDetailView />),
path: '/rentManage/rentGoods/add',
element: withLoadingComponent(<RentAddOrEditView />),
errorElement: <ErrorPage />,
meta: {
id: 520,
title: '领取记录',
icon: <WechatOutlined />,
id: 511,
icon: <SmileOutlined />,
title: '租赁商品新增',
hidden: true,
pid: 520,
develop: true,
},
},
],
},
{
path: '/forumManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 600,
icon: <MessageOutlined />,
title: '社群管理',
},
children: [
{
path: '/forumManage/topicList',
element: withLoadingComponent(<TopicListView />),
errorElement: <ErrorPage />,
meta: {
id: 620,
title: '话题列表',
icon: <ThunderboltOutlined />,
pid: 510,
},
},
{
path: '/forumManage/dynamicList',
element: withLoadingComponent(<DynamicListView />),
path: '/rentManage/rentGoods/edit',
element: withLoadingComponent(<RentAddOrEditView />),
errorElement: <ErrorPage />,
meta: {
id: 610,
title: '帖子列表',
icon: <ThunderboltOutlined />,
id: 512,
icon: <SmileOutlined />,
title: '租赁商品编辑',
hidden: true,
pid: 510,
},
},
],
},
{
path: '/orderManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 800,
icon: <BarsOutlined />,
title: '订单管理',
},
children: [
{
path: '/orderManage/productOrder',
element: withLoadingComponent(<ProductOrderView />),
path: '/rentManage/rentGoods/detail',
element: withLoadingComponent(<RentDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 810,
title: '商城订单',
icon: <ShoppingOutlined />,
id: 513,
icon: <ShopOutlined />,
title: '租赁商品详情',
hidden: true,
pid: 510,
},
},
{
path: '/orderManage/productOrder/detail',
element: withLoadingComponent(<ProductOrderDetail />),
path: '/rentManage/rentType',
element: withLoadingComponent(<RentTypeView />),
errorElement: <ErrorPage />,
meta: {
id: 10010,
title: '商城订单 / 详情',
icon: <ShoppingOutlined />,
hidden: true,
pid: 810,
id: 520,
icon: <ShopOutlined />,
title: '租赁分类',
},
},
{
path: '/orderManage/procurementOrder/list',
element: withLoadingComponent(<ProcurementOrder />),
path: '/rentManage/rentMake',
element: withLoadingComponent(<RentMakeView />),
errorElement: <ErrorPage />,
meta: {
id: 840,
title: '采购订单',
icon: <ShoppingOutlined />,
id: 530,
icon: <ShopOutlined />,
title: '租赁品牌',
},
},
{
path: '/orderManage/procurementOrder/detail',
element: withLoadingComponent(<ProcurementOrderDetail />),
path: '/rentManage/rentModel',
element: withLoadingComponent(<RentModeView />),
errorElement: <ErrorPage />,
meta: {
id: 10070,
title: '采购订单详情',
icon: <ShoppingOutlined />,
id: 531,
icon: <ShopOutlined />,
title: '租赁型号',
hidden: true,
pid: 840,
pid: 530,
},
},
{
path: '/orderManage/equipmentOrder',
path: '/rentManage/equipmentOrder',
element: withLoadingComponent(<EquipmentOrderView />),
errorElement: <ErrorPage />,
meta: {
id: 820,
id: 540,
title: '租赁订单',
icon: <ShopOutlined />,
},
},
{
path: '/orderManage/equipmentOrder/detail',
path: '/rentManage/equipmentOrder/detail',
element: withLoadingComponent(<EquipmentOrderDetail />),
errorElement: <ErrorPage />,
meta: {
id: 10020,
id: 541,
title: '租赁订单 / 详情',
icon: <ShopOutlined />,
hidden: true,
pid: 820,
pid: 540,
},
},
],
},
{
path: '/serviceManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 600,
icon: <ShopOutlined />,
title: '行业服务',
},
children: [
{
path: '/orderManage/serviceOrder',
element: withLoadingComponent(<ServiceOrderView />),
path: '/serviceManage/serviceList',
element: withLoadingComponent(<ServiceListView />),
errorElement: <ErrorPage />,
meta: {
id: 830,
title: '服务订单',
icon: <CreditCardOutlined />,
hidden: true,
id: 610,
icon: <ShopOutlined />,
title: '服务管理',
},
},
{
path: '/orderManage/serviceOrder/detail',
element: withLoadingComponent(<ServiceOrderDetail />),
path: '/serviceManage/serviceDetail',
element: withLoadingComponent(<ServiceDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 10010,
title: '服务订单 / 详情',
icon: <CreditCardOutlined />,
id: 611,
icon: <ShopOutlined />,
title: '服务详情',
hidden: true,
pid: 830,
pid: 610,
},
},
// 作业服务分类（新）
{
path: '/orderManage/pilotTrainingOrder',
element: withLoadingComponent(<PilotTrainingOrderView />),
path: '/serviceManage/serviceCategoryList',
element: withLoadingComponent(<ServiceCategoryListView />),
errorElement: <ErrorPage />,
meta: {
id: 10040,
title: '培训订单',
icon: <CreditCardOutlined />,
id: 620,
title: '作业分类',
icon: <ShopOutlined />,
},
},
{
path: '/orderManage/demandOrderList',
path: '/serviceManage/demandOrderList',
element: withLoadingComponent(<DemandOrderListView />),
errorElement: <ErrorPage />,
meta: {
id: 850,
id: 630,
title: '任务订单',
icon: <CreditCardOutlined />,
},
},
{
path: '/orderManage/demandOrderDetail',
path: '/serviceManage/demandOrderDetail',
element: withLoadingComponent(<DemandOrderDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 10060,
title: '需求订单详情',
id: 631,
title: '任务订单详情',
icon: <CreditCardOutlined />,
hidden: true,
pid: 850,
},
},
],
},
{
path: '/mallManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1000,
icon: <ShopOutlined />,
title: '商品管理',
},
children: [
{
path: '/mallManage/serviceList',
element: withLoadingComponent(<ServiceListView />),
errorElement: <ErrorPage />,
meta: {
id: 1020,
icon: <SmileOutlined />,
title: '服务管理',
},
},
{
path: '/mallManage/serviceDetail',
element: withLoadingComponent(<ServiceDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 1025,
icon: <SmileOutlined />,
title: '服务详情',
hidden: true,
pid: 1020,
pid: 630,
},
},
// {
// path: '/serviceManage/serviceOrder',
// element: withLoadingComponent(<ServiceOrderView />),
// errorElement: <ErrorPage />,
// meta: {
// id: 830,
// title: '服务订单',
// icon: <CreditCardOutlined />,
// hidden: true,
// },
// },
// {
// path: '/serviceManage/serviceOrder/detail',
// element: withLoadingComponent(<ServiceOrderDetail />),
// errorElement: <ErrorPage />,
// meta: {
// id: 10010,
// title: '服务订单 / 详情',
// icon: <CreditCardOutlined />,
// hidden: true,
// pid: 830,
// },
// },
// {
// path: '/mallManage/serviceIntroduce',
// element: withLoadingComponent(<ServiceIntroduceView />),
// errorElement: <ErrorPage />,
......@@ -780,301 +734,392 @@ export const routerList: Array<RouteObjectType> = [
// hidden: true,
// },
// },
// {
// path: '/serviceManage/produceList',
// element: withLoadingComponent(<ProduceListView />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1050,
// icon: <SmileOutlined />,
// title: '产品管理',
// },
// },
// {
// path: '/serviceManage/produceDetail',
// element: withLoadingComponent(<ProduceDetailView />),
// errorElement: <ErrorPage />,
// meta: {
// id: 10160,
// icon: <SmileOutlined />,
// title: '产品详情',
// hidden: true,
// pid: 1050,
// },
// },
// {
// path: '/serviceManage/makeList',
// element: withLoadingComponent(<MakeListView />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1060,
// icon: <SmileOutlined />,
// title: '品牌管理',
// },
// },
],
},
{
path: '/pilotTraining',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 700,
icon: <BankOutlined />,
title: '执照培训',
},
children: [
{
path: '/mallManage/mallGoods',
element: withLoadingComponent(<MallGoodsView />),
path: '/pilotTraining/jobServicesCategory/3',
element: withLoadingComponent(<CategoryManage />),
errorElement: <ErrorPage />,
meta: {
id: 1040,
icon: <SmileOutlined />,
title: '商城商品',
id: 710,
title: '培训分类',
icon: <AppstoreAddOutlined />,
},
},
{
path: '/mallManage/mallGoods/add',
element: withLoadingComponent(<MallAddOrEditOrDetailView />),
path: '/pilotTraining/institutionsList',
element: withLoadingComponent(<InstitutionsListView />),
errorElement: <ErrorPage />,
meta: {
id: 10145,
icon: <SmileOutlined />,
title: '商城商品新增',
hidden: true,
pid: 1040,
id: 720,
title: '执照考试',
icon: <VerifiedOutlined />,
},
},
{
path: '/mallManage/mallGoods/edit',
element: withLoadingComponent(<MallAddOrEditOrDetailView />),
path: '/pilotTraining/institutionsList/add',
element: withLoadingComponent(<AddInstitutionsView />),
errorElement: <ErrorPage />,
meta: {
id: 10146,
icon: <SmileOutlined />,
title: '商城商品编辑',
id: 721,
title: '机构上传',
icon: <UserOutlined />,
hidden: true,
pid: 1040,
},
},
{
path: '/mallManage/mallGoods/detail',
element: withLoadingComponent(<MallGoodsDetailsView />),
path: '/pilotTraining/institutionsList/edit',
element: withLoadingComponent(<AddInstitutionsView />),
errorElement: <ErrorPage />,
meta: {
id: 10146,
icon: <SmileOutlined />,
title: '商城商品详情',
id: 722,
title: '机构编辑',
icon: <UserOutlined />,
hidden: true,
pid: 1040,
},
},
{
path: '/mallManage/produceList',
element: withLoadingComponent(<ProduceListView />),
errorElement: <ErrorPage />,
meta: {
id: 1050,
icon: <SmileOutlined />,
title: '产品管理',
},
},
{
path: '/mallManage/produceDetail',
element: withLoadingComponent(<ProduceDetailView />),
path: '/pilotTraining/courseManage',
element: withLoadingComponent(<CourseManageView />),
errorElement: <ErrorPage />,
meta: {
id: 10160,
icon: <SmileOutlined />,
title: '产品详情',
hidden: true,
pid: 1050,
id: 730,
icon: <BookOutlined />,
title: '课程管理',
},
},
{
path: '/mallManage/makeList',
element: withLoadingComponent(<MakeListView />),
path: '/pilotTraining/pilotTrainingOrder',
element: withLoadingComponent(<PilotTrainingOrderView />),
errorElement: <ErrorPage />,
meta: {
id: 1060,
icon: <SmileOutlined />,
title: '品牌管理',
id: 740,
title: '培训订单',
icon: <CreditCardOutlined />,
},
},
],
},
{
path: '/rentManage',
path: '/resourceManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 2000,
icon: <ShopOutlined />,
title: '租赁管理',
id: 800,
icon: <DribbbleOutlined />,
title: '资源管理',
},
children: [
{
path: '/rentManage/rentGoods',
element: withLoadingComponent(<RentListView />),
path: '/resourceManage/requirementsGathering',
element: withLoadingComponent(<GatheringListView />),
errorElement: <ErrorPage />,
meta: {
id: 1030,
icon: <SmileOutlined />,
title: '租赁商品',
id: 810,
title: '需求收集',
icon: <MonitorOutlined />,
},
},
{
path: '/rentManage/rentGoods/add',
element: withLoadingComponent(<RentAddOrEditView />),
path: '/resourceManage/gatherDetail',
element: withLoadingComponent(<GatherDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 10135,
icon: <SmileOutlined />,
title: '租赁商品新增',
id: 811,
title: '需求详情',
hidden: true,
pid: 1030,
icon: <MonitorOutlined />,
pid: 810,
},
},
{
path: '/rentManage/rentGoods/edit',
element: withLoadingComponent(<RentAddOrEditView />),
path: '/resourceManage/materielManage',
element: withLoadingComponent(<MaterielManageView />),
errorElement: <ErrorPage />,
meta: {
id: 10136,
icon: <SmileOutlined />,
title: '租赁商品编辑',
hidden: true,
pid: 1030,
id: 820,
title: '宣传管理',
icon: <PictureOutlined />,
},
},
{
path: '/rentManage/rentGoods/detail',
element: withLoadingComponent(<RentDetailView />),
path: '/resourceManage/materielManage/detail',
element: withLoadingComponent(<MaterielManageDetail />),
errorElement: <ErrorPage />,
meta: {
id: 10176,
icon: <SmileOutlined />,
title: '租赁商品详情',
id: 821,
title: '宣传管理详情',
icon: <SketchOutlined />,
hidden: true,
pid: 1030,
pid: 820,
},
},
{
path: '/rentManage/rentType',
element: withLoadingComponent(<RentTypeView />),
path: '/resourceManage/tagManage',
element: withLoadingComponent(<TagManageView />),
errorElement: <ErrorPage />,
meta: {
id: 2010,
icon: <SmileOutlined />,
title: '类型管理',
id: 830,
title: '标签管理',
icon: <PaperClipOutlined />,
},
},
{
path: '/rentManage/rentMake',
element: withLoadingComponent(<RentMakeView />),
path: '/resourceManage/industryNews',
element: withLoadingComponent(<IndustryNewsView />),
errorElement: <ErrorPage />,
meta: {
id: 2020,
icon: <SmileOutlined />,
title: '品牌管理',
id: 840,
title: '行业新闻',
icon: <ReadOutlined />,
},
},
{
path: '/rentManage/rentModel',
element: withLoadingComponent(<RentModeView />),
path: '/resourceManage/tenderManage',
element: withLoadingComponent(<TenderManageView />),
errorElement: <ErrorPage />,
meta: {
id: 10139,
icon: <SmileOutlined />,
title: '品牌管理/型号',
hidden: true,
pid: 2020,
id: 850,
title: '招标快讯',
icon: <CoffeeOutlined />,
},
},
],
},
{
path: '/categoryManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1200,
icon: <ReconciliationOutlined />,
title: '分类管理',
},
children: [
// {
// path: '/categoryManage/jobServicesCategory/1',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1210,
// title: '作业服务分类',
// icon: <SendOutlined />,
// },
// },
// 作业服务分类（新）
{
path: '/categoryManage/serviceCategoryList',
element: withLoadingComponent(<ServiceCategoryListView />),
path: '/resourceManage/tenderManage/detail',
element: withLoadingComponent(<TenderManageDetail />),
errorElement: <ErrorPage />,
meta: {
id: 1210,
title: '作业服务分类',
icon: <SendOutlined />,
id: 851,
title: '招标快讯详情',
icon: <CoffeeOutlined />,
hidden: true,
pid: 850,
},
},
{
path: '/categoryManage/jobServicesCategory/2',
element: withLoadingComponent(<CategoryManage />),
path: '/resourceManage/tenderManage/feedback',
element: withLoadingComponent(<TenderManageFeedback />),
errorElement: <ErrorPage />,
meta: {
id: 1220,
title: '设备租赁分类',
icon: <RocketOutlined />,
id: 852,
title: '用户反馈',
icon: <CoffeeOutlined />,
hidden: true,
pid: 850,
},
},
{
path: '/categoryManage/jobServicesCategory/3',
element: withLoadingComponent(<CategoryManage />),
path: '/resourceManage/businessCaseManage',
element: withLoadingComponent(<BusinessCaseManage />),
errorElement: <ErrorPage />,
meta: {
id: 1230,
title: '飞手培训分类',
icon: <AppstoreAddOutlined />,
id: 860,
title: '业务案例',
icon: <AliwangwangOutlined />,
},
},
// 产品商城分类（新）
],
},
{
path: '/activityManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 900,
icon: <FireOutlined />,
title: '营销管理',
},
children: [
{
path: '/categoryManage/mallCategoryList',
element: withLoadingComponent(<MallCategoryListView />),
path: '/activityManage/rewardsManage',
element: withLoadingComponent(<RewardsManageView />),
errorElement: <ErrorPage />,
meta: {
id: 1240,
title: '产品商城分类',
icon: <AppstoreOutlined />,
id: 910,
title: '签到奖励',
icon: <InsertRowAboveOutlined />,
},
},
{
path: '/categoryManage/mallCategoryList/detail',
element: withLoadingComponent(<ServiceCategoryDetail />),
path: '/activityManage/activityList',
element: withLoadingComponent(<ActivityListView />),
errorElement: <ErrorPage />,
meta: {
id: 18600,
title: '分类详情',
icon: '',
hidden: true,
pid: 1240,
id: 920,
title: '活动管理',
icon: <WechatOutlined />,
},
},
// {
// path: '/categoryManage/jobServicesCategory/4',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1240,
// title: '产品商城分类',
// icon: <AppstoreOutlined />,
// },
// },
{
path: '/categoryManage/jobServicesCategory/0',
element: withLoadingComponent(<CategoryManage />),
path: '/activityManage/activityList/detail',
element: withLoadingComponent(<ActivityListDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 1250,
title: '通用分类',
icon: <CoffeeOutlined />,
id: 921,
title: '领取记录',
icon: <WechatOutlined />,
hidden: true,
pid: 920,
},
},
],
},
{
path: '/forumManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1000,
icon: <MessageOutlined />,
title: '社群管理',
},
children: [
{
path: '/categoryManage/detail/:id',
element: withLoadingComponent(<CategoryDetail />),
path: '/forumManage/topicList',
element: withLoadingComponent(<TopicListView />),
errorElement: <ErrorPage />,
meta: {
id: 18600,
title: '分类详情',
icon: '',
hidden: true,
id: 1020,
title: '话题列表',
icon: <ThunderboltOutlined />,
},
},
{
path: '/categoryManage/DirectoryManage',
element: withLoadingComponent(<DirectoryManage />),
path: '/forumManage/dynamicList',
element: withLoadingComponent(<DynamicListView />),
errorElement: <ErrorPage />,
meta: {
id: 1260,
title: '目录管理',
icon: <UnorderedListOutlined />,
hidden: true,
id: 1010,
title: '帖子列表',
icon: <ThunderboltOutlined />,
},
},
],
},
// {
// path: '/categoryManage',
// element: <LayoutView />,
// errorElement: <ErrorPage />,
// meta: {
// id: 1200,
// icon: <ReconciliationOutlined />,
// title: '分类管理',
// },
// children: [
// {
// path: '/categoryManage/jobServicesCategory/1',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1210,
// title: '作业服务分类',
// icon: <SendOutlined />,
// },
// },
// {
// path: '/categoryManage/jobServicesCategory/2',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1220,
// title: '设备租赁分类',
// icon: <RocketOutlined />,
// hidden: true,
// },
// },
// {
// path: '/categoryManage/jobServicesCategory/4',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1240,
// title: '产品商城分类',
// icon: <AppstoreOutlined />,
// },
// },
// {
// path: '/categoryManage/jobServicesCategory/0',
// element: withLoadingComponent(<CategoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1250,
// title: '通用分类',
// icon: <CoffeeOutlined />,
// hidden: true,
// },
// },
// {
// path: '/categoryManage/detail/:id',
// element: withLoadingComponent(<CategoryDetail />),
// errorElement: <ErrorPage />,
// meta: {
// id: 18600,
// title: '分类详情',
// icon: '',
// hidden: true,
// },
// },
// {
// path: '/categoryManage/DirectoryManage',
// element: withLoadingComponent(<DirectoryManage />),
// errorElement: <ErrorPage />,
// meta: {
// id: 1260,
// title: '目录管理',
// icon: <UnorderedListOutlined />,
// hidden: true,
// },
// },
// ],
// },
{
path: '/pointManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 2200,
id: 1100,
icon: <AccountBookOutlined />,
title: '积分管理',
},
......@@ -1083,7 +1128,7 @@ export const routerList: Array<RouteObjectType> = [
path: '/pointManage/pointList',
element: withLoadingComponent(<PointList />),
meta: {
id: 2210,
id: 1110,
title: '积分列表',
icon: <MacCommandOutlined />,
},
......@@ -1092,11 +1137,11 @@ export const routerList: Array<RouteObjectType> = [
path: '/pointManage/pointList/detail',
element: withLoadingComponent(<PointDetail />),
meta: {
id: 12110,
id: 1111,
title: '个人积分明细',
icon: <MacCommandOutlined />,
hidden: true,
pid: 2210,
pid: 1110,
},
},
// {
......@@ -1150,7 +1195,7 @@ export const routerList: Array<RouteObjectType> = [
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 2400,
id: 1200,
icon: <AccountBookOutlined />,
title: '消耗管理',
},
......@@ -1160,7 +1205,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<WithDrawListView />),
errorElement: <ErrorPage />,
meta: {
id: 2410,
id: 1210,
title: '提现列表',
icon: <SolutionOutlined />,
},
......@@ -1254,65 +1299,11 @@ export const routerList: Array<RouteObjectType> = [
// ],
// },
{
path: '/pilotTraining',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1600,
icon: <BankOutlined />,
title: '执照培训',
},
children: [
{
path: '/pilotTraining/institutionsList',
element: withLoadingComponent(<InstitutionsListView />),
errorElement: <ErrorPage />,
meta: {
id: 1610,
title: '执照考试',
icon: <VerifiedOutlined />,
},
},
{
path: '/pilotTraining/institutionsList/add',
element: withLoadingComponent(<AddInstitutionsView />),
errorElement: <ErrorPage />,
meta: {
id: 1520,
title: '机构上传',
icon: <UserOutlined />,
hidden: true,
},
},
{
path: '/pilotTraining/institutionsList/edit',
element: withLoadingComponent(<AddInstitutionsView />),
errorElement: <ErrorPage />,
meta: {
id: 1530,
title: '机构编辑',
icon: <UserOutlined />,
hidden: true,
},
},
{
path: '/pilotTraining/courseManage',
element: withLoadingComponent(<CourseManageView />),
errorElement: <ErrorPage />,
meta: {
id: 1010,
icon: <BookOutlined />,
title: '课程管理',
},
},
],
},
{
path: '/systemManage',
element: <LayoutView />,
errorElement: <ErrorPage />,
meta: {
id: 1400,
id: 1300,
icon: <SettingOutlined />,
title: '系统管理',
},
......@@ -1322,7 +1313,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<AccountManageView />),
errorElement: <ErrorPage />,
meta: {
id: 1410,
id: 1310,
title: '账号信息',
icon: <UserOutlined />,
},
......@@ -1332,7 +1323,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<AccountLimit />),
errorElement: <ErrorPage />,
meta: {
id: 1420,
id: 1320,
title: '权限角色',
icon: <TeamOutlined />,
},
......@@ -1342,11 +1333,11 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<LimitInfo />),
errorElement: <ErrorPage />,
meta: {
id: 28300,
id: 1321,
title: '权限信息',
icon: <UserOutlined />,
hidden: true,
pid: 1420,
pid: 1320,
},
},
{
......@@ -1354,7 +1345,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<CompanyListView />),
errorElement: <ErrorPage />,
meta: {
id: 1430,
id: 1330,
title: '单位管理',
icon: <BankOutlined />,
},
......@@ -1364,11 +1355,11 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<CompanyDetailView />),
errorElement: <ErrorPage />,
meta: {
id: 1430,
id: 1331,
title: '单位详情',
icon: <BankOutlined />,
hidden: true,
pid: 1430,
pid: 1330,
},
},
{
......@@ -1376,10 +1367,9 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<CompanyMemberView />),
errorElement: <ErrorPage />,
meta: {
id: 1460,
id: 1340,
title: '成员管理',
icon: <TeamOutlined />,
develop: true,
},
},
{
......@@ -1387,7 +1377,7 @@ export const routerList: Array<RouteObjectType> = [
element: withLoadingComponent(<AddressManageView />),
errorElement: <ErrorPage />,
meta: {
id: 1440,
id: 1350,
title: '地址管理',
icon: <EnvironmentOutlined />,
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论