wjx 1 month ago
parent
commit
ef101171c4

+ 3 - 0
src/app.tsx

@@ -298,6 +298,9 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
           components: {
             Input: {
 
+            },
+            Table: {
+              colorBorderSecondary: '#e0e0e0',
             }
           },
           // algorithm: [compactAlgorithm]

+ 1 - 0
src/global.less

@@ -113,6 +113,7 @@ ol {
         .ant-progress-inner {
           height: 100%;
           border-radius: 0;
+          background-color: transparent;
 
           .ant-progress-bg {
             height: 100% !important;

+ 14 - 14
src/pages/dataStatisticsNovel/book/payTrend/tableConfig.tsx

@@ -2,7 +2,7 @@ import WidthEllipsis from "@/components/WidthEllipsis";
 import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 
-const lineHeight = '75.4px'
+const lineHeight = '81.69px'
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(60).fill('').map((_, index) => {
@@ -17,7 +17,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
                 }
-                return <div style={{ fontSize: 12, minHeight: 75.4, lineHeight }}>--</div>
+                return <div style={{ fontSize: 12, minHeight: lineHeight, lineHeight }}>--</div>
             }
         }
     })
@@ -34,7 +34,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
                 }
-                return <div style={{ fontSize: 12, minHeight: 75.4, lineHeight }}>--</div>
+                return <div style={{ fontSize: 12, minHeight: lineHeight, lineHeight }}>--</div>
             }
         }
     })
@@ -56,27 +56,27 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight }} />)
                 },
                 {
-                    title: '当天消耗', dataIndex: 'cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 4,
+                    title: '当天消耗', dataIndex: 'cost', label: '基本信息', align: 'right', width: 110, sorter: true, default: 4,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '首日回收率', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 90, default: 5, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '当天用户七日回本率', dataIndex: 'roi7', label: '基本信息', align: 'center', width: 110, default: 6, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '当天用户30日回本率', dataIndex: 'roi30', label: '基本信息', align: 'center', width: 110, default: 7, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '当天用户回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 100, default: 8, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
-                    title: '当天账面充值', dataIndex: 'order_amount', label: '基本信息', align: 'right', width: 95, sorter: true, default: 9,
+                    title: '当天账面充值', dataIndex: 'order_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 9,
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
@@ -85,15 +85,15 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '点击率', dataIndex: 'click_rate', label: '基本信息', align: 'center', width: 75, default: 11, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '关注率', dataIndex: 'follow_rate', label: '基本信息', align: 'center', width: 75, default: 12, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '首日充值率', dataIndex: 'first_order_rate', label: '基本信息', align: 'center', width: 75, default: 13, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '曝光量', dataIndex: 'view_count', label: '基本信息', align: 'center', width: 90, sorter: true, default: 14,
@@ -137,11 +137,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 24,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a >= 0.5 ? { color: 'red', lineHeight } : { color: '#0f990f', lineHeight }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 },
                 {
                     title: '真实首日回本率', dataIndex: 'total_first_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 25,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a >= 0.5 ? { color: 'red', lineHeight } : { color: '#0f990f', lineHeight }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 },
                 {
                     title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 26,

+ 42 - 41
src/pages/dataStatisticsNovel/book/summarizing/tableConfig.tsx

@@ -2,6 +2,7 @@ import WidthEllipsis from "@/components/WidthEllipsis";
 import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 
+const lineHeight = '81.69px'
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(60).fill('').map((_, index) => {
@@ -16,7 +17,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
                 }
-                return <div style={{ fontSize: 12, minHeight: 75.4, lineHeight: '75.4px' }}>--</div>
+                return <div style={{ fontSize: 12, minHeight: lineHeight, lineHeight }}>--</div>
             }
         }
     })
@@ -33,7 +34,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
                 }
-                return <div style={{ fontSize: 12, minHeight: 75.4, lineHeight: '75.4px' }}>--</div>
+                return <div style={{ fontSize: 12, minHeight: lineHeight, lineHeight }}>--</div>
             }
         }
     })
