Commit 1dc993bf authored by 张子雨's avatar 张子雨

feat: 去掉2.1代码

parent 2389e6ce
...@@ -9,7 +9,6 @@ import DetailTable from '../components/detailTable'; ...@@ -9,7 +9,6 @@ import DetailTable from '../components/detailTable';
import ProofsModal from '../components/proofsModal'; import ProofsModal from '../components/proofsModal';
import LogisticsCom from '../../orderManage/pendingDeliveryOrder/components/LogisticsCom'; import LogisticsCom from '../../orderManage/pendingDeliveryOrder/components/LogisticsCom';
import AppealDetail from '../../afterSale/components/detail'; import AppealDetail from '../../afterSale/components/detail';
import RecordModal from '../components/recordModal';
export default () => { export default () => {
const table = useRef(); const table = useRef();
...@@ -23,7 +22,6 @@ export default () => { ...@@ -23,7 +22,6 @@ export default () => {
const [LogisticsComModalVisible, handleComModalVisible] = useState(false); const [LogisticsComModalVisible, handleComModalVisible] = useState(false);
const [appealDetailModal, setAppealDetailModal] = useState(false); const [appealDetailModal, setAppealDetailModal] = useState(false);
const [selectedRow, setSelectedRow] = useState({}); const [selectedRow, setSelectedRow] = useState({});
const [recordVisible, setRecordVisible] = useState(false);
const viewDetail = async ({ serviceNo }) => { const viewDetail = async ({ serviceNo }) => {
const data = await orderDetail({ serviceNo }); const data = await orderDetail({ serviceNo });
setDetailInfo(data || []); setDetailInfo(data || []);
...@@ -87,9 +85,6 @@ export default () => { ...@@ -87,9 +85,6 @@ export default () => {
setAppealDetailModal(true); setAppealDetailModal(true);
setSelectedRow(detailData); setSelectedRow(detailData);
}; };
const recordDetail = () => {
setRecordVisible(true);
};
const columns = [ const columns = [
...columnPassAudit, ...columnPassAudit,
{ {
...@@ -152,9 +147,6 @@ export default () => { ...@@ -152,9 +147,6 @@ export default () => {
> >
查看物流 查看物流
</Button>, </Button>,
<Button key="link" className="mr10 mt10" onClick={() => recordDetail(r)} type="primary">
查看记录
</Button>,
], ],
}, },
]; ];
...@@ -191,12 +183,6 @@ export default () => { ...@@ -191,12 +183,6 @@ export default () => {
modalVisible={appealDetailModal} modalVisible={appealDetailModal}
onCancel={closeModal} onCancel={closeModal}
></AppealDetail> ></AppealDetail>
<RecordModal
visible={recordVisible}
onCancel={() => {
setRecordVisible(false);
}}
></RecordModal>
</div> </div>
); );
}; };
...@@ -3,14 +3,13 @@ import { notification, Button, Popconfirm } from 'antd'; ...@@ -3,14 +3,13 @@ import { notification, Button, Popconfirm } from 'antd';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import moment from 'moment'; import moment from 'moment';
import _ from 'lodash'; import _ from 'lodash';
import { searchList, auditInfoApi, orderDetail, logisticsIntercept } from '../services'; import { searchList, auditInfoApi, orderDetail } from '../services';
import { columnSticData, appealType } from '../data'; import { columnSticData, appealType } from '../data';
import AuditModal from '../components/auditModal'; import AuditModal from '../components/auditModal';
import DetailTable from '../components/detailTable'; import DetailTable from '../components/detailTable';
import ProofsModal from '../components/proofsModal'; import ProofsModal from '../components/proofsModal';
import { getDetail } from '../../afterSale/appeal/services'; import { getDetail } from '../../afterSale/appeal/services';
import AppealDetail from '../../afterSale/components/detail'; import AppealDetail from '../../afterSale/components/detail';
import RecordModal from '../components/recordModal';
export default () => { export default () => {
const table = useRef(); const table = useRef();
...@@ -24,7 +23,6 @@ export default () => { ...@@ -24,7 +23,6 @@ export default () => {
const [selectedRow, setSelectedRow] = useState({}); const [selectedRow, setSelectedRow] = useState({});
const [timeString, setTimeString] = useState({}); const [timeString, setTimeString] = useState({});
const [time, setTime] = useState({}); const [time, setTime] = useState({});
const [recordVisible, setRecordVisible] = useState(false);
const viewDetail = async ({ serviceNo }) => { const viewDetail = async ({ serviceNo }) => {
const data = await orderDetail({ serviceNo }); const data = await orderDetail({ serviceNo });
setDetailInfo(data || []); setDetailInfo(data || []);
...@@ -91,17 +89,6 @@ export default () => { ...@@ -91,17 +89,6 @@ export default () => {
}, 1000); }, 1000);
} }
}; };
const logistics = async info => {
const [data] = await logisticsIntercept({ serviceNo: info.serviceNo });
if (data) {
notification.success({ message: '操作成功' });
// eslint-disable-next-line no-unused-expressions
table.current?.reload?.();
}
};
const recordDetail = () => {
setRecordVisible(true);
};
const columns = [ const columns = [
{ {
title: '审核倒计时', title: '审核倒计时',
...@@ -153,23 +140,9 @@ export default () => { ...@@ -153,23 +140,9 @@ export default () => {
<Button key="link1" onClick={() => openAudit(r)} className="mr10" type="primary"> <Button key="link1" onClick={() => openAudit(r)} className="mr10" type="primary">
审核 审核
</Button>, </Button>,
<Popconfirm
title="请在48小时内完成物流包裹,确认是否需要进行物流拦截?"
onConfirm={() => logistics(r)}
okText="确认"
cancelText="取消"
key="pop"
>
<Button key="link1" className="mr10" type="primary">
物流拦截
</Button>
</Popconfirm>,
<Button key="link" onClick={() => viewDetail(r)} type="primary"> <Button key="link" onClick={() => viewDetail(r)} type="primary">
订单详情 订单详情
</Button>, </Button>,
<Button key="link" onClick={() => recordDetail(r)} type="primary">
查看记录
</Button>,
], ],
}, },
]; ];
...@@ -199,12 +172,6 @@ export default () => { ...@@ -199,12 +172,6 @@ export default () => {
modalVisible={appealDetailModal} modalVisible={appealDetailModal}
onCancel={closeModal} onCancel={closeModal}
></AppealDetail> ></AppealDetail>
<RecordModal
visible={recordVisible}
onCancel={() => {
setRecordVisible(false);
}}
></RecordModal>
</div> </div>
); );
}; };
import { Modal, Timeline } from 'antd';
import React, { Component } from 'react';
class RecordModal extends Component {
state = {};
onCancel = () => {
this.props.onCancel();
};
render() {
const { visible, data } = this.props;
return (
<Modal
title="查看记录"
visible={visible}
onCancel={() => this.onCancel()}
footer={null}
width="500px"
>
{data?.length
? data.map((item, index) => (
// eslint-disable-next-line react/no-array-index-key
<Timeline key={`${index}${item.title}`}>
{item.detailList?.map((log, i) => (
// eslint-disable-next-line react/no-array-index-key
<Timeline.Item color={i > 0 ? 'gray' : 'blue'} key={i}>
<p>{log.desc}</p>
<p>{log.logisticsTime}</p>
</Timeline.Item>
))}
</Timeline>
))
: '暂无记录'}
</Modal>
);
}
}
export default RecordModal;
...@@ -54,15 +54,6 @@ export const columnSticData = [ ...@@ -54,15 +54,6 @@ export const columnSticData = [
}, },
width: 100, width: 100,
}, },
{
title: '售后类型',
dataIndex: 'serviceType',
hideInTable: true,
valueEnum: {
1: '仅退款',
2: '退货退款',
},
},
{ {
title: '收货人姓名', title: '收货人姓名',
dataIndex: 'receiverName', dataIndex: 'receiverName',
......
...@@ -82,11 +82,3 @@ export async function trackInfo(params) { ...@@ -82,11 +82,3 @@ export async function trackInfo(params) {
} }
return {}; return {};
} }
// 商户操作物流拦截
export async function logisticsIntercept(params) {
return request.get('/api/kdsp/op/afs/shop/logisticsIntercept', {
params,
prefix: kdspApi,
});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment