fix

src/components/rechargeTrend/index.less

@@ -48,4 +48,8 @@
 
 .zdred {
     background: rgb(255, 233, 227);
+}
+
+.color001 {
+    background-color: #f0f0f0;
 }

src/components/rechargeTrend/index.tsx

@@ -36,6 +36,7 @@ const RechargeTrend: React.FC<Props> = ({ visible, onClose, accountId, agentId,
             let col: any[] = []
             let data: any[] = [{ count: '1', id: 1 }, { count: '2', id: 2 }, { count: '3', id: 3 }, { count: '4', id: 4 }, { count: '5', id: 5 }, { count: '5-10', id: 6 }, { count: '10-20', id: 7 }, { count: '20次以上', id: 8 }]
             let date: string = ''
+            let width = 110
             Object.keys(getPromoteAgainList?.data).forEach((key, index) => {
                 date = key
                 col.push({
@@ -43,7 +44,7 @@ const RechargeTrend: React.FC<Props> = ({ visible, onClose, accountId, agentId,
                     dataIndex: 'd' + (index + 1),
                     key: 'd' + (index + 1),
                     align: 'center',
-                    width: 120,
+                    width,
                     render: (value1: any, value2: any) => {
                         return <Row gutter={[10, 0]} key={index} className={`${style.mytable_body_div} ${style.show}`} >
                             <Col style={{ color: '#3f51b5', fontWeight: 600 }} span={24} ><span>原：</span>
@@ -64,7 +65,8 @@ const RechargeTrend: React.FC<Props> = ({ visible, onClose, accountId, agentId,
                                     <div className="my_progrss">
                                         <span className='content'>{(value1?.rate * 100)?.toFixed(2) || '0.00'}%</span>
                                         <Progress
-                                            strokeColor="#82d0fa"
+                                            strokeColor="#d3adf7"
+                                            status="active"
                                             showInfo={false}
                                             style={{ height: 25 }}
                                             percent={(value1?.rate * 100) || 0}
@@ -87,7 +89,7 @@ const RechargeTrend: React.FC<Props> = ({ visible, onClose, accountId, agentId,
                         dataIndex: 'd' + (index + 1),
                         key: 'd' + (index + 1),
                         align: 'center',
-                        width: 120,
+                        width,
                         className: 'zdred',
                         render: () => {
                             return '--'

src/components/rechargeTrend/index_game.tsx

@@ -36,6 +36,7 @@ const RechargeTrendGame: React.FC<Props> = ({ visible, onClose, gameName, gameId
             let col: any[] = []
             let data: any[] = [{ count: '1', id: 1 }, { count: '2', id: 2 }, { count: '3', id: 3 }, { count: '4', id: 4 }, { count: '5', id: 5 }, { count: '5-10', id: 6 }, { count: '10-20', id: 7 }, { count: '20次以上', id: 8 }]
             let date: string = ''
+            let width = 90
             Object.keys(getGameDataAgainList?.data).forEach((key, index) => {
                 date = key
                 col.push({
@@ -43,37 +44,124 @@ const RechargeTrendGame: React.FC<Props> = ({ visible, onClose, gameName, gameId
                     dataIndex: 'd' + (index + 1),
                     key: 'd' + (index + 1),
                     align: 'center',
-                    width: 120,
-                    render: (value1: any, value2: any) => {
-                        return <Row gutter={[10, 0]} key={index} className={`${style.mytable_body_div} ${style.show}`} >
-                            <Col style={{ color: '#3f51b5', fontWeight: 600 }} span={24} ><span>原：</span>
-                                <Statistic value={value1?.original || 0} valueStyle={{ color: '#3f51b5', fontSize: 12, fontWeight: 600 }} />
-                            </Col>
-                            <Col style={{ color: '#ff9800', fontWeight: 600 }} span={24} ><span>现：</span>
-                                <Statistic value={value1?.present || 0} valueStyle={{ color: '#ff9800', fontSize: 12, fontWeight: 600 }} />
-                            </Col>
-                            <Col style={{ color: 'red', fontWeight: 600 }} span={24} ><span>增：</span>
-                                <Statistic value={value1?.increase || 0} valueStyle={{ color: 'red', fontSize: 12, fontWeight: 600 }} prefix={<RiseOutlined />} />
-                            </Col>
-                            <Col style={{ color: 'green', fontWeight: 600 }} span={24} ><span>移：</span>
-                                <Statistic value={value1?.decrease || 0} valueStyle={{ color: 'green', fontSize: 12, fontWeight: 600 }} prefix={<FallOutlined />} />
-                            </Col>
-                            <Col style={{ color: '#000', fontWeight: 600 }} span={24} >
-                                <div className={style.bitRate}>
-                                    <span>比：</span>
-                                    <div className="my_progrss">
-                                        <span className='content'>{(value1?.rate * 100)?.toFixed(2) || '0.00'}%</span>
-                                        <Progress
-                                            strokeColor="#82d0fa"
-                                            showInfo={false}
-                                            style={{ height: 25 }}
-                                            percent={(value1?.rate * 100) || 0}
-                                        />
+                    children: [{
+                        title: '买量',
+                        dataIndex: 'm' + (index + 1),
+                        key: 'm' + (index + 1),
+                        align: 'center',
+                        width,
+                        className: index % 2 === 0 ? 'color001' : 'color002',
+                        render: (value: any, value2: any) => {
+                            let value1 = value2?.['d' + (index + 1)]
+                            return <Row gutter={[10, 0]} key={index} className={`${style.mytable_body_div} ${style.show}`} >
+                                <Col style={{ color: '#3f51b5', fontWeight: 600 }} span={24} ><span>原：</span>
+                                    <Statistic value={value1?.buyOriginal || 0} valueStyle={{ color: '#3f51b5', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: '#ff9800', fontWeight: 600 }} span={24} ><span>现：</span>
+                                    <Statistic value={value1?.buyPresent || 0} valueStyle={{ color: '#ff9800', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: 'red', fontWeight: 600 }} span={24} ><span>增：</span>
+                                    <Statistic value={value1?.buyIncrease || 0} valueStyle={{ color: 'red', fontSize: 12, fontWeight: 600 }} prefix={<RiseOutlined />} />
+                                </Col>
+                                <Col style={{ color: 'green', fontWeight: 600 }} span={24} ><span>移：</span>
+                                    <Statistic value={value1?.buyDecrease || 0} valueStyle={{ color: 'green', fontSize: 12, fontWeight: 600 }} prefix={<FallOutlined />} />
+                                </Col>
+                                <Col style={{ color: '#000', fontWeight: 600 }} span={24} >
+                                    <div className={style.bitRate}>
+                                        <span>比：</span>
+                                        <div className="my_progrss">
+                                            <span className='content'>{(value1?.buyRate * 100)?.toFixed(2) || '0.00'}%</span>
+                                            <Progress
+                                                strokeColor="#85a5ff"
+                                                status="active"
+                                                showInfo={false}
+                                                style={{ height: 25 }}
+                                                percent={(value1?.buyRate * 100) || 0}
+                                            />
+                                        </div>
+                                    </div>
+                                </Col>
+                            </Row>
+                        }
+                    }, {
+                        title: '自然量',
+                        dataIndex: 'n' + (index + 1),
+                        key: 'n' + (index + 1),
+                        align: 'center',
+                        width,
+                        className: index % 2 === 0 ? 'color001' : 'color002',
+                        render: (value: any, value2: any) => {
+                            let value1 = value2?.['d' + (index + 1)]
+                            return <Row gutter={[10, 0]} key={index} className={`${style.mytable_body_div} ${style.show}`} >
+                                <Col style={{ color: '#3f51b5', fontWeight: 600 }} span={24} ><span>原：</span>
+                                    <Statistic value={value1?.natureOriginal || 0} valueStyle={{ color: '#3f51b5', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: '#ff9800', fontWeight: 600 }} span={24} ><span>现：</span>
+                                    <Statistic value={value1?.naturePresent || 0} valueStyle={{ color: '#ff9800', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: 'red', fontWeight: 600 }} span={24} ><span>增：</span>
+                                    <Statistic value={value1?.natureIncrease || 0} valueStyle={{ color: 'red', fontSize: 12, fontWeight: 600 }} prefix={<RiseOutlined />} />
+                                </Col>
+                                <Col style={{ color: 'green', fontWeight: 600 }} span={24} ><span>移：</span>
+                                    <Statistic value={value1?.natureDecrease || 0} valueStyle={{ color: 'green', fontSize: 12, fontWeight: 600 }} prefix={<FallOutlined />} />
+                                </Col>
+                                <Col style={{ color: '#000', fontWeight: 600 }} span={24} >
+                                    <div className={style.bitRate}>
+                                        <span>比：</span>
+                                        <div className="my_progrss">
+                                            <span className='content'>{(value1?.natureRate * 100)?.toFixed(2) || '0.00'}%</span>
+                                            <Progress
+                                                strokeColor="#95de64"
+                                                status="active"
+                                                showInfo={false}
+                                                style={{ height: 25 }}
+                                                percent={(value1?.natureRate * 100) || 0}
+                                            />
+                                        </div>
                                     </div>
-                                </div>
-                            </Col>
-                        </Row>
-                    }
+                                </Col>
+                            </Row>
+                        }
+                    }, {
+                        title: '总量',
+                        dataIndex: 'z' + (index + 1),
+                        key: 'z' + (index + 1),
+                        align: 'center',
+                        width,
+                        className: index % 2 === 0 ? 'color001' : 'color002',
+                        render: (value: any, value2: any) => {
+                            let value1 = value2?.['d' + (index + 1)]
+                            return <Row gutter={[10, 0]} key={index} className={`${style.mytable_body_div} ${style.show}`} >
+                                <Col style={{ color: '#3f51b5', fontWeight: 600 }} span={24} ><span>原：</span>
+                                    <Statistic value={value1?.original || 0} valueStyle={{ color: '#3f51b5', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: '#ff9800', fontWeight: 600 }} span={24} ><span>现：</span>
+                                    <Statistic value={value1?.present || 0} valueStyle={{ color: '#ff9800', fontSize: 12, fontWeight: 600 }} />
+                                </Col>
+                                <Col style={{ color: 'red', fontWeight: 600 }} span={24} ><span>增：</span>
+                                    <Statistic value={value1?.increase || 0} valueStyle={{ color: 'red', fontSize: 12, fontWeight: 600 }} prefix={<RiseOutlined />} />
+                                </Col>
+                                <Col style={{ color: 'green', fontWeight: 600 }} span={24} ><span>移：</span>
+                                    <Statistic value={value1?.decrease || 0} valueStyle={{ color: 'green', fontSize: 12, fontWeight: 600 }} prefix={<FallOutlined />} />
+                                </Col>
+                                <Col style={{ color: '#000', fontWeight: 600 }} span={24} >
+                                    <div className={style.bitRate}>
+                                        <span>比：</span>
+                                        <div className="my_progrss">
+                                            <span className='content'>{(value1?.rate * 100)?.toFixed(2) || '0.00'}%</span>
+                                            <Progress
+                                                strokeColor="#d3adf7"
+                                                status="active"
+                                                showInfo={false}
+                                                style={{ height: 25 }}
+                                                percent={(value1?.rate * 100) || 0}
+                                            />
+                                        </div>
+                                    </div>
+                                </Col>
+                            </Row>
+                        }
+                    }]
                 })
                 getGameDataAgainList?.data[key]?.forEach((item: any, eq: number) => {
                     data[eq][`d${index + 1}`] = item
@@ -87,7 +175,7 @@ const RechargeTrendGame: React.FC<Props> = ({ visible, onClose, gameName, gameId
                         dataIndex: 'd' + (index + 1),
                         key: 'd' + (index + 1),
                         align: 'center',
-                        width: 120,
+                        width: 100,
                         className: 'zdred',
                         render: () => {
                             return '--'
@@ -106,7 +194,6 @@ const RechargeTrendGame: React.FC<Props> = ({ visible, onClose, gameName, gameId
                 ...col,
                 ...nullCol
             ]
-            console.log('columns--->', columns, data)
             return <Table columns={columns} scroll={{ x: 1000, y: 700 }} className="sumTable" rowKey={'id'} size="small" dataSource={data} bordered pagination={false} />
         } else {
             return <Empty />

src/pages/gameDataStatistics/rankingList/account/index.tsx

@@ -4,7 +4,6 @@ import columns12 from "./tableConfig"
 import { useAjax } from "@/Hook/useAjax"
 import { AccountProps, getAccountRechargeRankingListApi } from "@/services/gameData/rankingList"
 import QueryForm from "@/components/QueryForm"
-import moment from "moment"
 import { rangePresets } from "@/components/QueryForm/const"