@@ -44,147 +45,147 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
             data: [
                 {
                     title: '小说', dataIndex: 'book', label: '基本信息', align: 'center', width: 70, default: 1,
-                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight: '75.4px' }} />)
+                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight }} />)
                 },
                 {
                     title: '投放位置', dataIndex: 'type', label: '基本信息', align: 'center', width: 40, default: 2,
-                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight: '75.4px' }} />)
+                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight }} />)
                 },
                 {
-                    title: '最早投放日期', dataIndex: 'start_date', label: '基本信息', align: 'center', width: 80, default: 3,
-                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight: '75.4px' }} />)
+                    title: '最早投放日期', dataIndex: 'start_date', label: '基本信息', align: 'center', width: 80, sorter: true, default: 3,
+                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight }} />)
                 },
                 {
-                    title: '最晚消耗时间', dataIndex: 'end_date', label: '基本信息', align: 'center', width: 80, default: 4,
-                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight: '75.4px' }} />)
+                    title: '最晚消耗时间', dataIndex: 'end_date', label: '基本信息', align: 'center', width: 80, sorter: true, default: 4,
+                    render: (a: string) => (<WidthEllipsis value={a} style={{ lineHeight }} />)
                 },
                 {
                     title: '消耗', dataIndex: 'cost', label: '基本信息', align: 'right', width: 110, sorter: true, default: 5,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '注册用户充值', dataIndex: 'amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 6,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '首日充值', dataIndex: 'first_amount', label: '基本信息', align: 'right', width: 105, sorter: true, default: 7,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
-                    title: '回率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 100, default: 8, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    title: '回率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 100, default: 8, 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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '首日回收率', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 100, default: 9, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '七日回收率', dataIndex: 'roi7', label: '基本信息', align: 'center', width: 100, default: 10, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '30日回收率', dataIndex: 'roi30', label: '基本信息', align: 'center', width: 100, default: 11, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '毛利额', dataIndex: 'profit', label: '基本信息', align: 'right', width: 100, sorter: true, default: 12,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '点击率', dataIndex: 'click_rate', label: '基本信息', align: 'center', width: 90, default: 13, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '关注率', dataIndex: 'follow_rate', label: '基本信息', align: 'center', width: 90, default: 14, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '下单率', dataIndex: 'order_rate', label: '基本信息', align: 'center', width: 90, default: 15, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '首日下单率', dataIndex: 'first_order_rate', label: '基本信息', align: 'center', width: 100, default: 16, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a <= 0.08 ? { color: '#0f990f', fontWeight: 600, lineHeight: '75.4px' } : a >= 1 ? { color: '#0f990f', lineHeight: '75.4px' } : { lineHeight: '75.4px' }} suffix="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '曝光量', dataIndex: 'view_count', label: '基本信息', align: 'center', width: 110, sorter: true, default: 17,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '点击量', dataIndex: 'click_count', label: '基本信息', align: 'center', width: 105, sorter: true, default: 18,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '关注人数', dataIndex: 'follow_user', label: '基本信息', align: 'center', width: 95, sorter: true, default: 19,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '充值人数', dataIndex: 'order_user', label: '基本信息', align: 'center', width: 90, sorter: true, default: 20,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '首日充值人数', dataIndex: 'first_order_user', label: '基本信息', align: 'center', width: 80, sorter: true, default: 21,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '关注成本', dataIndex: 'follow_cost', label: '基本信息', align: 'right', width: 70, sorter: true, default: 22,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '充值成本', dataIndex: 'order_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 23,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '首日充值成本', dataIndex: 'first_order_cost', label: '基本信息', align: 'right', width: 80, sorter: true, default: 24,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '客单价', dataIndex: 'avg_amount', label: '基本信息', align: 'right', width: 70, sorter: true, default: 25,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '今日充值', dataIndex: 'td_amount', label: '基本信息', align: 'right', width: 90, sorter: true, default: 26,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '昨日充值', dataIndex: 'yd_amount', label: '基本信息', align: 'right', width: 90, sorter: true, default: 27,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '前日充值', dataIndex: 'byd_amount', label: '基本信息', align: 'right', width: 90, sorter: true, default: 28,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '真实累计充值', dataIndex: 'total_reg_user_coefficient_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 29,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '真实首日充值', dataIndex: 'total_first_user_coefficient_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 30,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 31,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a >= 0.5 ? { color: 'red', lineHeight: '75.4px' } : { color: '#0f990f', lineHeight: '75.4px' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 },
                 {
                     title: '真实首日回本率', dataIndex: 'total_first_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 32,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight: '75.4px' } : a >= 0.5 ? { color: 'red', lineHeight: '75.4px' } : { color: '#0f990f', lineHeight: '75.4px' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 },
                 {
                     title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 33,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '书城粉丝关注成本', dataIndex: 'platform_new_user_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 34,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    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: 35,
-                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} valueStyle={{ lineHeight }} />)
                 },
                 {
                     title: '加企业微信客服成本', dataIndex: 'scan_follow_user_cost', label: '基本信息', align: 'right', width: 95, sorter: true, default: 36,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight: '75.4px' }} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={{ lineHeight }} />)
                 }
             ]
         },

