Merge branch 'cherry-pick' into 'v2'

src/pages/transaction/marketingAbility/components/listModalLayout/components/productLayout/index.tsx

@@ -113,7 +113,6 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
                 rules={[{
                   required: true, validator: (_rule, value) => {
                     const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
-                    const v = form.getFieldValue(`swapPrice_${index}_${_index}`).validator()
                     if (!value) {
                       return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshuruhuangoudanjia'})}`));
                     }

src/pages/transaction/marketingAbility/components/productListLayout/index.tsx

@@ -73,7 +73,6 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
 
   useEffect(() => {
     if (focus$) {
-      console.log(focus$, 10086)
       setValue(focus$)
       setDataSource([])
     }
@@ -198,14 +197,12 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
     const fields = [...dataSource];
     fields.forEach(item => {
       if (item.skuId === skuId) {
-        console.log(params, 'params')
         item.goodsSubsidiaryGroupList = [...params]
       }
     })
     form.setFieldsValue({
       'productList': fields
     })
-    console.log(fields, 'fields')
     setListModalVisible(false)
     setDataSource(fields)
   }

src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/add.tsx

@@ -117,7 +117,6 @@ const AddedMarketing = () => {
           return item
         })
       }
-      console.log(res.productList, 1086)
       // if (res['activityDefined']['assembleTime']) {
       //   params['activityDefined'].assembleTime = Number(moment(res['activityDefined']['assembleTime']).format('x'));
       // }
@@ -248,7 +247,6 @@ const AddedMarketing = () => {
   }, [])
 
   const handleGetRule = () => {
-    console.log(!refresh)
     setRefresh(!refresh)
   }