Merge branch 'feat/afterSaleManageEdit' into 'master'

Feat/after sale manage edit

See merge request !80

src/pages/AfterSaleManage/data.js

@@ -257,13 +257,16 @@ export const getColumns = props => {
             </span>
           );
         }
+        if (+serviceType === 4) {
+          return <span style={{ color: '#ff1616' }}> 仅退款(发货中)</span>;
+        }
         return <span>退货退款</span>;
       },
     },
     {
       title: '售后单ID',
       dataIndex: 'serviceNo',
-      width: 310,
+      width: 300,
       render: (serviceNo, r) => (
         <div>
           {r.timeout ? <Tag color="red">{serviceNo}</Tag> : serviceNo}
@@ -513,8 +516,8 @@ export const getColumns = props => {
           }
         }
 
-        // 实物商品-仅退款未发货 serviceType = 0
-        if (serviceType === 0) {
+        // 实物商品-仅退款未发货 serviceType = 0, 仅退款(发货中) serviceType = 4
+        if (serviceType === 0 || serviceType === 4) {
           // 待商户审核14 待审核0
           if ([14, 0].includes(status)) {
             return [cancelAuditBtn, cancelDetailBtn, viewLogBtn];