wjx hai 5 meses
pai
achega
85588d74b5

+ 15 - 12
src/pages/launchSystemV3/adqv3/ad/index.tsx

@@ -22,9 +22,9 @@ const { Text } = Typography;
 const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
 
     /*****************************************/
-    const [useType, setUseType] = useLocalStorageState<1 | 2>('AD_USETYPE', 1);
+    const [useType, setUseType] = useLocalStorageState<string>('AD_UNIT_TYPE', 'NOVEL');
     const [pageSize, setPageSize] = useLocalStorageState<number>('AD_PAGESIZE', 20);
-    const [queryFrom, set_queryFrom] = useState<ADQV3.GetAdListProps>({ pageNum: 1, pageSize: pageSize || 20, useType: useType || 1 })
+    const [queryFrom, set_queryFrom] = useState<ADQV3.GetAdListProps>({ pageNum: 1, pageSize: pageSize || 20, adUnitType: 'NOVEL' })
     const [isClearSelect, setIsClearSelect] = useState(true)
     const [selectedRows, setSelectedRows] = useState<any[]>([])
     const [tactics, setTactics] = useState<any>()
@@ -41,7 +41,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
     /*****************************************/
 
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: pageSize || 20, useType: useType || 1 })
+        getList({ pageNum: 1, pageSize: pageSize || 20, adUnitType: 'NOVEL' })
     }, [userId, pageSize])
 
     // 获取列表
@@ -92,7 +92,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
         <Row gutter={[6, 6]} align='middle' style={{ marginBottom: 15 }}>
             <Col>
                 <Select
-                    placeholder='应用类型'
+                    placeholder='业务单元类型'
                     style={{ width: 90 }}
                     showSearch
                     filterOption={(input: any, option: any) =>
@@ -100,14 +100,17 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                     }
                     value={useType}
                     onChange={(value: any) => {
-                        let params = { ...queryFrom, useType: value, pageNum: 1 }
+                        let params = { ...queryFrom, adUnitType: value, pageNum: 1 }
                         setUseType(value)
                         set_queryFrom(params)
                         getList(params)
                     }}
                 >
-                    <Select.Option value={1}>小说</Select.Option>
-                    <Select.Option value={2}>游戏</Select.Option>
+                    <Select.Option value={'NOVEL'}>小说</Select.Option>
+                    <Select.Option value={'NOVEL_IAA'}>小说IAA</Select.Option>
+                    <Select.Option value={'SKIT_IAA'}>短剧IAA</Select.Option>
+                    <Select.Option value={'GAME'}>游戏</Select.Option>
+                    <Select.Option value={'GAME_IAA'}>游戏IAA</Select.Option>
                 </Select>
             </Col>
             <Col>
@@ -240,7 +243,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
         </Row>
         <TableData
             isCard={false}
-            columns={() => tableConfig(() => getAdqV3AdList.refresh(), creativeHandle, useType)}
+            columns={() => tableConfig(() => getAdqV3AdList.refresh(), useType, creativeHandle)}
             ajax={getAdqV3AdList}
             syncAjax={sync}
             fixed={{ left: 2, right: 5 }}
@@ -334,7 +337,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                                 addDynamic()
                             }}
                             userId={userId}
-                            putInType={useType === 1 ? 'NOVEL' : 'GAME'}
+                            putInType={['GAME', 'GAME_IAA'].includes(useType) ? 'GAME' : 'NOVEL'}
                         /></Col>
                         <Col><Button type='primary' icon={<PlusOutlined />} disabled={selectedRows.length === 0} onClick={addDynamic}>添加创意</Button></Col>
                         <Col>