+ 1 - 0
src/pages/dataStatisticsNovel/pitcher/dataCenter/index.tsx

@@ -154,6 +154,7 @@ const DataCenter: React.FC = () => {
         </Card>
 
         <TablePro
+            isZj
             totalData={totalData}
             czChild={<h3 style={{ marginBottom: 0, marginLeft: 12 }}>{`${pitcher?.pitcher_name ? pitcher?.pitcher_name : initialState?.currentUser?.name}--日期汇总数据`}</h3>}
             config={columns12()}

+ 3 - 3
src/pages/dataStatisticsNovel/pitcher/overview/tableConfig.tsx

@@ -8,7 +8,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
             label: '基本信息',
             data: [
                 {
-                    title: '投手', dataIndex: 'pitcher', label: '基本信息', align: 'center', width: 55, default: 1,
+                    title: '投手', dataIndex: 'pitcher', label: '基本信息', align: 'center', width: 60, default: 1,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -32,11 +32,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => (<Statistic value={a || 0} precision={2} />)
                 },
                 {
-                    title: '回率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 90, default: 7, sorter: true,
+                    title: '回率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 90, default: 7, sorter: true,
                     render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={a <= 0.08 ? { color: '#0f990f', fontWeight: 600 } : a >= 1 ? { color: 'red', fontWeight: 600 } : {}} suffix="%" />
                 },
                 {
-                    title: '首日回收率', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 90, default: 8, sorter: true,
+                    title: '首日回收率', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 75, default: 8, sorter: true,
                     render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={a <= 0.08 ? { color: '#0f990f', fontWeight: 600 } : a >= 1 ? { color: 'red', fontWeight: 600 } : {}} suffix="%" />
                 },
                 {

+ 5 - 6
src/pages/dataStatisticsNovel/pitcher/pitcherChannel/tableConfig.tsx

@@ -1,5 +1,4 @@
 import WidthEllipsis from "@/components/WidthEllipsis";
-import { Link } from "@umijs/max";
 import { Statistic } from "antd";
 
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
@@ -29,11 +28,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '最早消耗日期', dataIndex: 'start', label: '基本信息', align: 'center', width: 78, default: 6,
+                    title: '最早消耗日期', dataIndex: 'start', label: '基本信息', align: 'center', width: 78, sorter: true, default: 6,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '最晚消耗日期', dataIndex: 'end', label: '基本信息', align: 'center', width: 78, default: 7,
+                    title: '最晚消耗日期', dataIndex: 'end', label: '基本信息', align: 'center', width: 78, sorter: true, default: 7,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -53,7 +52,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 0 ? { color: '#0f990f', fontWeight: 600 } : {}} />)
                 },
                 {
-                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 105, default: 12, sorter: true,
+                    title: '回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 80, default: 12, sorter: true,
                     render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={a <= 0.08 ? { color: '#0f990f', fontWeight: 600 } : a >= 1 ? { color: 'red', fontWeight: 600 } : {}} suffix="%" />
                 },
                 {
@@ -70,7 +69,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '充值转化比率', dataIndex: 'order_tran_rate', label: '基本信息', align: 'center', width: 90, default: 16, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '充值转化成本', dataIndex: 'order_tran_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 17,
@@ -94,7 +93,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 22,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 23,

+ 1 - 1
src/pages/dataStatisticsNovel/pitcher/pitcherPay/index.less

@@ -7,6 +7,6 @@
         display: flex;
         justify-content: left;
         width: 100%;
-        font-size: 12px;
+        font-size: 13px;
     }
 }

