fix

src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -174,7 +174,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: isBg() ? 320 + 200 + badWidth : 320 + badWidth }}>
+                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: isBg() ? 320 + 200 + badWidth : 320 + 40 + badWidth }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#f4516c' }}>
                                         <MoneyCollectOutlined style={{ fontSize: 24 }} />

src/pages/gsData/rolePayRetained/index.tsx

@@ -1,5 +1,5 @@
 import { useAjax } from "@/Hook/useAjax"
-import { getRolePayRetainedApi, GetRolePayRetainedProps } from "@/services/gsData"
+import { getRolePayRetainedApi, GetRolePayRetainedProps, getRolePayRetainedTotalApi } from "@/services/gsData"
 import React, { useEffect, useState } from "react"
 import moment from "moment"
 import TablePro from "@/pages/gameDataStatistics/components/TablePro"
@@ -20,11 +20,20 @@ const RolePayRetained: React.FC = () => {
         dtBegin: moment().format('YYYY-MM-DD'),
         dtEnd: moment().format('YYYY-MM-DD')
     })
+    const [totalData, setTotalData] = useState<any[]>([])
+
+    const getRolePayRetainedTotal = useAjax((params) => getRolePayRetainedTotalApi(params))
     const getRolePayRetained = useAjax((params) => getRolePayRetainedApi(params))
     /***************************************/
 
     useEffect(() => {
         getRolePayRetained.run(queryForm)
+        getRolePayRetainedTotal.run(queryForm).then((res: { id: number; gsName: string, beginDay?: string }) => {
+            res.id = 1
+            res.gsName = '总计'
+            res.beginDay = queryForm.dtBegin || moment().subtract(366, 'days').format('YYYY-MM-DD')
+            setTotalData([res])
+        })
     }, [queryForm])
 
     return <div>
@@ -50,6 +59,8 @@ const RolePayRetained: React.FC = () => {
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
             />}
+            isZj
+            totalData={totalData}
             config={columns12()}
             configName={'GS角色付费留存'}
             fixed={{ left: 4, right: 0 }}

src/pages/gsData/rolePayRetained/tableConfig.tsx

@@ -29,7 +29,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 }
                 let dt = moment()
                 let day = dt.diff(date1, 'day');
-                if (index <= day) {
+                if (index <= day && b?.[field]) {
                     let [count1, count2, count3, count4, count5, count6, count7] = b?.[field]?.split('/')
                     return <div className={style.dbox}>
                         <span style={{ color: '#52c41a', fontWeight: 600 }}>活跃人数：<span>{count1}</span></span>
@@ -69,7 +69,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 }
                 let dt = moment()
                 let day = dt.diff(date1, 'day');
-                if (index <= day) {
+                if (index <= day && b?.[field]) {
                     let [count1, count2, count3, count4, count5, count6, count7] = b?.[field]?.split('/')
                     return <div className={style.dbox}>
                         <span style={{ color: '#52c41a', fontWeight: 600 }}>活跃人数：<span>{count1}</span></span>
@@ -98,7 +98,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '服务开始时间', dataIndex: 'dt', label: '基本信息', align: 'center', width: 90, default: 2,
-                    render: (a: string) => (<WidthEllipsis value={`${a}`} />)
+                    render: (a: string) => (<WidthEllipsis value={`${a || '--'}`} />)
                 },
                 {
                     title: '至今服务天数', dataIndex: 'dtDiff', label: '基本信息', align: 'center', width: 45, default: 3,

src/services/gsData/index.ts

@@ -51,4 +51,16 @@ export async function getRolePayRetainedApi(data: GetRolePayRetainedProps) {
         method: 'POST',
         data
     });
+}
+
+/**
+ * 总计
+ * @param data 
+ * @returns 
+ */
+export async function getRolePayRetainedTotalApi(data: GetRolePayRetainedProps) {
+    return request(wapi + `/game/parent/role/pay/retained/total`, {
+        method: 'POST',
+        data
+    });
 }