chore: 调整售后相关路由层级

config/routes/exchangeManageRoute.ts → config/routes/afterServiceRoutes/exchangeManageRoute.ts

@@ -2,31 +2,30 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 10:42:26
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 14:05:58
+ * @LastEditTime: 2021-09-17 13:59:13
  * @Description: 换货查询相关路由
  */
 const exchangeManageRoute = {
-  path: '/exchangeManage', 
+  path: '/afterServiceManage/exchangeManage', 
   name: 'exchangeManage', 
-  icon: 'SmileOutlined', 
   routes: [
     // 换货申请单查询
     {
-      path: '/exchangeManage/query',
+      path: '/afterServiceManage/exchangeManage/query',
       name: 'query',
-      component: '@/pages/exchangeManage/query/index',
+      component: '@/pages/afterServiceManage/exchangeManage/query/index',
     }, 
     // 换货申请单详情
     {
-      path: '/exchangeManage/query/detail',
+      path: '/afterServiceManage/exchangeManage/query/detail',
       name: 'queryDetail',
-      component: '@/pages/exchangeManage/query/detail',
+      component: '@/pages/afterServiceManage/exchangeManage/query/detail',
       hideInMenu: true, 
       hidePageHeader: true,
     }, 
     // 换货申请单详情-订单详情
     {
-      path: '/exchangeManage/query/orderDetail',
+      path: '/afterServiceManage/exchangeManage/query/orderDetail',
       name: 'orderDetail',
       component: '@/pages/orderSystem/orderDetail',
       hideInMenu: true,

config/routes/afterServiceRoutes/index.ts

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-09-17 11:33:43
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-09-17 14:11:35
+ * @Description: 售后服务路由相关
+ */
+import returnManageRoute from './returnManageRoute';
+import exchangeManageRoute from './exchangeManageRoute';
+import repairManageRoute from './repairManageRoute';
+
+const routes = {
+  path: '/afterServiceManage',
+  name: 'afterServiceManage',
+  icon: 'afterSale',
+  routes: [
+    returnManageRoute,
+    exchangeManageRoute,
+    repairManageRoute,
+  ]
+};
+
+export default routes;
\ No newline at end of file

config/routes/repairManageRoute.ts → config/routes/afterServiceRoutes/repairManageRoute.ts

@@ -2,31 +2,30 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 17:16:23
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 17:16:24
+ * @LastEditTime: 2021-09-17 14:07:16
  * @Description: 维修查询相关路由
  */
 const repairManageRoute = {
-  path: '/repairManage', 
+  path: '/afterServiceManage/repairManage', 
   name: 'repairManage', 
-  icon: 'SmileOutlined', 
   routes: [
     // 维修申请单查询
     {
-      path: '/repairManage/query',
+      path: '/afterServiceManage/repairManage/query',
       name: 'query',
-      component: '@/pages/repairManage/query/index',
+      component: '@/pages/afterServiceManage/repairManage/query/index',
     }, 
     // 维修申请单详情
     {
-      path: '/repairManage/query/detail',
+      path: '/afterServiceManage/repairManage/query/detail',
       name: 'queryDetail',
-      component: '@/pages/repairManage/query/detail',
+      component: '@/pages/afterServiceManage/repairManage/query/detail',
       hideInMenu: true, 
       hidePageHeader: true,
     }, 
     // 维修申请单详情-订单详情
     {
-      path: '/repairManage/query/orderDetail',
+      path: '/afterServiceManage/repairManage/query/orderDetail',
       name: 'orderDetail',
       component: '@/pages/orderSystem/orderDetail',
       hideInMenu: true,

config/routes/returnManageRoute.ts → config/routes/afterServiceRoutes/returnManageRoute.ts

@@ -2,31 +2,31 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 10:42:26
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-23 14:50:54
+ * @LastEditTime: 2021-09-17 14:05:23
  * @Description: 退货查询相关路由
  */
 const returnManageRoute = {
-  path: '/returnManage', 
+  path: '/afterServiceManage/returnManage', 
   name: 'returnManage', 
-  icon: 'SmileOutlined', 
   routes: [
     // 退货申请单查询
     {
-      path: '/returnManage/query',
+      path: '/afterServiceManage/returnManage/query',
       name: 'query',
-      component: '@/pages/returnManage/query/index',
+      component: '@/pages/afterServiceManage/returnManage/query/index',
     }, 
     // 退货申请单详情
     {
-      path: '/returnManage/query/detail',
+      path: '/afterServiceManage/returnManage/query/detail',
       name: 'queryDetail',
-      component: '@/pages/returnManage/query/detail',
+      component: '@/pages/afterServiceManage/returnManage/query/detail',
       hideInMenu: true, 
       hidePageHeader: true,
+      noMargin: true,
     }, 
     // 退货申请单详情-订单详情
     {
-      path: '/returnManage/query/orderDetail',
+      path: '/afterServiceManage/returnManage/query/orderDetail',
       name: 'orderDetail',
       component: '@/pages/orderSystem/orderDetail',
       hideInMenu: true,
@@ -34,29 +34,29 @@ const returnManageRoute = {
     },
     // 待退款
     {
-      path: '/returnManage/returnPrReturn',
+      path: '/afterServiceManage/returnManage/returnPrReturn',
       name: 'returnPrReturn',
-      component: '@/pages/returnManage/returnPrReturn/index',
+      component: '@/pages/afterServiceManage/returnManage/returnPrReturn/index',
     }, 
     // 待退款-详情
     {
-      path: '/returnManage/returnPrReturn/detail',
+      path: '/afterServiceManage/returnManage/returnPrReturn/detail',
       name: 'returnPrReturnDetail',
-      component: '@/pages/returnManage/returnPrReturn/detail',
+      component: '@/pages/afterServiceManage/returnManage/returnPrReturn/detail',
       hideInMenu: true, 
       hidePageHeader: true,
     }, 
     // 待退款-审核
     {
-      path: '/returnManage/returnPrReturn/verify',
+      path: '/afterServiceManage/returnManage/returnPrReturn/verify',
       name: 'prReturnVerify',
-      component: '@/pages/returnManage/returnPrReturn/verify',
+      component: '@/pages/afterServiceManage/returnManage/returnPrReturn/verify',
       hideInMenu: true, 
       hidePageHeader: true,
     }, 
     // 待退款-订单详情
     {
-      path: '/returnManage/returnPrReturn/orderDetail',
+      path: '/afterServiceManage/returnManage/returnPrReturn/orderDetail',
       name: 'orderDetail',
       component: '@/pages/orderSystem/orderDetail',
       hideInMenu: true,

config/routes/index.ts

@@ -28,14 +28,12 @@ import pageCustomized from './pageCustomized'
 // import systemManageRoute from './systemManageRoute'; // 系统管理
 // import orderSystemRoutes from './orderSystemRoutes'; // 订单管理
 // import productionNoticeRoutes from './productionNoticeRoute'; // 生产通知单管理
-// import exchangeManageRoutes from './exchangeManageRoute'; // 换货申请单管理
-// import returnManageRoute from './returnManageRoute'; // 退货申请单管理
-// import repairManageRoute from './repairManageRoute'; // 维修申请单管理
 // import purchaseBidRoute from './purchaseBidRoute'; // 采购竞价单审核
 // import seoSettingRoutes from './seoSettingRoutes'; // seo优化
 import marketingRoutes from './marketingRoutes'; // 营销
 import merchantMarketingRoute from './merchantMarketingRoute'; // 商家营销活动设审核
 import platformCouponManageRoute from './platformCouponManageRoute'; // 平台优惠券管理
+import afterServiceRoutes from './afterServiceRoutes'; // 售后管理
 
 //@ts-ignore
 import asyncRoutes from '../router.config.json';
@@ -62,9 +60,6 @@ const routeList = [
   //   systemManageRoute,
   //   orderSystemRoutes,
   //   productionNoticeRoutes,
-  //   exchangeManageRoutes,
-  //  returnManageRoute,
-  //   repairManageRoute,
 ];
 
 const router = [
@@ -119,7 +114,8 @@ const router = [
       // marketingRoutes,
       // pageCustomized,
       // platformCouponManageRoute,
-      ...asyncRoutes,
+      afterServiceRoutes,
+      // ...asyncRoutes,
 
       // purchaseBidRoute,
       {

src/pages/exchangeManage/query/index.tsx → src/pages/afterServiceManage/exchangeManage/query/index.tsx

@@ -2,14 +2,11 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 14:25:41
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 14:09:15
+ * @LastEditTime: 2021-09-17 11:05:51
  * @Description: 换货申请单查询
  */
 import React, { useState, useRef } from 'react';
-import { Card, Badge, Progress, Button } from 'antd';
-import {
-  ClockCircleOutlined,
-} from '@ant-design/icons';
+import { Card } from 'antd';
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
@@ -25,13 +22,11 @@ import StatusTag from '@/components/StatusTag';
 import { listSearchSchema } from './schema';
 import {
   EXCHANGE_OUTER_STATUS_TAG_MAP, 
-  EXCHANGE_INNER_STATUS_BADGE_MAP, 
 } from '../constants';
-import styles from './index.less';
 
 const formActions = createFormActions();
 
-const ExchangeQuery: React.FC = () => {
+const ExchangeQuery: React.FC = (props: any) => {
   const ref = useRef<any>({});
 
   const defaultColumns: ColumnType<any>[] = [
@@ -42,7 +37,7 @@ const ExchangeQuery: React.FC = () => {
       render: (text, record) => (
         <>
           <EyePreview
-            url={`/exchangeManage/query/detail?id=${record.replaceId}`}
+            url={`${props.location.pathname}/detail?id=${record.replaceId}`}
           >
             {text}
           </EyePreview>

src/pages/repairManage/query/index.tsx → src/pages/afterServiceManage/repairManage/query/index.tsx

@@ -2,14 +2,11 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 16:55:07
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 17:26:44
+ * @LastEditTime: 2021-09-17 11:08:36
  * @Description: 维修申请单查询
  */
 import React, { useState, useRef } from 'react';
-import { Card, Badge, Progress, Button } from 'antd';
-import {
-  ClockCircleOutlined,
-} from '@ant-design/icons';
+import { Card } from 'antd';
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
@@ -25,13 +22,11 @@ import StatusTag from '@/components/StatusTag';
 import { listSearchSchema } from './schema';
 import {
   REPAIR_OUTER_STATUS_TAG_MAP, 
-  REPAIR_INNER_STATUS_BADGE_MAP, 
 } from '../constants';
-import styles from './index.less';
 
 const formActions = createFormActions();
 
-const RepairManageQuery: React.FC = () => {
+const RepairManageQuery: React.FC = (props: any) => {
   const ref = useRef<any>({});
 
   const defaultColumns: ColumnType<any>[] = [
@@ -42,7 +37,7 @@ const RepairManageQuery: React.FC = () => {
       render: (text, record) => (
         <>
           <EyePreview
-            url={`/repairManage/query/detail?id=${record.applyId}`}
+            url={`${props.location.pathname}/detail?id=${record.applyId}`}
           >
             {text}
           </EyePreview>

src/pages/returnManage/components/DetailInfo/index.tsx → src/pages/afterServiceManage/returnManage/components/DetailInfo/index.tsx

@@ -29,21 +29,21 @@ import AvatarWrap from '@/components/AvatarWrap';
 import StatusTag from '@/components/StatusTag';
 import AuditProcess from '@/components/AuditProcess';
 import { EditableColumns } from '@/components/PolymericTable/interface';
-import ReturnInfoDrawer, { OrderInfo } from '../../components/ReturnInfoDrawer';
-import { OuterHistoryData } from '../../components/FlowRecords';
+import ReturnInfoDrawer, { OrderInfo } from '../ReturnInfoDrawer';
+import { OuterHistoryData } from '../FlowRecords';
 import { 
   RETURN_OUTER_STATUS_TAG_MAP, 
   RETURN_INNER_STATUS_BADGE_MAP, 
 } from '../../constants';
 import styles from './index.less';
 
-const ProductList = React.lazy(() => import('../../components/ProductList'));
-const ReturnAnalysis = React.lazy(() => import('../../components/ReturnAnalysis'));
-const ReturnDetailInfo = React.lazy(() => import('../../components/ReturnDetailInfo'));
-const FileList = React.lazy(() => import('../../components/FileList'));
-const ReturnAddressInfo = React.lazy(() => import('../../components/ReturnAddressInfo'));
-const Score = React.lazy(() => import('../../components/Score'));
-const FlowRecords = React.lazy(() => import('../../components/FlowRecords'));
+const ProductList = React.lazy(() => import('../ProductList'));
+const ReturnAnalysis = React.lazy(() => import('../ReturnAnalysis'));
+const ReturnDetailInfo = React.lazy(() => import('../ReturnDetailInfo'));
+const FileList = React.lazy(() => import('../FileList'));
+const ReturnAddressInfo = React.lazy(() => import('../ReturnAddressInfo'));
+const Score = React.lazy(() => import('../Score'));
+const FlowRecords = React.lazy(() => import('../FlowRecords'));
 
 interface DetailInfo extends GetAsReturnGoodsGetDetailPlatformResponse {
   fileList: FileData[];

src/pages/returnManage/query/detail.tsx → src/pages/afterServiceManage/returnManage/query/detail.tsx

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-06-18 11:00:28
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-09-17 14:00:41
+ * @Description: 
+ */
 import React from 'react';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import DetailInfo from '../components/DetailInfo';

src/pages/returnManage/query/index.tsx → src/pages/afterServiceManage/returnManage/query/index.tsx

@@ -2,14 +2,11 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 14:33:10
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 15:24:08
+ * @LastEditTime: 2021-09-17 11:06:53
  * @Description: 退货申请单查询
  */
 import React, { useState, useRef } from 'react';
-import { Card, Badge, Progress, Button } from 'antd';
-import {
-  ClockCircleOutlined,
-} from '@ant-design/icons';
+import { Card } from 'antd';
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
@@ -25,13 +22,11 @@ import StatusTag from '@/components/StatusTag';
 import { listSearchSchema } from './schema';
 import {
   RETURN_OUTER_STATUS_TAG_MAP, 
-  RETURN_INNER_STATUS_BADGE_MAP, 
 } from '../constants';
-import styles from './index.less';
 
 const formActions = createFormActions();
 
-const ReturnQuery: React.FC = () => {
+const ReturnQuery: React.FC = (props: any) => {
   const ref = useRef<any>({});
 
   const defaultColumns: ColumnType<any>[] = [
@@ -42,7 +37,7 @@ const ReturnQuery: React.FC = () => {
       render: (text, record) => (
         <>
           <EyePreview
-            url={`/returnManage/query/detail?id=${record.returnId}`}
+            url={`${props.location.pathname}/detail?id=${record.returnId}`}
           >
             {text}
           </EyePreview>

src/pages/returnManage/returnPrReturn/detail.tsx → src/pages/afterServiceManage/returnManage/returnPrReturn/detail.tsx

@@ -15,7 +15,6 @@ const ReturnPrReturnDetailInfo: React.FC = () => {
   return (
     <DetailInfo 
       id={id}
-      target="/returnManage/returnPrReturn/orderDetail"
       isPurchaser
     />
   );

src/pages/returnManage/returnPrReturn/index.tsx → src/pages/afterServiceManage/returnManage/returnPrReturn/index.tsx

@@ -2,19 +2,15 @@
  * @Author: XieZhiXiong
  * @Date: 2020-12-18 15:31:25
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-30 15:14:34
+ * @LastEditTime: 2021-09-17 11:07:59
  * @Description: 待退款
  */
 import React, { useState, useRef } from 'react';
-import { Card, Badge, Progress, Button } from 'antd';
-import {
-  ClockCircleOutlined,
-} from '@ant-design/icons';
+import { Card, Badge, Button } from 'antd';
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
 import { PublicApi } from '@/services/api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
@@ -27,11 +23,10 @@ import {
   RETURN_OUTER_STATUS_TAG_MAP, 
   RETURN_INNER_STATUS_BADGE_MAP, 
 } from '../constants';
-import styles from './index.less';
 
 const formActions = createFormActions();
 
-const ReturnPrReturn: React.FC = () => {
+const ReturnPrReturn: React.FC = (props: any) => {
   const ref = useRef<any>({});
 
   const defaultColumns: ColumnType<any>[] = [
@@ -42,7 +37,7 @@ const ReturnPrReturn: React.FC = () => {
       render: (text, record) => (
         <>
           <EyePreview
-            url={`/returnManage/returnPrReturn/detail?id=${record.returnId}`}
+            url={`${props.location.pathname}/detail?id=${record.returnId}`}
           >
             {text}
           </EyePreview>
@@ -96,7 +91,7 @@ const ReturnPrReturn: React.FC = () => {
         <>
           <Button
             type="link"
-            onClick={() => history.push(`/returnManage/returnPrReturn/verify?id=${record.returnId}`)}
+            onClick={() => history.push(`${props.location.pathname}/verify?id=${record.returnId}`)}
           >
             退款
           </Button>