Merge branch 'afterSale' into 'master'

After sale

See merge request !9

src/pages/afterSale/appeal/index.jsx

@@ -16,6 +16,7 @@ const Appeal = () => {
   const [selectedRow, getRow] = useState({});
   const [imgData, getImgData] = useState([]);
   const [imgTitle, changeImgTitle] = useState('');
+
   const table = useRef();
   const openDetail = async row => {
     const detailData = await getDetail({ appealNo: row.appealNo });
@@ -33,7 +34,8 @@ const Appeal = () => {
       table.current.reload();
     }
   };
-  const openImgModal = imgList => {
+  const openImgModal = imgStr => {
+    const imgList = imgStr ? imgStr.split(',') : [];
     if (!imgList.length) {
       notification.error({
         message: '啊哦～没有数据！',
@@ -73,7 +75,7 @@ const Appeal = () => {
         }}
         columns={columns(res)}
         request={params => query({ ...params })}
-        rowKey={r => r.orderNo}
+        rowKey={r => r.appealNo}
         expandIconColumnIndex={10}
         actionRef={table}
         bordered

src/pages/afterSale/appeal/staticdata.js

@@ -94,10 +94,10 @@ export function columns(res) {
       dataIndex: 'proofs',
       key: 'proofs',
       hideInSearch: true,
-      render: proofs => {
-        const list = proofs && proofs !== '-' ? proofs.split(',') : [];
-        return <a onClick={() => openImgModal(list)}>查看凭证</a>;
-      },
+      render: (_, row) => (
+        // const list = proofs && proofs !== '-' ? proofs.split(',') : [];
+        <a onClick={() => openImgModal(row.proofs)}>查看凭证</a>
+      ),
     },
     {
       title: '申诉单创建时间',
@@ -126,10 +126,10 @@ export function columns(res) {
       dataIndex: 'supplement',
       key: 'supplement',
       hideInSearch: true,
-      render: supplement => {
-        const list = supplement && supplement !== '-' ? supplement.split(',') : [];
-        return <a onClick={() => openImgModal(list)}>查看补充资料</a>;
-      },
+      render: (_, row) => (
+        // const list = supplement && supplement !== '-' ? supplement.split(',') : [];
+        <a onClick={() => openImgModal(row.supplement)}>查看补充资料</a>
+      ),
     },
     {
       title: '协商结果',

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -194,8 +194,8 @@ const TableList = props => {
     },
     {
       title: '订单开始时间',
-      dataIndex: 'beginTime',
-      key: 'beginTime',
+      dataIndex: 'startTime',
+      key: 'startTime',
       valueType: 'date',
       hideInTable: true,
     },
@@ -263,7 +263,6 @@ const TableList = props => {
     const transformedParam = {
       ...params,
       logisticsStatus: props.type || 1,
-      startTime: params.beginTime,
       pageNo: params.current,
       pageSize: params.pageSize || 20,
     };
@@ -299,7 +298,7 @@ const TableList = props => {
       onClick={() => {
         if (ref.current) {
           const obj = { ...ref.current.getFieldsValue(), logisticsStatus: props.type || 1 };
-          obj.beginTime = obj.beginTime && moment(obj.beginTime).format('YYYY-MM-DD');
+          obj.startTime = obj.startTime && moment(obj.startTime).format('YYYY-MM-DD');
           obj.endTime = obj.endTime && moment(obj.endTime).format('YYYY-MM-DD');
           downOrder(obj);
         }