@@ -345,8 +348,8 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                                 {selectedRows?.length > 0 && <div style={{ maxWidth: '380px' }}>
                                     <Text type="danger" ellipsis={{ tooltip: true }} strong style={{ fontSize: 12 }}>
                                         {`当前广告选择:
-                                        营销目的:${useType === 2 ? MARKETING_SUB_GOAL_ENUM[selectedRows?.[0]?.marketingSubGoal as keyof typeof MARKETING_SUB_GOAL_ENUM] : MARKETING_GOAL_ENUM[selectedRows?.[0]?.marketingGoal as keyof typeof MARKETING_GOAL_ENUM]},
-                                        推广产品类型:${useType === 2 ? MARKETING_TARGET_TYPE_GAME_ENUM[selectedRows?.[0]?.marketingTargetType as keyof typeof MARKETING_TARGET_TYPE_GAME_ENUM] : MARKETING_TARGET_TYPE_ENUM[selectedRows?.[0]?.marketingTargetType as keyof typeof MARKETING_TARGET_TYPE_ENUM]},
+                                        营销目的:${['GAME', 'GAME_IAA'].includes(useType) ? MARKETING_SUB_GOAL_ENUM[selectedRows?.[0]?.marketingSubGoal as keyof typeof MARKETING_SUB_GOAL_ENUM] : MARKETING_GOAL_ENUM[selectedRows?.[0]?.marketingGoal as keyof typeof MARKETING_GOAL_ENUM]},
+                                        推广产品类型:${['GAME', 'GAME_IAA'].includes(useType) ? MARKETING_TARGET_TYPE_GAME_ENUM[selectedRows?.[0]?.marketingTargetType as keyof typeof MARKETING_TARGET_TYPE_GAME_ENUM] : MARKETING_TARGET_TYPE_ENUM[selectedRows?.[0]?.marketingTargetType as keyof typeof MARKETING_TARGET_TYPE_ENUM]},
                                         营销载体类型:${MARKETING_CARRIER_TYPE_ENUM[selectedRows?.[0]?.marketingCarrierType as keyof typeof MARKETING_CARRIER_TYPE_ENUM]},
                                         版位选择:${selectedRows?.[0]?.automaticSiteEnabled ? '自动版位' : '选择特定版位'},
                                         ${!selectedRows?.[0]?.automaticSiteEnabled && `广告版位:${selectedRows?.[0]?.siteSet.map((item: string | number) => SITE_SET_ENUM[item as keyof typeof SITE_SET_ENUM]).toString()}`}
@@ -475,7 +478,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
         {/* 新增创意 */}
         {addDynamicVisible && <AddDynamic
             adData={selectedRows}
-            putInType={useType === 1 ? 'NOVEL' : 'GAME'}
+            putInType={['GAME', 'GAME_IAA'].includes(useType) ? 'GAME' : 'NOVEL'}
             visible={addDynamicVisible}
             onClose={() => {
                 setAddDynamicVisible(false)

+ 4 - 4
src/pages/launchSystemV3/adqv3/ad/tableConfig.tsx

@@ -8,7 +8,7 @@ import SwitchStatus from './switchStatus'
 import TimeSeriesLook from '@/pages/launchSystemNew/adq/ad/timeSeriesLook'
 import CreativePreview from '../../adMonitorListV3/CreativePreview'
 import { BID_MODE_ENUM, BID_SCENE_NORMAL_ENUM, MARKETING_CARRIER_TYPE_ENUM, MARKETING_GOAL_ENUM, MARKETING_TARGET_TYPE_ENUM, MARKETING_TARGET_TYPE_GAME_ENUM, OPTIMIZATIONGOAL_ENUM, SITE_SET_ENUM } from '../../tencentAdPutIn/const'
-function tableConfig(onChange: () => void, creativeHandle?: (id: number) => void, useType?: 1 | 2): any {
+function tableConfig(onChange: () => void, useType: string, creativeHandle?: (id: number) => void): any {
     return [
         {
             title: '启停',
@@ -151,14 +151,14 @@ function tableConfig(onChange: () => void, creativeHandle?: (id: number) => void
             }
         },
         {
-            title: useType === 2 ? '出价场景' : '出价策略',
+            title: ['GAME', 'GAME_IAA'].includes(useType) ? '出价场景' : '出价策略',
             dataIndex: 'bidStrategy',
             key: 'bidStrategy',
             align: 'center',
             width: 70,
             ellipsis: true,
             render: (a: string, b: { bidScene: string }) => {
-                if (useType === 2) {
+                if (['GAME', 'GAME_IAA'].includes(useType)) {
                     return BID_SCENE_NORMAL_ENUM[b?.bidScene as keyof typeof BID_SCENE_NORMAL_ENUM] || '--'
                 }
                 return BidStrategyEnum[a as keyof typeof BidStrategyEnum]
@@ -216,7 +216,7 @@ function tableConfig(onChange: () => void, creativeHandle?: (id: number) => void
             width: 80,
             ellipsis: true,
             render: (a: any) => {
-                if (useType === 2) {
+                if (['GAME', 'GAME_IAA'].includes(useType)) {
                     return MARKETING_TARGET_TYPE_GAME_ENUM[a as keyof typeof MARKETING_TARGET_TYPE_GAME_ENUM] || '--'
                 }
                 return MARKETING_TARGET_TYPE_ENUM[a as keyof typeof MARKETING_TARGET_TYPE_ENUM]

+ 1 - 1
src/pages/launchSystemV3/adqv3/typings.d.ts

@@ -11,7 +11,7 @@ declare namespace ADQV3 {
     interface GetAdListProps {
         pageNum: number;
         pageSize: number;
-        useType: 1 | 2,   // 1:小说(默认值)2:游戏
+        adUnitType: string
         accountMemo?: string,  // 腾讯备注
         accountRemark?: string, // 本地备注
         accountIdList?: any[], // 广告账号