fix

src/pages/iaaData/novel/tencent/appPayTrend/index.less

@@ -20,7 +20,7 @@
     >span {
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content:left;
         width: 100%
     }
 }

src/pages/iaaData/novel/tencent/appPayTrend/tableConfig.tsx

@@ -13,49 +13,31 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
 
         const dataIndex = `da${index}`
         return {
-            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, width: 300, children: [
-                {
-                    title: "",
-                    key: "left" + index,
-                    width: 150,
-                    align: 'center',
-                    render: (_: any, b: any) => {
-                        if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
-                            const data = b?.[dataIndex]?.split('/')
-                            return <div className={style.newbox} >
-                                <span style={{ color: '#F44336', fontWeight: 600, }}>变现人数：<span><Statistic value={data?.[0] || 0} /></span></span>
-                                <span style={{ color: '#FF9800', fontWeight: 600, }}>变现次数：<span><Statistic value={data?.[1] || 0} /></span></span>
-                                <span style={{ color: '#d81b60', fontWeight: 600, }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
-                                <span style={{ color: '#0f538a', fontWeight: 600, }}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
-                                {index < 8 && <span style={{ color: '#ed2a78', fontWeight: 600, }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>}
-
+            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, with: 250,
+               render: (_: any, b: any) => {
+                if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
+                    const data = b?.[dataIndex]?.split('/')
+                    return <div style={{ display: "grid", gridTemplateColumns: '1fr 1fr' }}>
+                        <div className={style.newbox} >
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>人数：<span><Statistic value={data?.[0] || 0} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>次数：<span><Statistic value={data?.[1] || 0} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>新收：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>累收：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
+                            {index < 8 && <span style={{ color: '#0f538a', fontWeight: 600 }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} valueStyle={{color:'#e41d35'}}/></span></span>}
+                        </div>
+                        <div className={style.newbox}>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPU：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPPU：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
+                        </div>
+                    </div>
 
-                            </div>
-                        }
-                        return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
-                    }
-                },
-                {
-                    title: "",
-                    key: "right" + index,
-                    width: 150,
-                    align: 'center',
-                    render: (_: any, b: any) => {
-                        if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
-                            const data = b?.[dataIndex]?.split('/')
-                            return <div className={style.newbox}>
-                                <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPU：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
-                                <span style={{ color: '#2196F3', fontWeight: 600, }}>ARPPU<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
-                                <span style={{ color: 'rgb(12,130,16)', fontWeight: 600, }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                                <span style={{ color: '#ff5722', fontWeight: 600, }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                                <span style={{ color: '#d81b60', fontWeight: 600, }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
+                }
+                return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
+            }
 
-                            </div>
-                        }
-                        return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
-                    }
-                },
-            ]
         }
     })
 

src/pages/iaaData/novel/tencent/pitcherPayTrend/index.less

@@ -21,7 +21,7 @@
     >span {
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content: left;
         width: 100%
     }
 }

src/pages/iaaData/novel/tencent/pitcherPayTrend/tableConfig.tsx

@@ -13,50 +13,30 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
 
         const dataIndex = `da${index}`
         return {
-            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, width: 300, children: [
-                {
-                    title: "",
-                    key: "left" + index,
-                    width: 150,
-                    align: 'center',
-                    render: (_: any, b: any) => {
-                        if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
-                            const data = b?.[dataIndex]?.split('/')
-                            return <div className={` ${style.newbox}`} >
-                                <span style={{ color: '#F44336', fontWeight: 600, }}>变现人数：<span><Statistic value={data?.[0] || 0} /></span></span>
-                                <span style={{ color: '#FF9800', fontWeight: 600, }}>变现次数：<span><Statistic value={data?.[1] || 0} /></span></span>
-                                <span style={{ color: '#d81b60', fontWeight: 600, }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
-                                <span style={{ color: '#0f538a', fontWeight: 600,}}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
-                                {index < 8 && <span style={{ color: '#ed2a78', fontWeight: 600}}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>}
-
-
-                            </div>
-                        }
-                        return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
-                    }
-                },
-                {
-                    title: "",
-                    key: "right" + index,
-                    width: 150,
-                    align: 'center',
-                    render: (_: any, b: any) => {
-                        if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
-                            const data = b?.[dataIndex]?.split('/')
-                            return <div className={style.newbox}>
-                                <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPU：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
-                                <span style={{ color: '#2196F3', fontWeight: 600, }}>ARPPU<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
-                                <span style={{ color: 'rgb(12,130,16)', fontWeight: 600,  }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                                <span style={{ color: '#ff5722', fontWeight: 600,}}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                                <span style={{ color: '#d81b60', fontWeight: 600, }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
-
-                            </div>
-                        }
-                        return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
-                    }
-                },
-            ]
+            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, width: 250,
+            render: (_: any, b: any) => {
+                if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
+                    const data = b?.[dataIndex]?.split('/')
+                    return <div style={{ display: "grid", gridTemplateColumns: '1fr 1fr' }}>
+                        <div className={style.newbox} >
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>人数：<span><Statistic value={data?.[0] || 0} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>次数：<span><Statistic value={data?.[1] || 0} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>新收：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#0f538a', fontWeight: 600, }}>累收：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
+                            {index < 8 && <span style={{ color: '#0f538a', fontWeight: 600 }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} valueStyle={{ color: '#e41d35' }} /></span></span>}
+                        </div>
+                        <div className={style.newbox}>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPU：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>ARPPU：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                            <span style={{ color: '#9C27B0', fontWeight: 600, }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
+                        </div>
+                    </div>
 
+                }
+                return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
+            }
         }
     })