Merge branch 'afterSale' of git.quantgroup.cn:ui/merchant-manage-ui into afterSale

config/config.js

@@ -122,6 +122,12 @@ export default {
               name: 'settleManage',
               component: './settleManage',
             },
+            {
+              path: '/afterSaleManage',
+              name: 'afterSaleManage',
+              icon: 'smile',
+              component: './AfterSaleManage/index',
+            },
             {
               path: '/auditPending',
               name: 'auditPending',

src/models/menu.js

@@ -46,19 +46,7 @@ const MenuModel = {
           });
         return value;
       };
-      let menuData = initializationData(payload);
-      menuData = menuData.concat([
-        {
-          path: 'auditPending',
-          icon: 'smile',
-          name: '售后未审核',
-        },
-        {
-          path: 'passAudit',
-          icon: 'smile',
-          name: '售后已审核',
-        },
-      ]);
+      const menuData = initializationData(payload);
       return { ...state, menuData };
     },
   },

src/pages/AfterSaleManage/PassAudit/index.jsx

 import React, { useState, useRef } from 'react';
 import { Button, notification, Popconfirm } from 'antd';
 import ProTable from '@ant-design/pro-table';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { searchList, shopCheck, orderDetail, trackInfo } from '../services';
 import { getDetail } from '../../afterSale/appeal/services';
 import { columnPassAudit } from '../data';
@@ -152,7 +151,7 @@ export default () => {
     },
   ];
   return (
-    <PageHeaderWrapper>
+    <div>
       <ProTable
         columns={columns}
         request={params => searchList(params, 2)}
@@ -182,6 +181,6 @@ export default () => {
         modalVisible={appealDetailModal}
         onCancel={closeModal}
       ></AppealDetail>
-    </PageHeaderWrapper>
+    </div>
   );
 };

src/pages/AfterSaleManage/Pending/index.jsx

 import React, { useState, useRef } from 'react';
 import { notification, Button } from 'antd';
 import ProTable from '@ant-design/pro-table';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { searchList, auditInfoApi, orderDetail } from '../services';
 import { columnSticData, appealType } from '../data';
 import AuditModal from '../components/auditModal';
@@ -93,7 +92,7 @@ export default () => {
     },
   ];
   return (
-    <PageHeaderWrapper>
+    <div>
       <ProTable
         columns={columns}
         request={params => searchList(params, 1)}
@@ -116,6 +115,6 @@ export default () => {
         modalVisible={appealDetailModal}
         onCancel={closeModal}
       ></AppealDetail>
-    </PageHeaderWrapper>
+    </div>
   );
 };

src/pages/AfterSaleManage/index.jsx

+import { Tabs } from 'antd';
+import React from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import Pending from './Pending';
+import PassAudit from './PassAudit';
+
+const { TabPane } = Tabs;
+
+export default function AfterSale() {
+  return (
+    <PageHeaderWrapper>
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="未审核" key="1">
+          <Pending />
+        </TabPane>
+        <TabPane tab="已审核" key="2">
+          <PassAudit />
+        </TabPane>
+      </Tabs>
+    </PageHeaderWrapper>
+  );
+}