fix

src/pages/dataStatisticsNovel/weChat/payFans/tableConfig.tsx

@@ -2,7 +2,7 @@ import WidthEllipsis from "@/components/WidthEllipsis";
 import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 
-const lineHeight = '62.84px'
+const lineHeight = '75.4px'
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(30).fill('').map((_, index) => {
@@ -14,6 +14,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                         <span style={{ color: '#0f538a', fontWeight: 600 }}>人数：<span><Statistic value={b[`d${index + 1}`]?.act_user || 0} valueStyle={{ color: '#0f538a', fontWeight: 600, fontSize: 13 }} /></span></span>
                         <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>成本：<span><Statistic value={b[`d${index + 1}`]?.act_cost_per_cost || 0} valueStyle={{ color: '#311b92', fontSize: 13 }} /></span></span>
                         <span style={{ color: '#ff5722', fontWeight: 600 }}>占比：<span>{b[`d${index + 1}`]?.act_rate ? (b[`d${index + 1}`]?.act_rate * 100)?.toFixed(2) + '%' : '0%'}</span></span>
+                        <span style={{ color: '#d81b60', fontWeight: 600 }}>首日激活系数：<span>{b[`d${index + 1}`]?.first_active}</span></span>
                     </div>
                 }
                 return <div style={{ fontSize: 12, minHeight: 62, lineHeight }}>--</div>

src/pages/dataStatisticsNovel/weChat/payTrend/tableConfig.tsx

@@ -7,7 +7,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(60).fill('').map((_, index) => {
         return {
-            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '充增回倍-天', width: 120, default: 27 + index,
+            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '充增回倍-天', width: 120, default: 29 + index,
             render: (a: { amount: number, roi: number, add: number, mult: number, user_count: number, user_amount_rate: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
@@ -28,7 +28,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arrM = Array(24).fill('').map((_, index) => {
         return {
-            title: `M${index + 1}`, dataIndex: `m${index + 1}`, label: '充增回倍-月', width: 110, default: 27 + 60 + index,
+            title: `M${index + 1}`, dataIndex: `m${index + 1}`, label: '充增回倍-月', width: 110, default: 29 + 60 + index,
             render: (a: { amount: number, roi: number, add: number, mult: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
@@ -88,67 +88,75 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '当日新用户累计充值', dataIndex: 'reg_amount', label: '基本信息', align: 'right', width: 120, sorter: true, default: 11,
+                    title: '当日新用户累计充值', dataIndex: 'reg_amount', label: '基本信息', align: 'right', width: 100, sorter: true, default: 11,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '首日新用户充值', dataIndex: 'first_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 12,
+                    title: '首日新用户充值', dataIndex: 'first_amount', label: '基本信息', align: 'right', width: 90, sorter: true, default: 12,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 80, default: 13, sorter: true,
+                    title: '首日新用户充值人数', dataIndex: 'first_order_user', label: '基本信息', align: 'center', width: 85, sorter: true, default: 13,
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
+                },
+                {
+                    title: '首日新用户充值成本', dataIndex: 'first_order_cost', label: '基本信息', align: 'right', width: 85, sorter: true, default: 14,
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
+                },
+                {
+                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 80, default: 15, sorter: true,
                     render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight } : a >= 1 ? { color: '#0f990f', lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
-                    title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 14,
+                    title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 105, sorter: true, default: 16,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '预期年倍数', dataIndex: 'annual_mult', label: '基本信息', align: 'center', width: 80, sorter: true, default: 15,
+                    title: '预期年倍数', dataIndex: 'annual_mult', label: '基本信息', align: 'center', width: 80, sorter: true, default: 17,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '预期年收益', dataIndex: 'annual_expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 16,
+                    title: '预期年收益', dataIndex: 'annual_expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 18,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '毛利', dataIndex: 'profit', label: '基本信息', align: 'right', width: 120, sorter: true, default: 17,
+                    title: '毛利', dataIndex: 'profit', label: '基本信息', align: 'right', width: 120, sorter: true, default: 19,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '新增粉丝数', dataIndex: 'new_follow_user', label: '基本信息', align: 'center', width: 95, sorter: true, default: 18,
+                    title: '新增粉丝数', dataIndex: 'new_follow_user', label: '基本信息', align: 'center', width: 95, sorter: true, default: 20,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '新增粉丝成本', dataIndex: 'new_follow_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 19,
+                    title: '新增粉丝成本', dataIndex: 'new_follow_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 21,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值人数', dataIndex: 'order_user', label: '基本信息', align: 'center', width: 90, sorter: true, default: 20,
+                    title: '充值人数', dataIndex: 'order_user', label: '基本信息', align: 'center', width: 90, sorter: true, default: 22,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值次数', dataIndex: 'order_count', label: '基本信息', align: 'center', width: 85, sorter: true, default: 21,
+                    title: '充值次数', dataIndex: 'order_count', label: '基本信息', align: 'center', width: 85, sorter: true, default: 23,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值用户成本', dataIndex: 'order_user_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 22,
+                    title: '充值用户成本', dataIndex: 'order_user_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 24,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 23,
+                    title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 25,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '书城粉丝关注成本', dataIndex: 'platform_new_user_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 24,
+                    title: '书城粉丝关注成本', dataIndex: 'platform_new_user_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 26,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '加企业微信客服人数', dataIndex: 'scan_follow_user_count', label: '基本信息', align: 'center', width: 95, sorter: true, default: 25,
+                    title: '加企业微信客服人数', dataIndex: 'scan_follow_user_count', label: '基本信息', align: 'center', width: 95, sorter: true, default: 27,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '加企业微信客服成本', dataIndex: 'scan_follow_user_cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 26,
+                    title: '加企业微信客服成本', dataIndex: 'scan_follow_user_cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 28,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 }
             ]

src/pages/dataStatisticsNovel/weChat/payTrendCom/tableConfig.tsx

@@ -8,7 +8,7 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
 
     const arr = Array(60).fill('').map((_, index) => {
         return {
-            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '充增回倍-天', width: 120, default: 28 + index,
+            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '充增回倍-天', width: 120, default: 30 + index,
             render: (a: { amount: number, roi: number, add: number, mult: number, user_count: number, user_amount_rate: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
@@ -25,7 +25,7 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
 
     const arrM = Array(24).fill('').map((_, index) => {
         return {
-            title: `M${index + 1}`, dataIndex: `m${index + 1}`, label: '充增回倍-月', width: 110, default: 28 + 60 + index,
+            title: `M${index + 1}`, dataIndex: `m${index + 1}`, label: '充增回倍-月', width: 110, default: 30 + 60 + index,
             render: (a: { amount: number, roi: number, add: number, mult: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
@@ -98,63 +98,71 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '首日新用户充值', dataIndex: 'first_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 13,
+                    title: '首日新用户充值', dataIndex: 'first_amount', label: '基本信息', align: 'right', width: 90, sorter: true, default: 13,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 80, default: 14, sorter: true,
+                    title: '首日新用户充值人数', dataIndex: 'first_order_user', label: '基本信息', align: 'center', width: 85, sorter: true, default: 14,
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
+                },
+                {
+                    title: '首日新用户充值成本', dataIndex: 'first_order_cost', label: '基本信息', align: 'right', width: 85, sorter: true, default: 15,
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
+                },
+                {
+                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 80, default: 16, sorter: true,
                     render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight } : a >= 1 ? { color: '#0f990f', lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
-                    title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 15,
+                    title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 17,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '预期年倍数', dataIndex: 'annual_mult', label: '基本信息', align: 'center', width: 80, sorter: true, default: 16,
+                    title: '预期年倍数', dataIndex: 'annual_mult', label: '基本信息', align: 'center', width: 80, sorter: true, default: 18,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '预期年收益', dataIndex: 'annual_expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 17,
+                    title: '预期年收益', dataIndex: 'annual_expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 19,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '毛利', dataIndex: 'profit', label: '基本信息', align: 'right', width: 120, sorter: true, default: 18,
+                    title: '毛利', dataIndex: 'profit', label: '基本信息', align: 'right', width: 120, sorter: true, default: 20,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600, lineHeight } : { lineHeight }} />)
                 },
                 {
-                    title: '新增粉丝数', dataIndex: 'new_follow_user', label: '基本信息', align: 'center', width: 95, sorter: true, default: 19,
+                    title: '新增粉丝数', dataIndex: 'new_follow_user', label: '基本信息', align: 'center', width: 95, sorter: true, default: 21,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '新增粉丝成本', dataIndex: 'new_follow_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 20,
+                    title: '新增粉丝成本', dataIndex: 'new_follow_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 22,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值人数', dataIndex: 'order_user', label: '基本信息', align: 'center', width: 90, sorter: true, default: 21,
+                    title: '充值人数', dataIndex: 'order_user', label: '基本信息', align: 'center', width: 90, sorter: true, default: 23,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值次数', dataIndex: 'order_count', label: '基本信息', align: 'center', width: 85, sorter: true, default: 22,
+                    title: '充值次数', dataIndex: 'order_count', label: '基本信息', align: 'center', width: 85, sorter: true, default: 24,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '充值用户成本', dataIndex: 'order_user_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 23,
+                    title: '充值用户成本', dataIndex: 'order_user_per_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 25,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 24,
+                    title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 26,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '书城粉丝关注成本', dataIndex: 'platform_new_user_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 25,
+                    title: '书城粉丝关注成本', dataIndex: 'platform_new_user_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 27,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '加企业微信客服人数', dataIndex: 'scan_follow_user_count', label: '基本信息', align: 'center', width: 95, sorter: true, default: 26,
+                    title: '加企业微信客服人数', dataIndex: 'scan_follow_user_count', label: '基本信息', align: 'center', width: 95, sorter: true, default: 28,
                     render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '加企业微信客服成本', dataIndex: 'scan_follow_user_cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 27,
+                    title: '加企业微信客服成本', dataIndex: 'scan_follow_user_cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 29,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 }
             ]