+ 6 - 6
src/pages/dataStatisticsNovel/pitcher/pitcherPay/tableConfig.tsx

@@ -63,7 +63,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '当天回本率', dataIndex: 'roi', label: '基本信息', align: 'center', width: 110, default: 6, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '毛利', dataIndex: 'profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 7,
@@ -79,11 +79,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '首日ROI', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 110, default: 10, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '七日ROI', dataIndex: 'roi7', label: '基本信息', align: 'center', width: 110, default: 11, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '当日三十天回本金额', dataIndex: 'reg_amount30', label: '基本信息', align: 'right', width: 110, sorter: true, default: 12,
@@ -91,7 +91,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '当日三十天回本率', dataIndex: 'roi30', label: '基本信息', align: 'center', width: 110, default: 13, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '真实累计充值', dataIndex: 'total_reg_user_coefficient_amount', label: '基本信息', align: 'right', width: 110, sorter: true, default: 14,
@@ -103,11 +103,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 16,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a >= 0.5 ? { color: 'red', lineHeight } : { color: '#0f990f', lineHeight }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 },
                 {
                     title: '真实首日回本率', dataIndex: 'total_first_user_coefficient_roi', label: '基本信息', align: 'center', width: 100, sorter: true, default: 17,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? { lineHeight } : a >= 0.5 ? { color: 'red', lineHeight } : { color: '#0f990f', lineHeight }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={{ lineHeight }} suffix="%" />
                 }
             ]
         },

+ 8 - 8
src/pages/dataStatisticsNovel/weChat/advertising/tableConfig.tsx

@@ -46,12 +46,12 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => <div style={{ height: 27, position: 'relative' }} >
                         <Progress
                             strokeColor={{
-                                from: '#10c1e9',
-                                to: '#6892d0',
+                                from: '#108ee9',
+                                to: '#87d068',
                             }}
                             status="active"
                             showInfo={false}
-                            percent={a ? a / 60000 : 0}
+                            percent={a ? a / 60000 * 100 : 0}
                         />
                         <span style={{ position: 'absolute', left: '50%', top: '50%', width: '100%', padding: '0 5px', transform: 'translate(-50%, -50%)' }}><Statistic style={{ fontWeight: 'bold' }} value={a || 0} precision={2} valueStyle={a >= 10000 ? { fontWeight: 'bold' } : { fontWeight: 'bold' }} /></span>
                     </div>
