chore: 修改字段名

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -432,8 +432,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
               taskTypeKey,
               orderId: item.orderId,
             }, 
-            associated: !item.associatedProductId ? '' : `${item.productId}/${item.productName}/${item.associatedCategory}/${item.associatedBrand}`,
-            materielNameAndType: `${item.associatedProductName || ''}${item.associatedType ? '/' + item.associatedType : ''}`,
+            associated: !item.associatedProductId ? '' : `${item.associatedProductName}/${item.associatedType}/${item.associatedCategory}/${item.associatedBrand}`,
           })),
           ...rest, 
         });
@@ -602,7 +601,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         needReturnName, 
         isNeedReturn, 
         associated,
-        materielNameAndType,
         returnCount,
         refundAmount,
         ...rest
@@ -630,7 +628,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
       })), 
       taskTypeKey: returnGoodsList[0].extraData.taskTypeKey, 
     };
-
+    
     PublicApi.postAsReturnGoodsSave(payload)
       .then(res => {
         if (res.code === 1000) {

src/pages/transaction/marketingAbility/merchantCoupon/components/ApplicableGoods/index.tsx

@@ -70,7 +70,7 @@ const ApplicableGoods: React.FC<IProps> = (props) => {
     },
     {
       title: '商品图片',
-      dataIndex: 'productImg',
+      dataIndex: 'mainPic',
       align: 'center',
       render: (text) => <img src={text} className={styles['product-img']} />
     },