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

src/pages/launchSystemNew/adq/ad/index.tsx

@@ -533,8 +533,8 @@ const Ad: React.FC<Props> = (props) => {
                         record.status === 'STATUS_DELETED' :
                         record.status === 'STATUS_DELETED' ||
                         !(!model &&
-                            record?.promotedObjectType === 'PROMOTED_OBJECT_TYPE_WECHAT_OFFICIAL_ACCOUNT' &&
-                            record?.optimizationGoal === 'OPTIMIZATIONGOAL_FOLLOW' &&
+                            // record?.promotedObjectType === 'PROMOTED_OBJECT_TYPE_WECHAT_OFFICIAL_ACCOUNT' &&
+                            // record?.optimizationGoal === 'OPTIMIZATIONGOAL_FOLLOW' &&
                             record?.deepConversionSpec?.deepConversionWorthSpec?.goal === 'GOAL_1DAY_PURCHASE_ROAS'
                         )
                 }),

src/pages/launchSystemNew/launchManage/createAd/creativeCL/modal/index.tsx

@@ -280,11 +280,17 @@ function CreativePup(props: Props) {
     // 获取创意形式列表
     useEffect(() => {
         if (siteSet?.length > 0 && promotedObjectType) {
-            getAdcreativeTemplateList.run({
+            let siteSetLength = siteSet.length
+            let isChannes = siteSet.includes('SITE_SET_CHANNELS')
+            let params: any = {
                 siteSet,
                 promotedObjectType,
                 campaignType: 'CAMPAIGN_TYPE_NORMAL',
-            }).then(res => {
+            }
+            if (siteSetLength === 1 && isChannes) {
+                delete params.campaignType
+            }
+            getAdcreativeTemplateList.run(params).then(res => {
                 let newArr: any = []
                 let newData: any[] = []
                 // 过滤掉相同的和即将下线的