@@ -74,7 +74,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '首日客单价', dataIndex: 'first_amount_per_user', label: '基本信息', align: 'right', width: 75, sorter: true, default: 14,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} />)
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 15 ? { color: '#0f990f' } : a >= 40 ? { color: 'red' } : {}} />)
                 },
                 {
                     title: '新用户累计充值', dataIndex: 'reg_user_amount', label: '基本信息', align: 'right', width: 125, sorter: true, default: 15,
@@ -89,8 +89,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => (<Statistic value={a || 0} />)
                 },
                 {
-                    title: '关注成本', dataIndex: 'follow_per_cost', label: '基本信息', align: 'right', width: 60, sorter: true, default: 18,
-                    render: (a: number) => (<Statistic value={a || 0} precision={2} />)
+                    title: '关注成本', dataIndex: 'follow_per_cost', label: '基本信息', align: 'right', width: 70, sorter: true, default: 18,
+                    render: (a: number) => (<Statistic value={a || 0} precision={2} valueStyle={a < 15 ? { color: 'red' } : a >= 30 ? { color: '#0f990f' } : {}} />)
                 },
                 {
                     title: '客单价', dataIndex: 'user_per_amount', label: '基本信息', align: 'right', width: 75, sorter: true, default: 19,
@@ -162,7 +162,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 36,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '真实首日充值', dataIndex: 'total_first_user_coefficient_amount', label: '基本信息', align: 'right', width: 120, sorter: true, default: 37,
@@ -170,7 +170,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实首日回本率', dataIndex: 'total_first_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 38,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '真实系数', dataIndex: 'back_coefficient', label: '基本信息', align: 'center', width: 80, sorter: true, default: 39,

+ 3 - 3
src/pages/dataStatisticsNovel/weChat/payFans/tableConfig.tsx

@@ -2,19 +2,19 @@ import WidthEllipsis from "@/components/WidthEllipsis";
 import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 
-const lineHeight = '75.4px'
+const lineHeight = '84.84px'
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(30).fill('').map((_, index) => {
         return {
-            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '天数据', width: 115, default: 23 + index,
+            title: `D${index + 1}`, dataIndex: `d${index + 1}`, label: '天数据', width: 110, default: 23 + index,
             render: (_: any, b: any) => {
                 if (b?.[`d${index + 1}`]) {
                     return <div className={style.dbox}>
                         <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>
+                        <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>

+ 9 - 9
src/pages/dataStatisticsNovel/weChat/payTrend/tableConfig.tsx

@@ -2,7 +2,7 @@ import WidthEllipsis from "@/components/WidthEllipsis";
 import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 
-const lineHeight = '116.2px'
+const lineHeight = '124.11px'
 function columns12(): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(60).fill('').map((_, index) => {
@@ -11,8 +11,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
             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}>
-                        <span style={{ color: '#0f538a', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
-                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
+                        <span style={{ color: '#2196f3', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
+                        <span style={{ color: '#311b92', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#ff5722', fontWeight: 600 }}>回:<span>{(a?.roi * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                         {index < 30 && <>
@@ -32,8 +32,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
             render: (a: { amount: number, roi: number, add: number, mult: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
-                        <span style={{ color: '#0f538a', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
-                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
+                        <span style={{ color: '#2196f3', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
+                        <span style={{ color: '#311b92', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#ff5722', fontWeight: 600 }}>回:<span>{(a?.roi * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
@@ -73,11 +73,11 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '首日ROI', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 90, default: 7, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '要求首日ROI', dataIndex: 'require_roi', label: '基本信息', align: 'center', width: 110, default: 8, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '要求倍数', dataIndex: 'require_mult', label: '基本信息', align: 'center', width: 90, sorter: true, default: 9,
@@ -104,8 +104,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     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: 'roi', label: '基本信息', align: 'center', width: 90, 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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 105, sorter: true, default: 16,

+ 9 - 9
src/pages/dataStatisticsNovel/weChat/payTrendCom/tableConfig.tsx

@@ -3,7 +3,7 @@ import { Statistic } from "antd";
 import style from '../../pitcher/pitcherPay/index.less'
 import { FormOutlined } from "@ant-design/icons";
 
-const lineHeight = '75.4px'
+const lineHeight = '81.69px'
 function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[] {
 
     const arr = Array(60).fill('').map((_, index) => {
@@ -12,8 +12,8 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
             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}>
-                        <span style={{ color: '#0f538a', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
-                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
+                        <span style={{ color: '#2196f3', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
+                        <span style={{ color: '#311b92', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#ff5722', fontWeight: 600 }}>回:<span>{(a?.roi * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
@@ -29,8 +29,8 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
             render: (a: { amount: number, roi: number, add: number, mult: number }) => {
                 if (a?.amount) {
                     return <div className={style.dbox}>
-                        <span style={{ color: '#0f538a', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
-                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
+                        <span style={{ color: '#2196f3', fontWeight: 600 }}>充:<span style={{ fontWeight: 600 }}>{a?.amount || 0}</span></span>
+                        <span style={{ color: '#311b92', fontWeight: 600 }}>增:<span>{(a?.add * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#ff5722', fontWeight: 600 }}>回:<span>{(a?.roi * 100)?.toFixed(2)}%</span></span>
                         <span style={{ color: '#d81b60', fontWeight: 600 }}>倍:<span>{a?.mult}</span></span>
                     </div>
@@ -66,11 +66,11 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
                 },
                 {
                     title: '首日ROI', dataIndex: 'first_roi', label: '基本信息', align: 'center', width: 90, default: 6, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '要求首日ROI', dataIndex: 'require_roi', label: '基本信息', align: 'center', width: 110, default: 7, 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="%" />
+                    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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '要求倍数', dataIndex: 'require_mult', label: '基本信息', align: 'center', width: 90, sorter: true, default: 8,
@@ -110,8 +110,8 @@ function columns12(handlePay: (data: any) => void): NOVEL_DATA_API.ColumnsProps[
                     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: 'roi', label: '基本信息', align: 'center', width: 90, 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: 'red', fontWeight: 600, lineHeight } : { lineHeight }} suffix="%" />
                 },
                 {
                     title: '预期盈亏', dataIndex: 'expect_profit', label: '基本信息', align: 'right', width: 110, sorter: true, default: 17,

+ 5 - 5
src/pages/dataStatisticsNovel/weChat/todayRanking/tableConfig.tsx

@@ -46,7 +46,7 @@ function columns12(handleBook: (data: { book_names: string[] }) => void, weChatJ
                 },
                 {
                     title: '小说', dataIndex: 'book', label: '基本信息', align: 'center', width: 70, default: 8, ellipsis: true,
-                    render: (a: string) => (<a onClick={() => { handleBook({ book_names: [a] }) }}>{a}</a>)
+                    render: (a: string) => (<a style={{ fontSize: 13 }} onClick={() => { handleBook({ book_names: [a] }) }}>{a}</a>)
                 },
                 {
                     title: '消耗', dataIndex: 'cost', label: '基本信息', align: 'right', width: 115, sorter: true, default: 9,
@@ -54,8 +54,8 @@ function columns12(handleBook: (data: { book_names: string[] }) => void, weChatJ
                     render: (a: number) => <div style={{ height: 27, position: 'relative' }} >
                         <Progress
                             strokeColor={{
-                                from: '#10c1e9',
-                                to: '#6892d0',
+                                from: '#108ee9',
+                                to: '#87d068'
                             }}
                             status="active"
                             showInfo={false}
@@ -114,11 +114,11 @@ function columns12(handleBook: (data: { book_names: string[] }) => void, weChatJ
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 100, default: 22, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '真实首日回本率', dataIndex: 'total_first_user_coefficient_roi', label: '基本信息', align: 'center', width: 100, default: 23, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '新用户首日充值次数', dataIndex: 'first_count', label: '基本信息', align: 'center', width: 95, sorter: true, default: 24,

+ 4 - 4
src/pages/dataStatisticsNovel/weChat/weChatList/tableConfig.tsx

@@ -34,8 +34,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => <div style={{ height: 27, position: 'relative' }} >
                         <Progress
                             strokeColor={{
-                                from: '#10c1e9',
-                                to: '#6892d0',
+                                from: '#108ee9',
+                                to: '#87d068',
                             }}
                             status="active"
                             showInfo={false}
@@ -70,7 +70,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '充值转化比率', dataIndex: 'order_tran_rate', label: '基本信息', align: 'center', width: 100, default: 13, sorter: true,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '充值转化成本', dataIndex: 'order_tran_cost', label: '基本信息', align: 'right', width: 90, sorter: true, default: 14,
@@ -94,7 +94,7 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                 },
                 {
                     title: '真实累计回本率', dataIndex: 'total_reg_user_coefficient_roi', label: '基本信息', align: 'center', width: 110, sorter: true, default: 19,
-                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? (a * 100) : 0} precision={2} suffix="%" />
                 },
                 {
                     title: '书城粉丝数', dataIndex: 'platform_new_user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 20,

+ 2 - 2
src/pages/dataStatisticsNovel/wechatGroupData/tableConfig.tsx

@@ -17,8 +17,8 @@ function columns12(): NOVEL_DATA_API.ColumnsProps[] {
                     render: (a: number) => <div style={{ height: 27, position: 'relative' }} >
                         <Progress
                             strokeColor={{
-                                from: '#10c1e9',
-                                to: '#6892d0',
+                                from: '#108ee9',
+                                to: '#87d068'
                             }}
                             status="active"
                             showInfo={false}

+ 0 - 1
src/services/dataStatisticsNovel/pitcherChannel.ts

@@ -43,7 +43,6 @@ export async function getPitcherOverviewListApi(data: NOVEL_DATA_API.DownloadPar
   });
 }
 
-
 /** 投手付费趋势 POST /novel-data/pitcher/trend */
 export async function getPitcherTrendListApi(data: NOVEL_DATA_API.DownloadParamsProps) {
   return myRequest(`${api}/novel-data/pitcher/trend`, {