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

src/pages/launchSystemV3/adqv3/const.tsx

@@ -36,12 +36,7 @@ export enum DYNAMIC_CREATIVE_STATUS {
     DYNAMIC_CREATIVE_STATUS_CREATING = '创意准备中',
 }
 
-export const dynamicCreativeStatus = {
-    DYNAMIC_CREATIVE_STATUS_PENDING: <Badge status="default" text='审核中' />,
-    DYNAMIC_CREATIVE_STATUS_DENIED: <Badge status="error" text='审核不通过' />,
-    DYNAMIC_CREATIVE_STATUS_ACTIVE: <Badge status="success" text='投放中' />,
-    DYNAMIC_CREATIVE_STATUS_SUSPEND: <Badge status="warning" text='暂停' />,
-    DYNAMIC_CREATIVE_STATUS_PREPARE_FAILED: <Badge status="error" text='创意准备失败' />,
-    DYNAMIC_CREATIVE_STATUS_DELETED: <Badge status="error" text='已删除' />,
-    DYNAMIC_CREATIVE_STATUS_CREATING: <Badge status="processing" text='创意准备中' />,
+export const AD_STATUS = {
+    AD_STATUS_NORMAL: <Badge status="success" text='有效' />,
+    AD_STATUS_SUSPEND: <Badge status="warning" text='暂停' />,
 }

src/pages/launchSystemV3/adqv3/creative/tableConfig.tsx

@@ -2,8 +2,7 @@ import React from 'react'
 import { Space, Switch, Image, Popover } from 'antd'
 import '../index.less'
 import { copy } from '@/utils/utils'
-import { DELIVERY_MODE, DYNAMIC_CREATIVE_TYPE, dynamicCreativeStatus } from '../const'
-import Box from './box'
+import { AD_STATUS, DELIVERY_MODE, DYNAMIC_CREATIVE_TYPE } from '../const'
 function tableConfig(): any {
     return [
         {
@@ -208,12 +207,12 @@ function tableConfig(): any {
         },
         {
             title: '状态',
-            dataIndex: 'systemStatus',
-            key: 'systemStatus',
+            dataIndex: 'configuredStatus',
+            key: 'configuredStatus',
             align: 'center',
             width: 120,
             render: (a: string) => {
-                return dynamicCreativeStatus[a]
+                return AD_STATUS[a]
             }
         },
     ]