fix

src/pages/gameDataStatistics/adlist/monitor/index.tsx

@@ -12,7 +12,7 @@ import DayAd from "./dayAd"
 const Monitor = () => {
 
     /***************************************/
-    const [queryForm, setQueryForm] = useState<PromotionDataDay>({ pageNum: 1, pageSize: 100, sourceSystem: 'ZX_ONE', costBeginDate: moment().format('YYYY-MM-DD'), costEndDate: moment().format('YYYY-MM-DD') })
+    const [queryForm, setQueryForm] = useState<PromotionDataDay>({ pageNum: 1, pageSize: 50, sourceSystem: 'ZX_ONE', costBeginDate: moment().format('YYYY-MM-DD'), costEndDate: moment().format('YYYY-MM-DD') })
     const [totalData, setTotalData] = useState<any[]>([])
     const [visible, setVisible] = useState<boolean>(false)
     const [promotionId, setPromotionId] = useState<number>()

src/pages/gameDataStatistics/adlist/monitor/tableConfig.tsx

@@ -236,7 +236,7 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
                     render: (a: any) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '首次付费率(广告)', dataIndex: 'firstActivePayRate', label: '广告媒体端数据', align: 'center', className: "adDataBackColorClass", width: 70, sorter: true, default: 21,
+                    title: '首次付费率(广告)', dataIndex: 'firstActivePayRate', label: '广告媒体端数据', align: 'center', className: "adDataBackColorClass", width: 80, sorter: true, default: 21,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
@@ -396,6 +396,30 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
                     title: '7日ARPU', dataIndex: 'day7Arpu', label: '付费数据', align: 'center', width: 70, sorter: true, className: 'payDataBackColorClass',
                     render: (a: any) => <Statistic value={a || 0} />
                 },
+                {
+                    title: '7日付费100+用户数', dataIndex: 'day7OneHundredAmountNum', label: '付费数据', align: 'center', width: 75, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费100+用户付费成本', dataIndex: 'day7OneHundredAmountNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费200+用户数', dataIndex: 'day7TwoHundredAmountNum', label: '付费数据', align: 'center', width: 75, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费200+用户付费成本', dataIndex: 'day7TwoHundredAmountNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '至今付费200+用户数', dataIndex: 'newUserTwoHundredUserNum', label: '付费数据', align: 'center', width: 85, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '至今付费200+用户付费成本', dataIndex: 'newUserTwoHundredUserNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
                 {
                     title: '总充值次数', dataIndex: 'totalAmountCount', label: '付费数据', align: 'center', width: 50, className: 'payDataBackColorClass', sorter: true,
                     render: (a: any) => <Statistic value={a || 0} />

src/pages/gameDataStatistics/adlist/monitor/tableConfigDay.tsx

@@ -529,6 +529,30 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '至今付费次数成本', dataIndex: 'newUserTotalAmountCountCost', label: '付费数据', align: 'center', width: 70, sorter: true, className: 'payDataBackColorClass',
                     render: (a: any) => <Statistic value={a || 0} />
                 },
+                {
+                    title: '7日付费100+用户数', dataIndex: 'day7OneHundredAmountNum', label: '付费数据', align: 'center', width: 75, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费100+用户付费成本', dataIndex: 'day7OneHundredAmountNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费200+用户数', dataIndex: 'day7TwoHundredAmountNum', label: '付费数据', align: 'center', width: 75, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '7日付费200+用户付费成本', dataIndex: 'day7TwoHundredAmountNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '至今付费200+用户数', dataIndex: 'newUserTwoHundredUserNum', label: '付费数据', align: 'center', width: 85, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '至今付费200+用户付费成本', dataIndex: 'newUserTwoHundredUserNumCost', label: '付费数据', align: 'center', width: 90, sorter: true, className: 'payDataBackColorClass',
+                    render: (a: any) => <Statistic value={a || 0} />
+                },
                 ...date
             ]
         }

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/msgPushModal.tsx

@@ -121,7 +121,7 @@ const MsgPushModal: React.FC<Props> = ({ visible, onClose, onChange, roleRecharg
                 </Form.Item>
             </> : null} */}
             <Form.Item
-                label={<strong>群发内容</strong>}
+                label={<strong>群发内容 <span style={{ color: 'red' }}>禁止使用下划线</span></strong>}
                 name='sendContent'
                 rules={[{ required: true, message: '请输入文本内容' }]}
             >

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -651,8 +651,8 @@ export const columnsMsgTask = (sendLog: (data: any) => void) => {
         },
         {
             title: '创建人',
-            dataIndex: 'createName',
-            key: 'createName',
+            dataIndex: 'createByName',
+            key: 'createByName',
             width: 60,
             align: 'center',
             ellipsis: true

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/taskList.tsx

@@ -32,7 +32,7 @@ const TaskList: React.FC<Props> = ({ sourceSystem }) => {
     /****************************/
 
     useEffect(() => {
-        if (gameId && visible) {
+        if (visible) {
             getSendMsgTaskList.run({ ...queryForm, gameId })
         }
     }, [queryForm, gameId, visible])
@@ -49,7 +49,6 @@ const TaskList: React.FC<Props> = ({ sourceSystem }) => {
             getGameListNew.run({ sourceSystem }).then(res => {
                 const { parentGameList } = res
                 setGameList(parentGameList?.map((item: { parent_game_id: any; parent_game_name: any }) => ({ id: item.parent_game_id, name: item.parent_game_name })) || [])
-                setGameId(parentGameList?.[0]?.parent_game_id)
             })
         } else {
             message.error('请选择数据源')
@@ -77,6 +76,7 @@ const TaskList: React.FC<Props> = ({ sourceSystem }) => {
                     filterOption={(input, option) =>
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }
+                    allowClear
                     value={gameId}
                     onChange={(e) => setGameId(e)}
                 >