2 次代码提交 e204922ff2 ... 430eca0758

作者 SHA1 备注 提交日期
  wjx 430eca0758 Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage 14 小时之前
  wjx 1412e1b010 fix 14 小时之前

+ 2 - 2
src/components/InputName/index.tsx

@@ -7,7 +7,7 @@ import './index.less'
 
 interface Props extends TextAreaProps {
     length?: number
-    isCurrent?: Array<'素材名称' | '落地页' | '文案'>
+    isCurrent?: Array<'素材名称' | '落地页' | '文案'>
 }
 /**
  * 广告名称 设置 组件
@@ -82,7 +82,7 @@ const InputName: React.FC<Props> = ({ isCurrent, value, onChange, length, ...pro
             <Space>
                 {/* <Button type="link" onClick={() => insertMatching('<定向名>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<定向名>')}>+定向名</Button> */}
                 {isCurrent.includes('素材名称') && <Button type="link" onClick={() => insertMatching('<素材名称>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<素材名称>')}>+素材名称</Button>}
-                {isCurrent.includes('落地页') && <Button type="link" onClick={() => insertMatching('<落地页>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<落地页>')}>+落地页</Button>}
+                {isCurrent.includes('落地页') && <Button type="link" onClick={() => insertMatching('<落地页>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<落地页>')}>+落地页</Button>}
                 {isCurrent.includes('文案') && <Button type="link" onClick={() => insertMatching('<文案>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<文案>')}>+文案(前5个文字)</Button>}
                 {/* <Button type="link" onClick={() => insertMatching('<优化目标>')} style={{ padding: 0 }} disabled={value?.toString()?.includes('<优化目标>')}>+优化目标</Button>
 

+ 2 - 2
src/pages/launchSystemV3/tencentAdPutIn/create/Dynamic/creativeTemplateSetup.tsx

@@ -23,7 +23,7 @@ const CreativeTemplateSetup: React.FC = () => {
         // 正则表达式匹配成对的 <...>
         const pattern = /<([^<>]*)>/g;
         let match;
-        const validValues = ["素材名称", "落地页", "文案"];
+        const validValues = ["素材名称", "落地页", "文案"];
 
         // 匹配是否成对
         let strR = str.replaceAll(pattern, '')
@@ -75,7 +75,7 @@ const CreativeTemplateSetup: React.FC = () => {
                 }
             ]}
         >
-            <InputName placeholder='请输入创意名称' style={{ width: 480 }} length={50} isCurrent={['素材名称', '文案']} />
+            <InputName placeholder='请输入创意名称' style={{ width: 480 }} length={50} isCurrent={['素材名称', '文案', '落地页']} />
         </Form.Item>
     </Card>
 }

+ 8 - 1
src/pages/launchSystemV3/tencentAdPutIn/create/index.tsx

@@ -860,7 +860,14 @@ const Create: React.FC = () => {
                 excludeUnionPositionPackage: excludeUnionPositionPackage?.map(item => item.unionPackageId),
             }
             if (!['PAGE_TYPE_WECHAT_MINI_GAME'].includes(dynamic?.creativeComponents?.mainJumpInfo?.[0]?.value?.pageType)) {
-                map.pageList = pageList?.map((item: { pageId: any }) => item.pageId)
+                const pageMap: { [x: string]: any } = {}
+                map.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 (productList && ['MARKETING_TARGET_TYPE_FICTION', 'MARKETING_TARGET_TYPE_SHORT_DRAMA'].includes(marketingAssetOuterSpec?.marketingTargetType)) {
                 map.productDTOS = productList?.map(item => {