fix

src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -26,7 +26,6 @@ const AllSurvey: React.FC = () => {
 
     const [leftShow, setLeftShow] = useState<boolean>(false)
     const [rightShow, setRightShow] = useState<boolean>(false)
-    const [isPass, setIsPass] = useState<boolean>(false)  // 容器是否大于内容宽度
     const [queryForm, setQueryForm] = useState<AllSurveyTotalDataProps>({ sourceSystem: 'ZX_ONE' })
     const [totalData, setTotalData] = useState<any>({})
     /* ==================== */
@@ -42,9 +41,7 @@ const AllSurvey: React.FC = () => {
             if (width >= 1960) { // 容器大于内容宽度 兼容
                 setLeftShow(false)
                 setRightShow(false)
-                setIsPass(true)
             } else {
-                setIsPass(false)
                 if (left === 0) {
                     setLeftShow(false)
                 } else {

src/pages/gameDataStatistics/extensionData/everyday/tableConfig.tsx

@@ -56,7 +56,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                 { title: '推广游戏CP名称', dataIndex: 'cpName', key: 'cpName', label: '推广内容信息', align: 'center', width: 70, default: 5, render: (a: any) => (<span>{a || '--'}</span>) },
                 { title: '推广游戏名称', dataIndex: 'gameName', key: 'gameName', label: '推广内容信息', align: 'center', width: 70, default: 6, render: (a: any) => (<span>{a || '--'}</span>) },
                 {
-                    title: '推广游戏应用类型', dataIndex: 'gameType', key: 'gameType', label: '推广内容信息', align: 'center', width: 80, default: 7, 
+                    title: '推广游戏应用类型', dataIndex: 'gameType', key: 'gameType', label: '推广内容信息', align: 'center', width: 80, default: 7,
                     render: (a: string) => (<span>{gameClassifyEnum[a]}</span>)
                 },
             ]
@@ -271,12 +271,40 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                     }
                     return '--'
                 },
+            }, {
+                title: "D5",
+                dataIndex: "D5",
+                label: "时间区间跨度",
+                width: 110,
+                default: 22,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.rechargeTrendDay5) {
+                                    data = b?.rechargeTrendDay5
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('addPayBack') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('payBack') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('payBack') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "D7",
                 dataIndex: "D7",
                 label: "时间区间跨度",
                 width: 110,
-                default: 22,
+                default: 23,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -304,7 +332,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                 dataIndex: "D15",
                 label: "时间区间跨度",
                 width: 110,
-                default: 23,
+                default: 24,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -332,7 +360,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                 dataIndex: "M1",
                 label: "时间区间跨度",
                 width: 110,
-                default: 24,
+                default: 25,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -360,7 +388,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                 dataIndex: "M2",
                 label: "时间区间跨度",
                 width: 110,
-                default: 25,
+                default: 26,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -388,7 +416,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                 dataIndex: "M3",
                 label: "时间区间跨度",
                 width: 110,
-                default: 26,
+                default: 27,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -411,9 +439,37 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
                     }
                     return '--'
                 },
