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

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

@@ -514,7 +514,7 @@ const AddDynamic: React.FC<PULLIN.NewAddDynamic> = ({ visible, onChange, onClose
                         if (l.materialType === 4) {
                             return {
                                 type: l?.componentSubType?.includes('IMAGE_LIST') ? 'image_list' : l?.keyFrameImageUrl ? 'video' : 'image',
-                                valueJson: JSON.stringify({ 
+                                valueJson: JSON.stringify({
                                     componentId: l.id,
                                     componentValue: l
                                 })
@@ -572,10 +572,16 @@ const AddDynamic: React.FC<PULLIN.NewAddDynamic> = ({ visible, onChange, onClose
             const { pageList, userActionSetsList, accountId, wechatChannelList, videoChannelList } = item
 
             const userActionSetsListDto = userActionSetsList?.map((item: any) => ({ id: item?.userActionSetId, type: item?.type })) // dataSourceId
-
+            const pageMap: { [x: string]: any } = {}
             const map: any = {
                 userActionSetsList: userActionSetsListDto,
-                pageList: pageList?.map((item: { pageId: any }) => item.pageId)
+                pageList: pageList?.map((item: { pageId: any, pageName?: string }) => {
+                    pageMap[item.pageId] = item?.pageName
+                    return item.pageId
+                })
+            }
+            if (Object.keys(pageMap).length) {
+                map.pageMap = pageMap
             }
 
             if (wechatChannelList && (['MARKETING_TARGET_TYPE_WECHAT_OFFICIAL_ACCOUNT'].includes(adgroups?.marketingAssetOuterSpec?.marketingTargetType) || adgroups?.marketingCarrierType === 'MARKETING_CARRIER_TYPE_WECHAT_OFFICIAL_ACCOUNT' || dynamic?.creativeComponents?.brand?.[0]?.value?.jumpInfo?.pageType === 'PAGE_TYPE_WECHAT_OFFICIAL_ACCOUNT_DETAIL')) {