Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/adqv3/creative/tableConfig.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Space, Switch, Image, Popover, TableProps, Typography, Badge } from 'antd'
+import { Space, Switch, Image, Popover, TableProps, Typography, Badge, Tooltip } from 'antd'
 import '../index.less'
 import { copy } from '@/utils/utils'
 import { DELIVERY_MODE, DYNAMIC_CREATIVE_TYPE } from '../const'
@@ -68,7 +68,9 @@ function tableConfig(reviewStatusDetails: (value: any) => void, suspendHandle?:
                 return <div style={{ minHeight: 50, display: 'flex', alignItems: 'center' }}>
                     {image?.length > 0 ? <div className='tableScrollbar' style={{ overflow: 'hidden', overflowX: 'auto' }}>
                         <Image.PreviewGroup>
-                            {image?.map((item: { componentId: string; value: { imageUrl: string | undefined } }, index: string) => <Image key={item?.componentId + '_' + index} src={item?.value?.imageUrl} height={45} />)}
+                            {image?.map((item: { componentId: string; value: { imageUrl: string | undefined, imageId: string } }, index: string) => <Tooltip key={item?.componentId + '_' + index} title={item?.value?.imageId}>
+                                <Image src={item?.value?.imageUrl} height={45} />
+                            </Tooltip>)}
                         </Image.PreviewGroup>
                     </div> : '--'}
                 </div>
@@ -83,9 +85,11 @@ function tableConfig(reviewStatusDetails: (value: any) => void, suspendHandle?:
             render: (_: any[], b: any) => {
                 let imageList = b?.creativeComponents?.imageList
                 return imageList?.length > 0 ? <div className='tableScrollbar' style={{ overflow: 'hidden', overflowX: 'auto', display: 'flex', gap: 10 }}>
-                    {imageList?.map((item: { value: { list: any[] } }, index: React.Key | null | undefined) => <Image.PreviewGroup key={index}>
-                        {item?.value?.list?.map((list: any, i: number) => <Image key={i} src={list?.imageUrl} height={45} />)}
-                    </Image.PreviewGroup>)}
+                    <div>
+                        {imageList?.map((item: { value: { list: any[] } }, index: React.Key | null | undefined) => <Image.PreviewGroup key={index}>
+                            {item?.value?.list?.map((list: any, i: number) => <Tooltip key={i} title={list?.imageId}><Image key={i} src={list?.imageUrl} height={45} /></Tooltip>)}
+                        </Image.PreviewGroup>)}
+                    </div>
                 </div> : '--'
             }
         },
@@ -99,8 +103,9 @@ function tableConfig(reviewStatusDetails: (value: any) => void, suspendHandle?:
                 let video = b?.creativeComponents?.video
                 return video?.length > 0 ? <Popover
                     placement='right'
-                    content={< div >
+                    content={<div>
                         <Space style={{ maxWidth: 300, display: 'flex', flexFlow: 'row wrap', margin: '10px 0' }}>
+                            <strong>视频ID：{video?.[0]?.value?.videoId}</strong>
                             {video?.map((item: { value: { videoUrl: string | undefined } }, index: React.Key | null | undefined) => <video key={index} src={item?.value?.videoUrl} style={{ width: 250 }} controls />)}
                         </Space>
                     </div >}

src/pages/launchSystemV3/tencentAdPutIn/create/Ad/adgroupsMarketingContent.tsx

@@ -36,7 +36,6 @@ const AdgroupsMarketingContent: React.FC<{ accountIdList: number[], value?: any
     const wxGameAppId = Form.useWatch('wxGameAppId', form);
     const depthConversionEnabled = Form.useWatch('depthConversionEnabled', form);
     const deepConversionType = Form.useWatch(['deepConversionSpec', 'deepConversionType'], form);
-    const goal = Form.useWatch(['deepConversionSpec', deepConversionType === 'DEEP_CONVERSION_BEHAVIOR' ? 'deepConversionBehaviorSpec' : 'deepConversionWorthSpec', 'goal'], form);
     // 推广产品
     const [marketingTargetTypeList, setMarketingTargetTypeList] = useState<PULLIN.DataType[]>([])
     const [marketingCarrierTypeList, setMarketingCarrierTypeList] = useState<PULLIN.DataType[]>([])