+            }, {
+                title: "M6",
+                dataIndex: "M6",
+                label: "时间区间跨度",
+                width: 110,
+                default: 28,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.rechargeTrendMonth6) {
+                                    data = b?.rechargeTrendMonth6
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('addPayBack') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('payBack') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('payBack') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "总",
-                default: 27,
+                default: 29,
                 dataIndex: "total",
                 label: "时间区间跨度",
                 align: "center",
@@ -446,7 +502,7 @@ function columns12(gameType: any, rechargeTrendHandle: (data: any) => void): { l
             label: '操作',
             data: [
                 {
-                    default: 28,
+                    default: 30,
                     title: '操作', dataIndex: 'cz', label: '操作', align: 'center', width: 70, render: (a: string, b: any) => {
                         return <a onClick={() => rechargeTrendHandle(b)}>复充趋势</a>
                     }

src/pages/gameDataStatistics/gameData/everyday/tableConfig.tsx

@@ -360,13 +360,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            }, {
+                title: "D5（买）",
+                dataIndex: "D5Buy",
+                label: "买量付费趋势",
+                align: "center",
+                width: 110,
+                default: 33,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.buyAmountD5Trend) {
+                                    data = b?.buyAmountD5Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "D7（买）",
                 dataIndex: "D7Buy",
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 33,
+                default: 34,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -395,7 +424,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 34,
+                default: 35,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -424,7 +453,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 35,
+                default: 36,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -453,7 +482,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 36,
+                default: 37,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -482,7 +511,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 37,
+                default: 38,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -505,13 +534,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            }, {
+                title: "M6（买）",
+                dataIndex: "M6Buy",
+                label: "买量付费趋势",
+                align: "center",
+                width: 110,
+                default: 39,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.buyAmountM6Trend) {
+                                    data = b?.buyAmountM6Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "总（买）",
                 dataIndex: "totalBuy",
                 label: "买量付费趋势",
                 align: "center",
                 width: 110,
-                default: 38,
+                default: 40,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -544,7 +602,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 39,
+                default: 41,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -573,7 +631,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 40,
+                default: 42,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -596,13 +654,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            }, {
+                title: "D5（自）",
+                dataIndex: "D5Nature",
+                label: "自然量付费趋势",
+                align: "center",
+                width: 110,
+                default: 43,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.natureAmountD5Trend) {
+                                    data = b?.natureAmountD5Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "D7（自）",
                 dataIndex: "D7Nature",
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 41,
+                default: 44,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -631,7 +718,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 42,
+                default: 45,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -660,7 +747,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 43,
+                default: 46,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -689,7 +776,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 44,
+                default: 47,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -718,7 +805,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 45,
+                default: 48,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -741,13 +828,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            }, {
+                title: "M6（自）",
+                dataIndex: "M6Nature",
+                label: "自然量付费趋势",
+                align: "center",
+                width: 110,
+                default: 49,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.natureAmountM6Trend) {
+                                    data = b?.natureAmountM6Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "总（自）",
                 dataIndex: "totalNature",
                 label: "自然量付费趋势",
                 align: "center",
                 width: 110,
-                default: 46,
+                default: 50,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -780,7 +896,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 47,
+                default: 51,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -809,7 +925,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 48,
+                default: 52,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -832,13 +948,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            }, {
+                title: "D5（总）",
+                dataIndex: "D5",
+                label: "总付费趋势",
+                align: "center",
+                width: 110,
+                default: 53,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.amountD5Trend) {
+                                    data = b?.amountD5Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "D7（总）",
                 dataIndex: "D7",
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 49,
+                default: 54,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -867,7 +1012,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 50,
+                default: 55,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -896,7 +1041,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 51,
+                default: 56,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -925,7 +1070,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 52,
+                default: 57,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -954,7 +1099,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 53,
+                default: 58,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -977,13 +1122,42 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     }
                     return '--'
                 },
+            },  {
+                title: "M6（总）",
+                dataIndex: "M6",
+                label: "总付费趋势",
+                align: "center",
+                width: 110,
+                default: 59,
+                render: (a: any, b: any) => {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
+                        let data: any = {}
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
+                            case '付费趋势':
+                                if (b?.amountM6Trend) {
+                                    data = b?.amountM6Trend
+                                    return <div className={style.dbox}>
+                                        {keyS?.includes('rechargeUserCount') && <span style={{ color: '#d81b60', fontWeight: 600 }}>充人：<span>{data?.rechargeUserCount}</span></span>}
+                                        {keyS?.includes('rechargeMoney') && <span style={{ color: '#0f538a', fontWeight: 600 }}>充金：<span><Statistic value={data?.rechargeMoney || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('increase') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>增：<span>{(data?.increase * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('back') && <span style={{ color: '#ff5722', fontWeight: 600 }}>回：<span>{(data?.back * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('multiples') && <span style={{ color: '#d81b60', fontWeight: 600 }}>倍：<span>{data?.multiples}</span></span>}
+                                    </div>
+                                }
+                                return '--'
+                        }
+                    }
+                    return '--'
+                },
             }, {
                 title: "总（总）",
                 dataIndex: "total",
                 label: "总付费趋势",
                 align: "center",
                 width: 110,
-                default: 54,
+                default: 60,
                 render: (a: any, b: any) => {
                     let fieldData = getFieldDta()
                     if (fieldData?.length > 0) {
@@ -1015,7 +1189,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     title: '操作',
                     dataIndex: 'cz',
                     label: '操作',
-                    default: 55,
+                    default: 61,
                     align: 'center',
                     width: 75,
                     render: (a: number, b: any) => {

src/pages/gameDataStatistics/gameData/flowingWater/tableConfig.tsx

@@ -53,21 +53,21 @@ function columns12() {
                             }
                         },
                         {
-                            title: '充值次数',
-                            dataIndex: 'amountCount',
-                            key: 'amountCount',
+                            title: '充值挡位',
+                            dataIndex: 'amountPost',
+                            key: 'amountPost',
                             width: 65,
                             align: 'center',
                             className: "h5BiomassClass",
                             render: (a: any, b: any) => {
                                 return <div className='h5BiomassTable'>
                                     {b?.rechargeTemplateVOList?.map((item: any, index: number) => {
-                                        return <div key={'dd' + index}>
-                                            <div><Statistic value={item?.amountCount} valueStyle={item.amountCount >= 10 ? { color: 'red' } : { color: '#0f990f' }} groupSeparator="" /></div>
+                                        return <div key={'aa' + index}>
+                                            <div><span>{item.amountPost || '--'}</span></div>
                                         </div>
                                     })}
                                     {b?.rechargeTemplateVOList?.length < 10 && <>
-                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('d').map((item, index) => {
+                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('a').map((item, index) => {
                                             return <div key={item + index}>
                                                 <div><span>--</span></div>
                                             </div>
@@ -77,52 +77,52 @@ function columns12() {
                             }
                         },
                         {
-                            title: '充值人数',
-                            dataIndex: 'amountNum',
-                            key: 'amountNum',
+                            title: '充值次数',
+                            dataIndex: 'amountCount',
+                            key: 'amountCount',
                             width: 65,
                             align: 'center',
                             className: "h5BiomassClass",
                             render: (a: any, b: any) => {
                                 return <div className='h5BiomassTable'>
                                     {b?.rechargeTemplateVOList?.map((item: any, index: number) => {
-                                        return <div key={'bb' + index}>
-                                            <div><Statistic value={item?.amountNum} valueStyle={item?.amountNum >= 30 ? { color: 'red' } : { color: '#0f990f' }} groupSeparator="" /></div>
+                                        return <div key={'dd' + index}>
+                                            <div><Statistic value={item?.amountCount || 0} valueStyle={item.amountCount >= 10 ? { color: 'red' } : { color: '#0f990f' }} groupSeparator="" /></div>
                                         </div>
                                     })}
                                     {b?.rechargeTemplateVOList?.length < 10 && <>
-                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('b').map((item, index) => {
+                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('d').map((item, index) => {
                                             return <div key={item + index}>
                                                 <div><span>--</span></div>
                                             </div>
                                         })}
                                     </>}
                                 </div>
-
                             }
                         },
                         {
-                            title: '充值挡位',
-                            dataIndex: 'amountPost',
-                            key: 'amountPost',
+                            title: '充值人数',
+                            dataIndex: 'amountNum',
+                            key: 'amountNum',
                             width: 65,
                             align: 'center',
                             className: "h5BiomassClass",
                             render: (a: any, b: any) => {
                                 return <div className='h5BiomassTable'>
                                     {b?.rechargeTemplateVOList?.map((item: any, index: number) => {
-                                        return <div key={'aa' + index}>
-                                            <div><span>{item.amountPost}</span></div>
+                                        return <div key={'bb' + index}>
+                                            <div><Statistic value={item?.amountNum || 0} valueStyle={item?.amountNum >= 30 ? { color: 'red' } : { color: '#0f990f' }} groupSeparator="" /></div>
                                         </div>
                                     })}
                                     {b?.rechargeTemplateVOList?.length < 10 && <>
-                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('a').map((item, index) => {
+                                        {Array(10 - b?.rechargeTemplateVOList?.length).fill('b').map((item, index) => {
                                             return <div key={item + index}>
                                                 <div><span>--</span></div>
                                             </div>
                                         })}
                                     </>}
                                 </div>
+
                             }
                         }
                     ]

src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -1,6 +1,6 @@
 import { PayStatus, gameClassifyEnum } from "@/components/QueryForm/const"
 import WidthEllipsis from "@/components/widthEllipsis"
-import { Badge, Statistic } from "antd"
+import { Statistic } from "antd"
 import React from "react"