fix

src/components/EarlyWarning/tableConfig.tsx

@@ -33,7 +33,7 @@ function tableConfig(edit: (data: any) => void, del: (id: number) => void): any
             dataIndex: 'warningType',
             key: 'warningType',
             align: 'center',
-            width: 90,
+            width: 100,
             render: (a: string[], b: any) => {
                 return a?.map((item, index) => <Tag color={['#f50', '#2db7f5'][index]} key={index}>{WarningTypeEnum[item]}</Tag>)
             }

src/pages/adMonitor/adMonitorList/config.ts

@@ -87,9 +87,10 @@ const qiliangpaihang = [
             { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
             { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 70 },
             { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            // { title: '注册人数', dataIndex: 'mpRegisterUserCount', label: '公众号转化' },
-            // { title: '注册次数', dataIndex: 'mpRegisterCount', label: '公众号转化' },
-            // { title: '注册成本', dataIndex: 'mpRegisterCost', label: '公众号转化' },
+            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
+            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
         ]
     },
 ]
@@ -183,9 +184,10 @@ const qiliangpaihanghour = [
             { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
             { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 70 },
             { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            // { title: '注册人数', dataIndex: 'mpRegisterUserCount', label: '公众号转化' },
-            // { title: '注册次数', dataIndex: 'mpRegisterCount', label: '公众号转化' },
-            // { title: '注册成本', dataIndex: 'mpRegisterCost', label: '公众号转化' },
+            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
+            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
         ]
     },
 ]
@@ -279,9 +281,10 @@ const qiliangpaihangminute = [
             { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
             { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 85 },
             { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            // { title: '注册人数', dataIndex: 'mpRegisterUserCount', label: '公众号转化' },
-            // { title: '注册次数', dataIndex: 'mpRegisterCount', label: '公众号转化' },
-            // { title: '注册成本', dataIndex: 'mpRegisterCost', label: '公众号转化' },
+            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
+            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
         ]
     },
 ]
@@ -369,6 +372,10 @@ const guanggao = [
             { title: '公众号关注人数', dataIndex: 'mpFollowUser', label: '公众号转化', width: 85 },
             { title: '公众号关注率', dataIndex: 'mpFollowRate', label: '公众号转化', width: 85 },
             { title: '公众号关注成本', dataIndex: 'mpFollowCost', label: '公众号转化', width: 85 },
+            { title: '加粉成本（今日）', dataIndex: 'addFansCostDay', label: '公众号转化' },
+            { title: '公众号关注次数成本（今日）', dataIndex: 'mpFollowPvCostDay', label: '公众号转化' },
+            { title: '加粉数（今日）', dataIndex: 'addFansCountDay', label: '公众号转化' },
+            { title: '公众号关注次数（今日）', dataIndex: 'mpFollowPvDay', label: '公众号转化' },
         ]
     },
 ]

src/pages/adMonitor/adMonitorList/index.tsx

@@ -31,7 +31,7 @@ const AdMonitorList: React.FC = () => {
             <Tabs.TabPane tab="广告列表" key="list" />
             <Tabs.TabPane tab="广告列表2" key="list2" />
         </Tabs>
-        {tab === 'monitor' ? <Monitor onChange={() => { setTab('list') }} /> : tab === 'list' ? <PlanList /> : <Card><Ad userId={userId}  Ts={()=>{
+        {tab === 'monitor' ? <Monitor onChange={() => { setTab('list') }} /> : tab === 'list' ? <PlanList /> : <Card bodyStyle={{ padding: '12px 16px' }}><Ad userId={userId}  Ts={()=>{
             return <Select
             showSearch
             value={userId ? Number(userId) : undefined}

src/pages/adMonitor/adMonitorList/tableMonitorConfig.tsx

@@ -623,39 +623,50 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
                     return <Statistic value={a || 0} />
                 }
             },
-            // {
-            //     title: '注册人数',
-            //     dataIndex: 'mpRegisterUserCount',
-            //     key: 'mpRegisterUserCount',
-            //     align: 'center',
-            //     width: 115,
-            // sorter: true,
-            //     render: (a: any) => {
-            //         return a
-            //     }
-            // },
-            // {
-            //     title: '注册次数',
-            //     dataIndex: 'mpRegisterCount',
-            //     key: 'mpRegisterCount',
-            //     align: 'center',
-            //     width: 115,
-            // sorter: true,
-            //     render: (a: any) => {
-            //         return a
-            //     }
-            // },
-            // {
-            //     title: '注册成本',
-            //     dataIndex: 'mpRegisterCost',
-            //     key: 'mpRegisterCost',
-            //     align: 'center',
-            //     width: 115,
-            // sorter: true,
-            //     render: (a: any) => {
-            //         return <Statistic value={a || 0} />
-            //     }
-            // },
+            {
+                title: '加粉成本',
+                dataIndex: 'addFansCost',
+                key: 'addFansCost',
+                align: 'center',
+                width: 75,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '公众号关注次数成本',
+                dataIndex: 'mpFollowPvCost',
+                key: 'mpFollowPvCost',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加粉数',
+                dataIndex: 'addFansCount',
+                key: 'addFansCount',
+                align: 'center',
+                width: 75,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '公众号关注次数',
+                dataIndex: 'mpFollowPv',
+                key: 'mpFollowPv',
+                align: 'center',
+                width: 75,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
             {
                 title: '操作',
                 dataIndex: 'event',

src/pages/adMonitor/adMonitorList/tablePlanListConfig.tsx

@@ -536,6 +536,50 @@ function columnsMonitor(details: (id: number) => void) {
                     return <Statistic value={a ? a?.toFixed(2) : 0} />
                 }
             },
+            {
+                title: '加粉成本（今日）',
+                dataIndex: 'addFansCostDay',
+                key: 'addFansCostDay',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '公众号关注次数成本（今日）',
+                dataIndex: 'mpFollowPvCostDay',
+                key: 'mpFollowPvCostDay',
+                align: 'center',
+                width: 105,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加粉数（今日）',
+                dataIndex: 'addFansCountDay',
+                key: 'addFansCountDay',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '公众号关注次数（今日）',
+                dataIndex: 'mpFollowPvDay',
+                key: 'mpFollowPvDay',
+                align: 'center',
+                width: 100,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
             {
                 title: '操作',
                 dataIndex: 'event',