fix

src/components/QueryForm/index.tsx

@@ -216,6 +216,7 @@ interface Props {
     isRemoveGame?: boolean
     /** 是否开启 是否退游系统 搜索 */
     isRemoveGameForSystem?: boolean
+    isOrderLy?: boolean
 }
 /**
  * 游戏数据系统 请求参数
@@ -229,7 +230,7 @@ const QueryForm: React.FC<Props> = (props) => {
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
-        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem
+        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem, isOrderLy
     } = props
     const [form] = Form.useForm()
     const parentId = Form.useWatch('parentId', form)
@@ -498,6 +499,21 @@ const QueryForm: React.FC<Props> = (props) => {
                     <Select.Option value="total">总量</Select.Option>
                 </Select>
             </Form.Item></Col>}
+            {/* 订单渠道类型 */}
+            {isOrderLy && <Col><Form.Item name='orderAgentType'>
+                <Select
+                    showSearch
+                    style={{ width: 130 }}
+                    allowClear
+                    placeholder={'订单渠道类型'}
+                    filterOption={(input, option) =>
+                        (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                >
+                    <Select.Option value="buy">买量</Select.Option>
+                    <Select.Option value="nature">自然量</Select.Option>
+                </Select>
+            </Form.Item></Col>}
             {isActiveTypes && <Col><Form.Item name='activeTypes'>
                 <Select
                     showSearch
@@ -723,7 +739,7 @@ const QueryForm: React.FC<Props> = (props) => {
                     showSearch
                     style={{ minWidth: 140 }}
                     allowClear
-                    loading={getGameListNew.loading || getGameChoiceList.loading}
+                    loading={getGameListNew.loading || getGameChoiceList.loading }
                     placeholder={'请选择游戏'}
                     filterOption={(input, option) =>
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0

src/components/widthEllipsis/index.tsx

@@ -1,4 +1,4 @@
-import { Tooltip } from "antd"
+import { Tooltip, Typography } from "antd"
 import React, { useEffect, useRef, useState } from "react"
 import style from './index.less'
 import { copy } from "@/utils/utils"
@@ -15,29 +15,30 @@ const WidthEllipsis: React.FC<Props> = (props) => {
 
     /*********************************/
     const { value, isCopy } = props
-    const ref: any = useRef(null)
-    const ref1: any = useRef(null)
-    const [data, setData] = useState<{ visible?: boolean }>({})
-    /*********************************/
+    // const ref: any = useRef(null)
+    // const ref1: any = useRef(null)
+    // const [data, setData] = useState<{ visible?: boolean }>({})
+    // /*********************************/
 
-    useEffect(() => {
-        // 容器宽度
-        let width = ref.current.clientWidth
-        // 文字实际宽度
-        let actualWidth = ref1.current.childNodes[0].getBoundingClientRect().width
-        if (actualWidth > width) {
-            setData({})
-        } else {
-            setData({ visible: false })
-        }
-    }, [ref, ref1])
+    // useEffect(() => {
+    //     // 容器宽度
+    //     let width = ref.current.clientWidth
+    //     // 文字实际宽度
+    //     let actualWidth = ref1.current.childNodes[0].getBoundingClientRect().width
+    //     if (actualWidth > width) {
+    //         setData({})
+    //     } else {
+    //         setData({ visible: false })
+    //     }
+    // }, [ref, ref1])
 
-    return <Tooltip title={value} {...data}>
-        <div className={style.myEll}>
-            <div ref={ref} className="ellipsisOne" style={isCopy ? { color: '#1890ff' } : {}} onClick={() => { if(isCopy) copy((value || '') as any) }}>{value || '--'}</div>
-            <div ref={ref1} className={style.hiddenCon}><span>{value}</span></div>
-        </div>
-    </Tooltip>
+    // return <Tooltip title={value} {...data}>
+    //     <div className={style.myEll}>
+    //         <div ref={ref} className="ellipsisOne" style={isCopy ? { color: '#1890ff' } : {}} onClick={() => { if(isCopy) copy((value || '') as any) }}>{value || '--'}</div>
+    //         <div ref={ref1} className={style.hiddenCon}><span>{value}</span></div>
+    //     </div>
+    // </Tooltip>
+    return <Typography.Text ellipsis={{ tooltip: true }} style={isCopy ? { color: '#1890ff' } : {}} onClick={() => { if(isCopy) copy((value || '') as any) }}>{value || '--'}</Typography.Text>
 }
 
 export default React.memo(WidthEllipsis)

src/pages/gameDataStatistics/order/index.tsx

@@ -83,6 +83,7 @@ const Order: React.FC = () => {
                 isCpOrderId
                 isCpStatus
                 isOs
+                isOrderLy
                 isGameIds
                 isFirstRecharge
                 isMerchantNo

src/pages/gameDataStatistics/roleOperate/pack/index.tsx

@@ -1,6 +1,6 @@
 import { useAjax } from "@/Hook/useAjax"
 import Tables from "@/components/Tables"
-import { getGameListApi } from "@/services/gameData"
+import { getGameListApi, getGameListNewApi } from "@/services/gameData"
 import { GetPackProps, delPackApi, getPackListApi } from "@/services/gameData/roleOperate"
 import { Button, Card, Col, Form, Input, Row, Select, Space, message } from "antd"
 import React, { useEffect, useState } from "react"
@@ -24,7 +24,7 @@ const Pack: React.FC = () => {
     const [superGameList, setSuperGameList] = useState<any[]>([])
     const getPackList = useAjax((params) => getPackListApi(params))
     const delPack = useAjax((params) => delPackApi(params))
-    const getGameList = useAjax(() => getGameListApi())
+    const getGameList = useAjax((params) => getGameListNewApi(params))
     /******************************/
 
     const onFinish = (data: any) => {
@@ -33,7 +33,7 @@ const Pack: React.FC = () => {
     }
 
     useEffect(() => {
-        getGameList.run().then(res => {
+        getGameList.run({ sourceSystem: 'ZX_ONE' }).then(res => {
             if (res) {
                 console.log(res)
                 const { parentGameList, superGameList } = res