Merge branch 'wangjianxin' of http://git.zanxiangnet.com/wjx/ad-manage into shenwu

src/pages/launchSystemNew/components/addLandingPage/index.tsx

@@ -53,7 +53,8 @@ function AddLandingPage(props: Props) {
     const { content, pageBackColor } = state
     const { componentItem } = stateGlobal
     const { currentUser }: any = useModel('@@initialState', model => ({ currentUser: model.initialState?.currentUser }))
-    const { init, add, get, state: { parentId, belongUser } } = useModel('useLaunchAdq.useBdMediaPup')
+    const { init, add, get } = useModel('useLaunchAdq.useBdMediaPup')
+    const { state: { parentId, belongUser } } = useModel('useLaunchAdq.useBdMedia')
     /** 变量开始 */
     const [selectImgVisible, setSelectImgVisible] = useState<boolean>(false)   // 选择图片弹窗
     const [lastVisible, setLastVisible] = useState<boolean>(false)   // 最后保存设置
@@ -140,28 +141,28 @@ function AddLandingPage(props: Props) {
             setIsFootlock(() => false)
             if (selectData?.adLocation === 'sns') { // 朋友圈信息流
                 if (selectData?.outerStyle === 0) { // 常规广告
-                    init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 800 }]],maxSize:300*1024 })
+                    init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 800 }]], maxSize: 300 * 1024 })
                 } else { // 卡片广告
-                    init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 450 }]],maxSize:300*1024})
+                    init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 450 }]], maxSize: 300 * 1024 })
                 }
             } else { // 公众号及其他
-                init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 800 }], [{ relation: '=', width: 800, height: 450 }], [{ relation: '=', width: 800, height: 640 }], [{ relation: '=', width: 640, height: 800 }]] ,maxSize:300*1024})
+                init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 800, height: 800 }], [{ relation: '=', width: 800, height: 450 }], [{ relation: '=', width: 800, height: 640 }], [{ relation: '=', width: 640, height: 800 }]], maxSize: 300 * 1024 })
             }
         } else if (selectData?.elementType === 'IMAGE') { // 内容图片
             setIsFootlock(() => false)
-            init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]],maxSize:300*1024 })
+            init({ mediaType: 'IMG', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]], maxSize: 300 * 1024 })
         } else if (selectData?.elementType === 'TOP_SLIDER') { // 轮播图
-            init({ mediaType: 'IMG', num: selectData?.imageUrlList?.length || 3, cloudSize: [[{ relation: '=', width: 800, height: 800 }]],maxSize:300*1024 })
+            init({ mediaType: 'IMG', num: selectData?.imageUrlList?.length || 3, cloudSize: [[{ relation: '=', width: 800, height: 800 }]], maxSize: 300 * 1024 })
             setIsFootlock(() => false)
         } else if (selectData?.elementType === 'TOP_VIDEO') { // 视频
             if (selectData?.adLocation === 'sns') { // 朋友圈信息流
                 if (selectData?.outerStyle === 0) { // 常规广告
-                    init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 640, height: 480 }], [{ relation: '=', width: 640, height: 360 }], [{ relation: '=', width: 750, height: 1334 }], [{ relation: '=', width: 720, height: 1280 }] ],maxSize:20*1024*1024  })
+                    init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 640, height: 480 }], [{ relation: '=', width: 640, height: 360 }], [{ relation: '=', width: 750, height: 1334 }], [{ relation: '=', width: 720, height: 1280 }]], maxSize: 20 * 1024 * 1024 })
                 } else { // 卡片广告
-                    init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]],maxSize:20*1024*1024 })
+                    init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]], maxSize: 20 * 1024 * 1024 })
                 }
             } else { // 公众号及其它
-                init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]],maxSize:20*1024*1024  })
+                init({ mediaType: 'VIDEO', cloudSize: [[{ relation: '=', width: 750, height: null }, { relation: '<=', width: null, height: 1536 }]], maxSize: 20 * 1024 * 1024 })
                 setIsFootlock(() => false)
             }
         } else if (selectData?.elementType === 'shelfnew') {  // 图文复合组件 1个
@@ -1021,7 +1022,7 @@ function AddLandingPage(props: Props) {
                                 <div className="adui-form-control">
                                     <Radio.Group onChange={(e) => { setCon('adLocation', e.target.value, true) }} value={adLocation} size='small'>
                                         <Radio value='sns'>朋友圈信息流</Radio>
-                                        <Radio value='gh'>公众号及其他</Radio>
+                                        <Radio value='gzh'>公众号及其他</Radio>
                                     </Radio.Group>
                                 </div>
                             </div>
@@ -1097,7 +1098,7 @@ function AddLandingPage(props: Props) {
                                         <div className="adui-form-control">
                                             <Radio.Group onChange={(e) => { changeAdLocation(e.target.value) }} value={adLocation} size='small'>
                                                 <Radio value='sns'>朋友圈信息流</Radio>
-                                                <Radio value='gh'>公众号及其他</Radio>
+                                                <Radio value='gzh'>公众号及其他</Radio>
                                             </Radio.Group>
                                         </div>
                                     </div>
@@ -2130,12 +2131,11 @@ function AddLandingPage(props: Props) {
             bgColor: pageBackColor,
             pageElementsSpecList: pageContextList
         }
-
         let params = {
             mediaType: 'PAGE',
             folder: false,
-            parentId, title:
-                layoutName,
+            parentId,
+            title: layoutName,
             pageName: layoutName,
             belongUser: belongUser === '0' ? false : true,
             sort,

src/pages/launchSystemNew/components/creativeModal/index.tsx

@@ -1,14 +1,16 @@
 import { FnAjax, useAjax } from "@/Hook/useAjax"
 import { ListData } from "@/services/launchAdq"
 import { getSysAdcreativeList } from "@/services/launchAdq/creative"
-import { Col, Input, Modal, Row } from "antd"
+import { Col, Input, Modal, Row, Select } from "antd"
 import React, { useCallback, useEffect, useState } from "react"
+import { adcreativeTemplate } from "../../launchManage/createAd/adcreativeCol"
 import TableData from "../TableData"
 import tableConfig from "./tableConfig"
 
 
 interface Props {
     promotedObjectType: string,
+    siteSet: string[],
     visible?: boolean,
     onClose?: () => void,
     onChange?: (data: any) => void,
@@ -21,8 +23,8 @@ interface Props {
 const CreativeModal: React.FC<Props> = (props) => {
 
     /****************************/
-    const { visible, onClose, onChange, sysAdcreativeId, promotedObjectType } = props
-    const sysAdcreativeList: FnAjax<ListData<any>|any> = useAjax((params) => getSysAdcreativeList(params),{formatResult:true})
+    const { visible, onClose, onChange, sysAdcreativeId, promotedObjectType, siteSet } = props
+    const sysAdcreativeList: FnAjax<ListData<any> | any> = useAjax((params) => getSysAdcreativeList(params), { formatResult: true })
     const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([])
     const [oldsearchData, setOldsearchData] = useState<any>(null)
     /****************************/
@@ -36,10 +38,10 @@ const CreativeModal: React.FC<Props> = (props) => {
 
     // 初始获取列表
     useEffect(() => {
-        getList({ pageSize: 20, pageNum: 1, promotedObjectType })
+        getList({ pageSize: 20, pageNum: 1, promotedObjectType, siteSet })
     }, [])
     // 获取列表
-    const getList = useCallback((arg: { pageSize: number, pageNum: number, adcreativeName?: string, promotedObjectType?: string }) => {
+    const getList = useCallback((arg: { pageSize: number, pageNum: number, adcreativeName?: string, promotedObjectType?: string, siteSet?: string[], adcreativeTemplateIds?: number[] }) => {
         Object.keys(arg).forEach(key => {
             !arg[key] && delete arg[key]
         })
@@ -52,7 +54,7 @@ const CreativeModal: React.FC<Props> = (props) => {
     const handleOk = () => {
         onChange && onChange(selectedRowKeys.toString())
     }
-    
+
     return <Modal title={`选择创意`} bodyStyle={{ padding: 0 }} width={1000} visible={visible} onOk={handleOk} onCancel={() => { onClose && onClose() }}>
         <TableData
             hoverable={false}
@@ -79,29 +81,35 @@ const CreativeModal: React.FC<Props> = (props) => {
                             allowClear
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                getList({ pageNum: 1, pageSize: 20, adcreativeName: value, promotedObjectType, siteSet })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                    getList({ pageNum: 1, pageSize: 20, promotedObjectType, siteSet, adcreativeName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                    getList({ pageNum: 1, pageSize: 20, promotedObjectType, siteSet, adcreativeName: value })
                                 }
                             }}
                         />
                     </Col>
+                    <Col>
+                        <Select style={{ minWidth: 180 }} mode='multiple' placeholder='请选择创意形式' maxTagCount={1} onChange={(e) => { getList({ pageNum: 1, pageSize: 20, promotedObjectType, siteSet, adcreativeTemplateIds: e }) }}>
+                            {adcreativeTemplate?.map(item => <Select.Option value={item.adcreativeTemplateId} key={item.adcreativeTemplateId}>{item.adcreativeTemplateAppellation}</Select.Option>)}
+                        </Select>
+                    </Col>
+                    {/* adcreativeTemplate */}
                 </Row>
             </>}
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                getList({ pageNum: current, pageSize, promotedObjectType, siteSet })
             }}
         />
     </Modal>

src/pages/launchSystemNew/launchManage/createAd/adcreativeCol.tsx

@@ -1,74 +1,49 @@
-import { useAjax } from "@/Hook/useAjax"
 import { PromotedObjectType, SiteSetEnum } from "@/services/launchAdq/enum"
-import { get_adcreative_template_list } from "@/services/launchAdq/global"
-import React, { useEffect, useState } from "react"
-import { outAdcreativeTemplateIdFun } from "../localAd/adenum"
-import { Image, Space, Spin } from "antd"
+import React from "react"
+import { Image, Space } from "antd"
+
+
+export const adcreativeTemplate = [
+    {adcreativeTemplateAppellation: "常规大图 1:1", adcreativeTemplateId: 311},
+    {adcreativeTemplateAppellation: "常规视频  4:3", adcreativeTemplateId: 618},
+    {adcreativeTemplateAppellation: "常规多图 1:1 三图", adcreativeTemplateId: 641},
+    {adcreativeTemplateAppellation: "常规多图 1:1 四图", adcreativeTemplateId: 642},
+    {adcreativeTemplateAppellation: "常规多图 1:1 六图", adcreativeTemplateId: 643},
+    {adcreativeTemplateAppellation: "横版视频 16:9", adcreativeTemplateId: 720},
+    {adcreativeTemplateAppellation: "竖版视频 9:16", adcreativeTemplateId: 721},
+    {adcreativeTemplateAppellation: "常规视频 750×1536", adcreativeTemplateId: 1064},
+    {adcreativeTemplateAppellation: "常规视频 16:9", adcreativeTemplateId: 1465},
+    {adcreativeTemplateAppellation: "常规视频 9:16", adcreativeTemplateId: 1480},
+    {adcreativeTemplateAppellation: "卡片广告 横版大图 16:9", adcreativeTemplateId: 1707},
+    {adcreativeTemplateAppellation: "卡片广告 横版视频 16:9", adcreativeTemplateId: 1708},
+    {adcreativeTemplateAppellation: "破框形态 视频合约广告", adcreativeTemplateId: 1885},
+    {adcreativeTemplateAppellation: "横版大图 16:9", adcreativeTemplateId: 711},
+    {adcreativeTemplateAppellation: "竖版大图 9:16", adcreativeTemplateId: 712},
+    {adcreativeTemplateAppellation: "横版视频 16:9", adcreativeTemplateId: 720},
+    {adcreativeTemplateAppellation: "竖版视频 9:16", adcreativeTemplateId: 721},
+    {adcreativeTemplateAppellation: "激励浏览广告", adcreativeTemplateId: 910},
+    {adcreativeTemplateAppellation: "Banner图片 20:7", adcreativeTemplateId: 925},
+    {adcreativeTemplateAppellation: "出框形态 视频合约广告", adcreativeTemplateId: 1945}
+]
 
 /**
  * 创意详情
  */
 interface Props {
-    data: any,
-    onChange?: (value: string) => void
+    data: any
 }
 const AdcreativeCol: React.FC<Props> = (props) => {
 
     /***************************/
-    const { data, onChange } = props
+    const { data } = props
     const { adcreativeName, promotedObjectType, siteSet, adcreativeTemplateId, adcreativeElements } = data
-    const [adcreative_template_list, set_adcreative_template_list] = useState<any[]>([])
-
-    const getAdcreativeTemplateList = useAjax((params) => get_adcreative_template_list(params))
     /***************************/
 
-    /** 获取创意形式 */
-    useEffect(() => {
-        if (siteSet?.length > 0 && promotedObjectType && !(adcreative_template_list.length > 0)) {
-            getAdcreativeTemplateList.run({
-                siteSet,
-                promotedObjectType,
-                campaignType: 'CAMPAIGN_TYPE_NORMAL',
-            }).then(res => {
-                let newArr: any = []
-                // 过滤掉相同的和即将下线的
-                Object.values(res)?.forEach((arr: any) => {
-                    Array.isArray(arr) && arr?.forEach((item: any) => {
-                        if (newArr.length > 0) {
-                            if (outAdcreativeTemplateIdFun(item.adcreativeTemplateId) && newArr.every((i: { adcreativeTemplateId: any }) => i.adcreativeTemplateId !== item.adcreativeTemplateId)) {
-                                newArr.push(item)
-                            } else {
-                                // 找出通用创意
-                                newArr = newArr?.map((arr: { adcreativeTemplateId: any }) => {
-                                    if (arr.adcreativeTemplateId === item.adcreativeTemplateId) {
-                                        return { ...arr, isGeneral: true }
-                                    }
-                                    return arr
-                                })
-                            }
-                        } else {
-                            if (outAdcreativeTemplateIdFun(item.adcreativeTemplateId)) {
-                                newArr.push(item)
-                            }
-                        }
-                    })
-                })
-                set_adcreative_template_list(newArr)
-            })
-        }
-    }, [siteSet, promotedObjectType])
-
-    useEffect(() => {
-        if (adcreative_template_list?.length > 0 && adcreativeTemplateId) {
-            onChange && onChange(adcreative_template_list?.find((item: any) => item?.adcreativeTemplateId === adcreativeTemplateId)?.adcreativeTemplateAppellation || '')
-        }
-    }, [adcreative_template_list, adcreativeTemplateId])
-
-    return <Spin size="small" spinning={getAdcreativeTemplateList?.loading}>
+    return <>
         <div>创意名称: <span>{adcreativeName}</span></div>
         <div>推广目标: <span>{PromotedObjectType[promotedObjectType]}</span></div>
         <div>广告版位: <span>{siteSet?.map((item: string) => SiteSetEnum[item]).toString()}</span></div>
-        <div>创意形式: <span>{adcreative_template_list?.find((item: any) => item?.adcreativeTemplateId === adcreativeTemplateId)?.adcreativeTemplateAppellation || ''}</span></div>
+        <div>创意形式: <span>{adcreativeTemplate?.find((item: any) => item?.adcreativeTemplateId === adcreativeTemplateId)?.adcreativeTemplateAppellation || ''}</span></div>
         {adcreativeElements?.description && <div>创意文案: <span>{adcreativeElements?.description}</span></div>}
         {adcreativeElements?.title && <div>文案: <span>{adcreativeElements?.title}</span></div>}
         {adcreativeElements?.imageUrl && <div style={{ display: 'flex', alignItems: 'flex-start' }}>创意素材: <Image width={80} src={adcreativeElements?.imageUrl} style={{ borderRadius: 8, overflow: 'hidden', marginLeft: 5 }} /></div>}
@@ -79,7 +54,7 @@ const AdcreativeCol: React.FC<Props> = (props) => {
         </Image.PreviewGroup></div>}
         {adcreativeElements?.shortVideoStruct?.shortVideo1Url && <div style={{ display: 'flex', alignItems: 'flex-start' }}><span style={{ marginRight: 4 }}>创意素材:</span> <video src={adcreativeElements?.shortVideoStruct?.shortVideo1Url} width={130} controls></video></div>}
         {adcreativeElements?.videoUrl && <div style={{ display: 'flex', alignItems: 'flex-start' }}><span style={{ marginRight: 4 }}>创意素材:</span> <video src={adcreativeElements?.videoUrl} width={130} controls></video></div>}
-    </Spin>
+    </>
 }
 
 export default React.memo(AdcreativeCol)

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

@@ -63,7 +63,6 @@ const CreateAd: React.FC = () => {
     const [tableSelect, setTableSelect] = useState<any[]>([])
     const [geoLocationList, setGeoLocationList] = useState<any>({}) // 所有地域列表
     const [modelList, setModelList] = useState<any>({})  // 所有品牌手机
-    const [adcreativeTemplateAppellation, setAdcreativeTemplateAppellation] = useState<string>('')  // 创意形式
     const { init, get } = useModel('useLaunchAdq.useBdMediaPup')
 
 
@@ -148,9 +147,11 @@ const CreateAd: React.FC = () => {
     useEffect(() => {
         if (queryForm?.sysPageId) {
             get.run({ mediaType: 'PAGE', sysMediaId: queryForm?.sysPageId }).then(res => {
-                let data = res
-                let pageElementsSpecList = data?.pageSpecsList[0]?.pageElementsSpecList
-                setWxButtonList(() => (pageElementsSpecList as any[])?.filter((item: { elementType: string }) => item?.elementType === 'ENTERPRISE_WX'))
+                if (!Object.keys(res)?.includes('fail')) {
+                    let data = res
+                    let pageElementsSpecList = data?.pageSpecsList[0]?.pageElementsSpecList
+                    setWxButtonList(() => (pageElementsSpecList as any[])?.filter((item: { elementType: string }) => item?.elementType === 'ENTERPRISE_WX'))
+                }
             })
         }
     }, [queryForm?.sysPageId])
@@ -216,7 +217,7 @@ const CreateAd: React.FC = () => {
             return
         }
         let data = accountCreateLogs.map((item: any, index) => {
-            return { ...item, ...queryForm, sysAdGroupData: getSysAdgroups?.data, targetingData: getsysTargeting?.data, sysAdcreativeData: { ...getSysAdcreative?.data, adcreativeTemplateAppellation }, pageData: get?.data }
+            return { ...item, ...queryForm, sysAdGroupData: getSysAdgroups?.data, targetingData: getsysTargeting?.data, sysAdcreativeData: { ...getSysAdcreative?.data }, pageData: get?.data }
         })
         console.log('data--->', data)
         setTableData(data)
@@ -493,7 +494,7 @@ const CreateAd: React.FC = () => {
                                 <div className={style.center}>
                                     <Spin spinning={getSysAdcreative.loading}>
                                         <div className={style.centerContent}>
-                                            {(getSysAdcreative?.data && queryForm?.sysAdcreativeId) && <AdcreativeCol data={getSysAdcreative?.data} onChange={(e) => { setAdcreativeTemplateAppellation(e) }} />}
+                                            {(getSysAdcreative?.data && queryForm?.sysAdcreativeId) && <AdcreativeCol data={getSysAdcreative?.data} />}
                                         </div>
                                     </Spin>
                                 </div>
@@ -515,13 +516,13 @@ const CreateAd: React.FC = () => {
                                 <div className={style.center}>
                                     <Spin spinning={get.loading}>
                                         <div className={style.centerContent}>
-                                            {queryForm?.sysPageId || accountCreateLogs?.some((item: any) => item.pageList?.length > 0) ? <>
+                                            {(queryForm?.sysPageId || accountCreateLogs?.some((item: any) => item.pageList?.length > 0) && !Object.keys(get?.data)?.includes('fail')) ? <>
                                                 {(queryForm?.sysPageId && !accountCreateLogs?.every((item: any) => item.pageList?.length > 0)) && <>
                                                     <div>落地页名称：{get?.data?.pageName || ''}</div>
                                                     <div>分享名称：{get?.data?.shareContentSpec?.shareTitle || ''}</div>
                                                     <div>分享描述：{get?.data?.shareContentSpec?.shareDescription || ''}</div>
                                                     <div style={{ marginBottom: 10 }}>原生推广页顶部素材预览：
-                                                        <div>{get?.data?.pageSpecsList[0]?.pageElementsSpecList?.filter((item: any, index: number) => index === 0)?.map((item: { elementType: 'TOP_IMAGE' | 'TOP_VIDEO' | 'TOP_SLIDER', topImageSpec: any, topSliderSpec: any, topVideoSpec: any }, index: number) => {
+                                                        <div>{get?.data?.pageSpecsList && get?.data?.pageSpecsList[0]?.pageElementsSpecList?.filter((item: any, index: number) => index === 0)?.map((item: { elementType: 'TOP_IMAGE' | 'TOP_VIDEO' | 'TOP_SLIDER', topImageSpec: any, topSliderSpec: any, topVideoSpec: any }, index: number) => {
                                                             switch (item?.elementType) {
                                                                 case 'TOP_IMAGE':
                                                                     return <Image width={80} src={item.topImageSpec.imageUrl} style={{ borderRadius: 8, overflow: 'hidden' }} key={index} />
@@ -625,7 +626,7 @@ const CreateAd: React.FC = () => {
         {/* 选择定向 */}
         {dxVisible && <TargetingModal visible={dxVisible} onClose={() => setDxVisible(false)} onChange={(e) => { setQueryForm({ ...queryForm, sysTargetingId: e }); setDxVisible(false); clearData() }} sysTargetingId={queryForm?.sysTargetingId} />}
         {/* 选择创意 */}
-        {creativeVisible && <CreativeModal visible={creativeVisible} onClose={() => setCreativeVisible(false)} onChange={(e) => { setQueryForm({ ...queryForm, sysAdcreativeId: e }); setCreativeVisible(false); clearData() }} sysAdcreativeId={queryForm?.sysAdcreativeId} promotedObjectType={queryForm.promotedObjectType as string} />}
+        {creativeVisible && <CreativeModal siteSet={getSysAdgroups?.data?.siteSet} visible={creativeVisible} onClose={() => setCreativeVisible(false)} onChange={(e) => { setQueryForm({ ...queryForm, sysAdcreativeId: e }); setCreativeVisible(false); clearData() }} sysAdcreativeId={queryForm?.sysAdcreativeId} promotedObjectType={queryForm.promotedObjectType as string} />}
         {/* 选择商品 */}
         {goodsVisible && <GoodsModal visible={goodsVisible} data={accountCreateLogs} onClose={() => setGoodsVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setGoodsVisible(false); clearData() }} />}
         {/* 选择数据源 */}

src/pages/launchSystemNew/launchManage/createAd/tableConfig.tsx

@@ -2,6 +2,7 @@ import { Tooltip } from "antd"
 import React from "react"
 import style from './index.less'
 import { BidModeEnum, OptimizationGoalEnum, PromotedObjectType, SiteSetEnum } from "@/services/launchAdq/enum";
+import { adcreativeTemplate } from "./adcreativeCol";
 let columns = () => {
 
     return [
@@ -135,11 +136,15 @@ let columns = () => {
         },
         {
             title: '创意形式',
-            dataIndex: 'adcreativeTemplateAppellation',
-            key: 'adcreativeTemplateAppellation',
+            dataIndex: 'adcreativeTemplateId',
+            key: 'adcreativeTemplateId',
             align: 'center',
             width: 120,
             render: (a: any, b: any) => {
+                let adcreativeTemplateId = b?.sysAdcreativeData?.adcreativeTemplateId
+                if (adcreativeTemplateId) {
+                    return <span style={{ fontSize: "12px" }}>{adcreativeTemplate?.find((item: any) => item?.adcreativeTemplateId === adcreativeTemplateId)?.adcreativeTemplateAppellation || '<空>'}</span>
+                }
                 return <span style={{ fontSize: "12px" }}>{b?.sysAdcreativeData?.adcreativeTemplateAppellation}</span>
             }
         },