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

src/pages/launchSystemNew/adq/ad/tableConfig.tsx

@@ -1,6 +1,6 @@
 import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum, PromotedObjectType } from '@/services/launchAdq/enum'
 import React from 'react'
-import { Badge, Space } from 'antd'
+import { Badge, Space, Tooltip, Typography } from 'antd'
 import Box from '@/pages/adMonitor/adMonitorList/components/box'
 import SwitchStatus from './switchStatus'
 import TimeSeriesLook from './timeSeriesLook'
@@ -174,7 +174,7 @@ function tableConfig(
             }
         },
         {
-            title: '首日付费ROI',
+            title: '深度优化ROI',
             dataIndex: 'expectedRoi',
             key: 'expectedRoi',
             width: 70,
@@ -262,8 +262,10 @@ function tableConfig(
             width: 70,
             fixed: 'right',
             ellipsis: true,
-            render: (a: string) => {
-                return AdStatusEnum[a]
+            render: (a: string,b:any) => {
+                return b?.rejectMessageList ?<Tooltip title={b?.rejectMessageList?.map((str: string)=>{
+                    return <>{str}<br/></>
+                })}>{ AdStatusEnum[a]}</Tooltip> :  AdStatusEnum[a]
             }
         },
         {

src/pages/launchSystemNew/adq/config.ts

@@ -16,7 +16,7 @@ const txAdConfig = [
             { title: '投放时间', dataIndex: 'timeSeries', label: '设置信息', default: 11, width: 55 },
             { title: '首日开始投放时间', dataIndex: 'firstDayBeginTime', label: '设置信息', default: 12, width: 70 },
             { title: '出价', dataIndex: 'bidAmount', label: '设置信息', default: 13, width: 140 },
-            { title: '首日付费ROI', dataIndex: 'expectedRoi', label: '设置信息', default: 14, width: 70 },
+            { title: '深度优化ROI', dataIndex: 'expectedRoi', label: '设置信息', default: 14, width: 70 },
             { title: '出价类型', dataIndex: 'smartBidType', label: '设置信息', default: 15, width: 80 },
             { title: '广告组日预算(分)', dataIndex: 'dailyBudget', label: '设置信息', default: 16, width: 70 },
             { title: '是否开启自动版位功能', dataIndex: 'automaticSiteEnabled', label: '设置信息', default: 17, width: 80 },