wjx пре 10 месеци
родитељ
комит
4fa86a016e

+ 2 - 2
config/proxy.ts

@@ -10,8 +10,8 @@
  export default {
   dev: {
     '/api/': {
-      target: 'http://test.api.zanxiangwl.com',
-      // target: 'http://api.zanxiangwl.com',
+      // target: 'http://test.api.zanxiangwl.com',
+      target: 'http://api.zanxiangwl.com',
       changeOrigin: true,
       pathRewrite: { '/api': '' },
     },

+ 1 - 1
src/pages/adMonitor/adMonitorList/config1.ts

@@ -106,7 +106,7 @@ const detailsConfig = [
             { title: '点击率', dataIndex: 'ctr', label: '广告信息', default: 8, width: 90 },
             { title: '点击均价', dataIndex: 'cpc', label: '广告信息', default: 9, width: 90 },
             { title: '不感兴趣点击次数', dataIndex: 'no_interest_count', label: '广告信息', width: 90 },
-            { title: '朋友圈视频播放次数', dataIndex: 'video_play_count', label: '广告信息', width: 90 },
+            // { title: '朋友圈视频播放次数', dataIndex: 'video_play_count', label: '广告信息', width: 90 },
         ]
     },
     {

+ 16 - 0
src/pages/adMonitor/adMonitorList/data.tsx

@@ -16,4 +16,20 @@ export const GGStateData = {
     'STATUS_UNKNOWN': '未知状态',
     'STATUS_FROZEN': '冻结',
     'STATUS_PREPARE': '准备中'
+}
+
+/** 广告状态 */
+export const ADGROUP_STATUS = {
+    'ADGROUP_STATUS_FROZEN': <Badge status="warning" text={<span style={{ fontSize: 12 }}>已冻结</span>}/>,
+    'ADGROUP_STATUS_SUSPEND': <Badge status="warning" text={<span style={{ fontSize: 12 }}>暂停中</span>}/>,
+    'ADGROUP_STATUS_NOT_IN_DELIVERY_TIME': <Badge status="default" text={<span style={{ fontSize: 12 }}>未到投放时间</span>}/>,
+    'ADGROUP_STATUS_ACTIVE': <Badge status="processing" text={<span style={{ fontSize: 12 }}>投放中</span>}/>,
+    'ADGROUP_STATUS_DELETED': <Badge status="error" text={<span style={{ fontSize: 12 }}>已删除</span>}/>,
+    'ADGROUP_STATUS_ACCOUNT_BALANCE_NOT_ENOUGH': <Badge status="warning" text={<span style={{ fontSize: 12 }}>账户余额不足</span>}/>,
+    'ADGROUP_STATUS_DAILY_BUDGET_REACHED': <Badge status="warning" text={<span style={{ fontSize: 12 }}>广告达到日预算上限</span>}/>,
+    'ADGROUP_STATUS_PARTIAL_ACTIVE': <Badge status="warning" text={<span style={{ fontSize: 12 }}>部分投放中</span>}/>,
+    'ADGROUP_STATUS_CREATIVE_STATUS_PENDING': <Badge status="warning" text={<span style={{ fontSize: 12 }}>创意未投放</span>}/>,
+    'ADGROUP_STATUS_CREATIVE_EMPTY': <Badge status="warning" text={<span style={{ fontSize: 12 }}>创意准备中</span>}/>,
+    'ADGROUP_STATUS_JOINT_BUDGET_REACHED': <Badge status="warning" text={<span style={{ fontSize: 12 }}>广告被暂停</span>}/>,
+    'ADGROUP_STATUS_TOTAL_BUDGET_REACHED': <Badge status="warning" text={<span style={{ fontSize: 12 }}>广告达到总预算上限</span>}/>,
 }

+ 12 - 12
src/pages/adMonitor/adMonitorList/tableMonitorConfig1.tsx

@@ -708,7 +708,7 @@ let columnsList = () => {
                 align: 'center',
                 width: 90,
                 render: (a: any, b: any) => {
-                    return <Statistic value={a || 0} />
+                    return <Statistic value={a || 0} precision={2}/>
                 }
             },
             {
@@ -738,7 +738,7 @@ let columnsList = () => {
                 align: 'center',
                 width: 90,
                 render: (a: any, b: any) => {
-                    return <Statistic value={a || 0} />
+                    return <Statistic value={a || 0} precision={2}/>
                 }
             },
             {
@@ -751,16 +751,16 @@ let columnsList = () => {
                     return <Statistic value={a || 0} />
                 }
             },
-            {
-                title: '朋友圈视频播放次数',
-                dataIndex: 'video_play_count',
-                key: 'video_play_count',
-                align: 'center',
-                width: 90,
-                render: (a: any, b: any) => {
-                    return <Statistic value={a || 0} />
-                }
-            },
+            // {
+            //     title: '朋友圈视频播放次数',
+            //     dataIndex: 'video_play_count',
+            //     key: 'video_play_count',
+            //     align: 'center',
+            //     width: 90,
+            //     render: (a: any, b: any) => {
+            //         return <Statistic value={a || 0} />
+            //     }
+            // },
 
 
             {

+ 2 - 0
src/pages/launchSystemV3/adMonitorListV3/Details.tsx

@@ -50,6 +50,8 @@ const Details: React.FC<Props> = ({ data, onClose, visible }) => {
                 setLineDis(() => data)
             }
         })
+        getListForAdV3.refresh()
+        getAdTotalDataV3.refresh()
     }
 
     useEffect(() => {

+ 2 - 2
src/pages/launchSystemV3/adMonitorListV3/config.ts

@@ -21,7 +21,7 @@ const planAdConfig = [
             { title: '定向条件描述', dataIndex: 'targeting_translation', serverIndex: 'adgroup.targeting_translation', label: '广告详情', default: 17, width: 120 },
             { title: '创建时间', dataIndex: 'created_time', serverIndex: 'adgroup.created_time', label: '广告详情', default: 18, width: 140 },
             { title: '是否已删除', dataIndex: 'is_deleted', serverIndex: 'adgroup.is_deleted', label: '广告详情', default: 19, width: 60 },
-            { title: '广告状态', dataIndex: 'system_status', serverIndex: 'adgroup.system_status', label: '广告详情', default: 20, width: 70 },
+            { title: '广告状态', dataIndex: 'system_status', serverIndex: 'adgroup.system_status', label: '广告详情', default: 20, width: 100 },
             { title: '广告详情', dataIndex: 'cost_speed', label: '广告详情', default: 21, width: 80 },
             { title: '标记备注', dataIndex: 'tag_remark', label: '广告详情', width: 80, serverIndex: 'adgroup_user_tag.tag_remark' },
             { title: '创意预览', dataIndex: 'creative_ids', serverIndex: 'adgroup_data.creative_ids', label: '广告详情', width: 130 },
@@ -38,7 +38,7 @@ const planAdConfig = [
             { title: '点击率', dataIndex: 'ctr_total', label: '广告消耗信息', width: 100 },
             { title: '点击均价', dataIndex: 'cpc_total', label: '广告消耗信息', width: 100 },
             { title: '不感兴趣点击次数', dataIndex: 'no_interest_count_total', label: '广告消耗信息', width: 100 },
-            { title: '朋友圈视频播放次数', dataIndex: 'video_play_count_total', label: '广告消耗信息', width: 100 },
+            // { title: '朋友圈视频播放次数', dataIndex: 'video_play_count_total', label: '广告消耗信息', width: 100 },
         ]
     },
     {

+ 5 - 3
src/pages/launchSystemV3/adMonitorListV3/tableMonitorConfig.tsx

@@ -1,6 +1,6 @@
 import useCopy from '@/Hook/useCopy'
 import { RiseOutlined } from '@ant-design/icons'
-import {  Progress, Space, Statistic } from 'antd'
+import { Progress, Space, Statistic } from 'antd'
 import { ColumnsType } from 'antd/lib/table'
 import React from 'react'
 import { ReactComponent as RocketSvg } from '@/assets/rocket.svg'
@@ -100,7 +100,8 @@ function columnsMonitor(planDetail: (id: number) => void, details: (id: number)
                 align: 'center',
                 ellipsis: true,
                 render: (a: any) => {
-                    return <Statistic value={a || 0} />
+                    let value = a ? a / 100 : 0
+                    return <Statistic value={value || 0} />
                 }
             },
             {
@@ -121,7 +122,8 @@ function columnsMonitor(planDetail: (id: number) => void, details: (id: number)
                 align: 'center',
                 ellipsis: true,
                 render: (a: any) => {
-                    return <div style={a >= 500 ? { backgroundColor: 'rgba(255, 80, 82, .72)', height: 26, color: '#fff', display: 'flex', justifyContent: 'center', alignItems: 'center', fontWeight: 600 } : {}}><Statistic value={a || 0} valueStyle={a >= 500 ? { fontSize: 14 } : {}} /></div>
+                    let value = a ? a / 100 : 0
+                    return <div style={value >= 500 ? { backgroundColor: 'rgba(255, 80, 82, .72)', height: 26, color: '#fff', display: 'flex', justifyContent: 'center', alignItems: 'center', fontWeight: 600 } : {}}><Statistic value={value || 0} valueStyle={value >= 500 ? { fontSize: 14 } : {}} /></div>
                 }
             },
             {

+ 13 - 14
src/pages/launchSystemV3/adMonitorListV3/tablePlanListConfig.tsx

@@ -9,9 +9,8 @@ import StatisticNull from '@/components/StatisticNull'
 import { DownOutlined } from '@ant-design/icons'
 import TimeSeriesLook from '../../launchSystemNew/adq/ad/timeSeriesLook'
 import SwitchStatus from '../adqv3/ad/switchStatus'
-import { ADGROUP_STATUS } from '../adqv3/const'
-import BoxOther from '../adqv3/creative/boxOther'
 import CreativePreview from './CreativePreview'
+import { ADGROUP_STATUS } from '@/pages/adMonitor/adMonitorList/data'
 function tablePlanConfig(
     onChange: () => void,
     details: (data: any) => void,
@@ -264,7 +263,7 @@ function tablePlanConfig(
             dataIndex: 'system_status',
             key: 'system_status',
             align: 'center',
-            width: 70,
+            width: 100,
             ellipsis: true,
             render: (a: string) => {
                 return ADGROUP_STATUS[a]
@@ -411,17 +410,17 @@ function tablePlanConfig(
                 return <StatisticNull data={b} field='no_interest_count_total' />
             }
         },
-        {
-            title: '朋友圈视频播放次数',
-            dataIndex: 'video_play_count_total',
-            key: 'video_play_count_total',
-            align: 'center',
-            width: 110,
-            sorter: true,
-            render: (a: any, b: any) => {
-                return <StatisticNull data={b} field='video_play_count_total' />
-            }
-        },
+        // {
+        //     title: '朋友圈视频播放次数',
+        //     dataIndex: 'video_play_count_total',
+        //     key: 'video_play_count_total',
+        //     align: 'center',
+        //     width: 110,
+        //     sorter: true,
+        //     render: (a: any, b: any) => {
+        //         return <StatisticNull data={b} field='video_play_count_total' />
+        //     }
+        // },
         {
             title: '下载次数',
             dataIndex: 'download_count_total',

+ 2 - 2
src/pages/launchSystemV3/tencentAdPutIn/index.less

@@ -96,10 +96,10 @@
     bottom: 0;
     left: 0;
     right: 0;
-    padding: 4px 8px;
+    padding: 4px 8px !important;
     background-color: #FFF;
     border-radius: 0 0 8px 8px;
-    margin-bottom: 0;
+    margin-bottom: 0 !important;
     text-align: right;
 }