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

src/pages/launchSystemV3/tencentAdPutIn/create/Material/index.tsx

@@ -157,13 +157,15 @@ const Material: React.FC<{ adData?: any[] }> = ({ adData }) => {
                     type="link" icon={<FolderOpenOutlined />}
                     style={{ padding: 0, fontSize: 12 }}
                     onClick={() => {
-                        if (['MARKETING_TARGET_TYPE_FICTION'].includes(marketingAssetOuterSpec?.marketingTargetType) && !accountCreateLogs?.some(item => item?.productList?.length)) {
-                            message.error('请先选择小说')
-                            return
-                        }
-                        if ((['MARKETING_TARGET_TYPE_WECHAT_OFFICIAL_ACCOUNT'].includes(marketingAssetOuterSpec?.marketingTargetType) || marketingCarrierType === 'MARKETING_CARRIER_TYPE_WECHAT_OFFICIAL_ACCOUNT') && !accountCreateLogs?.some(item => item?.wechatChannelList?.length)) {
-                            message.error('请先选择公众号')
-                            return
+                        if (!(adData && adData?.length > 0)) {
+                            if (['MARKETING_TARGET_TYPE_FICTION'].includes(marketingAssetOuterSpec?.marketingTargetType) && !accountCreateLogs?.some(item => item?.productList?.length)) {
+                                message.error('请先选择小说')
+                                return
+                            }
+                            if ((['MARKETING_TARGET_TYPE_WECHAT_OFFICIAL_ACCOUNT'].includes(marketingAssetOuterSpec?.marketingTargetType) || marketingCarrierType === 'MARKETING_CARRIER_TYPE_WECHAT_OFFICIAL_ACCOUNT') && !accountCreateLogs?.some(item => item?.wechatChannelList?.length)) {
+                                message.error('请先选择公众号')
+                                return
+                            }
                         }
                         setNewVisible(true)
                     }}

src/pages/launchSystemV3/tencentAdPutIn/create/addDynamic.tsx

@@ -111,7 +111,7 @@ const AddDynamic: React.FC<PULLIN.NewAddDynamic> = ({ visible, onChange, onClose
             return
         }
 
-        let newTableData = {}, newDynamicCount = 0
+        let newTableData: any = {}, newDynamicCount = 0
 
         let textType = dynamicCreativesTextDTOS.type
         let textDto = dynamicCreativesTextDTOS?.dynamicCreativesTextDetailDTOList || []
@@ -524,7 +524,7 @@ const AddDynamic: React.FC<PULLIN.NewAddDynamic> = ({ visible, onChange, onClose
                                         <div className={style.detail}>
                                             <div className={style.detail_body}>
                                                 <Title level={5} style={{ fontSize: 12 }}>已选广告</Title>
-                                                {Object.keys(adDataGroup).map(key => {
+                                                {Object.keys(adDataGroup).map((key: any) => {
                                                     return <div key={key}>
                                                         <Title level={5} style={{ fontSize: 12 }}>{key}</Title>
                                                         {adDataGroup[key]?.map((item: any) => {