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

src/pages/launchSystemV3/adMonitorListV3/adPlanList.tsx

@@ -362,7 +362,7 @@ const AdPlanList: React.FC<{ userId: string }> = (props) => {
                                     'first_day_order_roi_total', 'order_rate_total',
                                     'order_roi_total', 'conversions_rate_total',
                                     'income_roi124h_pla_total', 'income_roi124h_total', 'income_roi1_total', 'income_roi3_total', 'income_roi7_total', 'income_roi14_total', 'ad_monetization_roi_total',
-                                    'mini_game_income_roi1_total', 'minigame3d_income_roi_total', 'minigame7d_income_roi_total', 'mini_game_ad_monetization_roi_total'
+                                    'mini_game_income_roi1_total', 'minigame3d_income_roi_total', 'minigame7d_income_roi_total', 'mini_game_ad_monetization_roi_total', 'reg_click_rate_pla_total', 'reg_rate_total'
                                 ].includes(item.dataIndex)) {
                                     let value = (data === 0 || data) ? data : '--'
                                     return <Table.Summary.Cell index={index} key={item.dataIndex} align="center">

src/pages/launchSystemV3/adMonitorListV3/config.ts

@@ -133,6 +133,7 @@ const planAdConfig = [
             { title: '注册次数', serverIndex: 'adgroup_data.reg_pv_total', dataIndex: 'reg_pv_total', label: '其他业务(其他指标)', width: 80 },
             { title: '注册人数', serverIndex: 'adgroup_data.reg_dedup_pv_total', dataIndex: 'reg_dedup_pv_total', label: '其他业务(其他指标)', width: 80 },
             { title: '注册成本', serverIndex: 'adgroup_data.reg_cost_total', dataIndex: 'reg_cost_total', label: '其他业务(其他指标)', width: 80 },
+            { title: '注册率', serverIndex: 'adgroup_data.reg_rate_total', dataIndex: 'reg_rate_total', label: '其他业务(其他指标)', width: 80 },
             { title: '激活注册率', serverIndex: 'adgroup_data.activate_register_rate_total', dataIndex: 'activate_register_rate_total', label: '其他业务(其他指标)', width: 80 },
             { title: '次日留存人数', serverIndex: 'adgroup_data.mini_game_retention_d1_total', dataIndex: 'mini_game_retention_d1_total', label: '其他业务(其他指标)', width: 80 },
             { title: '次日留存成本', serverIndex: 'adgroup_data.retention_cost_total', dataIndex: 'retention_cost_total', label: '其他业务(其他指标)', width: 80 },
@@ -401,6 +402,7 @@ const dynamicConfig = [
             { title: '注册次数', serverIndex: 'creative_data.reg_pv_day', dataIndex: 'reg_pv_day', label: '其他业务(其他指标)', width: 80 },
             { title: '注册人数', serverIndex: 'creative_data.reg_dedup_pv_day', dataIndex: 'reg_dedup_pv_day', label: '其他业务(其他指标)', width: 80 },
             { title: '注册成本', serverIndex: 'calculate_creative_data.reg_cost', dataIndex: 'reg_cost', label: '其他业务(其他指标)', width: 80 },
+            { title: '注册率', serverIndex: 'calculate_creative_data.reg_rate', dataIndex: 'reg_rate', label: '其他业务(其他指标)', width: 80 },
             { title: '激活注册率', serverIndex: 'calculate_creative_data.activate_register_rate', dataIndex: 'activate_register_rate', label: '其他业务(其他指标)', width: 80 },
             { title: '次日留存人数', serverIndex: 'creative_data.mini_game_retention_d1_day', dataIndex: 'mini_game_retention_d1_day', label: '其他业务(其他指标)', width: 80 },
             { title: '次日留存成本', serverIndex: 'calculate_creative_data.retention_cost', dataIndex: 'retention_cost', label: '其他业务(其他指标)', width: 80 },

src/pages/launchSystemV3/adMonitorListV3/tableDynamicConfig.tsx

@@ -1560,6 +1560,21 @@ function tableDynamicConfig(
                 return <StatisticNull data={b} field='reg_cost' />
             }
         },
+        {
+            title: '注册率',
+            dataIndex: 'reg_rate',
+            key: 'reg_rate',
+            align: 'center',
+            width: 110,
+            sorter: true,
+            render: (a: any, b: any) => {
+                if (b?.reg_rate !== undefined && b?.reg_rate !== null) {
+                    return <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ color: '#3f8600' }} suffix="%" />
+                } else {
+                    return '--'
+                }
+            }
+        },
         {
             title: '注册次数(平台上报)',
             dataIndex: 'reg_pla_pv_day',

src/pages/launchSystemV3/adMonitorListV3/tablePlanListConfig.tsx

@@ -1435,6 +1435,21 @@ function tablePlanConfig(
                 return <StatisticNull data={b} field='reg_cost_total' />
             }
         },
+        {
+            title: '注册率',
+            dataIndex: 'reg_rate_total',
+            key: 'reg_rate_total',
+            align: 'center',
+            width: 110,
+            sorter: true,
+            render: (a: any, b: any) => {
+                if (b?.reg_rate_total !== undefined && b?.reg_rate_total !== null) {
+                    return <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ color: '#3f8600' }} suffix="%" />
+                } else {
+                    return '--'
+                }
+            }
+        },
         {
             title: '注册次数(平台上报)',
             dataIndex: 'reg_pla_pv_total',