wjx 8 months ago
parent
commit
1dd1b60360

+ 9 - 1
src/pages/launchSystemV3/adqv3/ad/tableConfig.tsx

@@ -268,7 +268,15 @@ function tableConfig(onChange: () => void, creativeHandle?: (id: number) => void
             width: 150,
             width: 150,
             fixed: 'right',
             fixed: 'right',
             render: (a: any, b: any) => {
             render: (a: any, b: any) => {
-                return <Space><CreativePreview creativePreview={a?.map((item: { creativeComponents: any }) => ({ ...item?.creativeComponents })) || []} /><a onClick={() => { creativeHandle?.(b?.adgroupId) }}>详情</a></Space>
+                if (a?.length) {
+                    let deliveryMode: string[] = []
+                    let creativePreview = a?.map((item: { creativeComponents: any, deliveryMode: string }) => {
+                        deliveryMode.push(item.deliveryMode)
+                        return { ...item?.creativeComponents }
+                    })
+                    return <Space><CreativePreview creativePreview={creativePreview} deliveryMode={deliveryMode} /><a onClick={() => { creativeHandle?.(b?.adgroupId) }}>详情</a></Space>
+                }
+                return null
                 // return <Space><BoxOther creativeComponents={a?.[0]?.creativeComponents || {}} /><a onClick={() => { creativeHandle?.(b?.adgroupId) }}>详情</a></Space>
                 // return <Space><BoxOther creativeComponents={a?.[0]?.creativeComponents || {}} /><a onClick={() => { creativeHandle?.(b?.adgroupId) }}>详情</a></Space>
             }
             }
         },
         },

+ 10 - 8
src/pages/launchSystemV3/adqv3/index.tsx

@@ -101,14 +101,16 @@ const AdqV3: React.FC = () => {
         <div className={style.right} style={!hide ? { width: 'calc(100% - 150px)' } : { width: '100%' }}>
         <div className={style.right} style={!hide ? { width: 'calc(100% - 150px)' } : { width: '100%' }}>
             <div className={style.hiddenBtn}><Button size='small' type="primary" onClick={() => setHide(!hide)} icon={!hide ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />} /></div>
             <div className={style.hiddenBtn}><Button size='small' type="primary" onClick={() => setHide(!hide)} icon={!hide ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />} /></div>
             <Card bodyStyle={{ padding: '12px 16px' }}>
             <Card bodyStyle={{ padding: '12px 16px' }}>
-                <Tabs activeKey={activeKey} size="small" type="card" onChange={(activeKey) => { setActiveKey(activeKey) }}>
-                    <Tabs.TabPane tab={'广告'} key='1' >
-                        <Ad userId={userId} creativeHandle={creativeHandle} />
-                    </Tabs.TabPane>
-                    <Tabs.TabPane tab={'创意'} key='2' >
-                        <Creative queryForm={queryForm} setQueryForm={setQueryForm} userId={userId}/>
-                    </Tabs.TabPane>
-                </Tabs>
+                <Tabs
+                    activeKey={activeKey}
+                    size="small"
+                    type="card"
+                    onChange={(activeKey) => { setActiveKey(activeKey) }}
+                    items={[
+                        { label: '广告', key: '1', children: <Ad userId={userId} creativeHandle={creativeHandle} /> },
+                        { label: '创意', key: '2', children: <Creative queryForm={queryForm} setQueryForm={setQueryForm} userId={userId} /> },
+                    ]}
+                />
             </Card>
             </Card>
         </div>
         </div>
     </div>
     </div>