wjx 1 год назад
Родитель
Сommit
7851804d22

+ 1 - 1
config/routerConfig.ts

@@ -155,7 +155,7 @@ const gameDataStatistics = {
                 },
                 },
                 {
                 {
                     path: '/gameDataStatistics/roleOperate/vip',
                     path: '/gameDataStatistics/roleOperate/vip',
-                    name: '游戏VIP位',
+                    name: '游戏VIP位',
                     access: 'vip',
                     access: 'vip',
                     component: './gameDataStatistics/roleOperate/vip',
                     component: './gameDataStatistics/roleOperate/vip',
                 }
                 }

+ 1 - 1
src/components/QueryForm/index.tsx

@@ -1302,7 +1302,6 @@ const QueryForm: React.FC<Props> = (props) => {
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }
                     }
                 >
                 >
-                    <Select.Option value="2">未操作</Select.Option>
                     <Select.Option value="1">退游</Select.Option>
                     <Select.Option value="1">退游</Select.Option>
                     <Select.Option value="0">未退游</Select.Option>
                     <Select.Option value="0">未退游</Select.Option>
                 </Select>
                 </Select>
@@ -1319,6 +1318,7 @@ const QueryForm: React.FC<Props> = (props) => {
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }
                     }
                 >
                 >
+                    <Select.Option value="2">未操作</Select.Option>
                     <Select.Option value="1">退游</Select.Option>
                     <Select.Option value="1">退游</Select.Option>
                     <Select.Option value="0">未退游</Select.Option>
                     <Select.Option value="0">未退游</Select.Option>
                 </Select>
                 </Select>

+ 1 - 1
src/pages/gameDataStatistics/gameData/flowingWater/tableConfig.tsx

@@ -53,7 +53,7 @@ function columns12() {
                             }
                             }
                         },
                         },
                         {
                         {
-                            title: '充值位',
+                            title: '充值位',
                             dataIndex: 'amountPost',
                             dataIndex: 'amountPost',
                             key: 'amountPost',
                             key: 'amountPost',
                             width: 65,
                             width: 65,

+ 3 - 3
src/pages/gameDataStatistics/roleOperate/vip/index.tsx

@@ -10,7 +10,7 @@ import style from '../../components/TableData/index.less'
 import columnsPos from "./tableConfig"
 import columnsPos from "./tableConfig"
 
 
 /**
 /**
- * 游戏VIP
+ * 游戏VIP
  * @returns 
  * @returns 
  */
  */
 const Vip: React.FC = () => {
 const Vip: React.FC = () => {
@@ -66,7 +66,7 @@ const Vip: React.FC = () => {
         bodyStyle={{ padding: '5px 10px' }}
         bodyStyle={{ padding: '5px 10px' }}
     >
     >
         <div style={{ textAlign: 'center', fontWeight: 'bold', padding: '4px 6px 6px', fontSize: 16, marginBottom: 4, position: 'relative' }}>
         <div style={{ textAlign: 'center', fontWeight: 'bold', padding: '4px 6px 6px', fontSize: 16, marginBottom: 4, position: 'relative' }}>
-            VIP
+            VIP
         </div>
         </div>
         <Space style={{ width: '100%' }} direction="vertical" size={10}>
         <Space style={{ width: '100%' }} direction="vertical" size={10}>
             <Form layout="inline" className='queryForm' initialValues={initialValues} name="basicGameVip" form={form} onFinish={onFinish}>
             <Form layout="inline" className='queryForm' initialValues={initialValues} name="basicGameVip" form={form} onFinish={onFinish}>
@@ -106,7 +106,7 @@ const Vip: React.FC = () => {
                         <Space>
                         <Space>
                             <Button type="primary" htmlType="submit">搜索</Button>
                             <Button type="primary" htmlType="submit">搜索</Button>
                             <Button onClick={() => form.resetFields()}>重置</Button>
                             <Button onClick={() => form.resetFields()}>重置</Button>
-                            <Button icon={<PlusOutlined />} type="primary" onClick={() => { setVisible(true); setInitialValues({}) }}>新增VIP位</Button>
+                            <Button icon={<PlusOutlined />} type="primary" onClick={() => { setVisible(true); setInitialValues({}) }}>新增VIP位</Button>
                         </Space>
                         </Space>
                     </Col>
                     </Col>
                 </Row>
                 </Row>

+ 3 - 5
src/pages/gameDataStatistics/roleOperate/vip/tableConfig.tsx

@@ -9,7 +9,7 @@ function columnsPos(editPack: (data: any) => void, del: (id: number) => void) {
 
 
     let newArr: any = [
     let newArr: any = [
         {
         {
-            title: 'VIP位',
+            title: 'VIP位',
             dataIndex: 'vipLevel',
             dataIndex: 'vipLevel',
             key: 'vipLevel',
             key: 'vipLevel',
             align: 'center',
             align: 'center',
@@ -37,16 +37,14 @@ function columnsPos(editPack: (data: any) => void, del: (id: number) => void) {
             dataIndex: 'rechargeMoneyMin',
             dataIndex: 'rechargeMoneyMin',
             key: 'rechargeMoneyMin',
             key: 'rechargeMoneyMin',
             align: 'center',
             align: 'center',
-            width: 100,
-            render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+            width: 100
         },
         },
         {
         {
             title: '最大充值金额(不包含)',
             title: '最大充值金额(不包含)',
             dataIndex: 'rechargeMoneyMax',
             dataIndex: 'rechargeMoneyMax',
             key: 'rechargeMoneyMax',
             key: 'rechargeMoneyMax',
             align: 'center',
             align: 'center',
-            width: 120,
-            render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+            width: 120
         },
         },
         {
         {
             title: '创建人',
             title: '创建人',

+ 3 - 3
src/pages/gameDataStatistics/roleOperate/vip/vipModal.tsx

@@ -41,7 +41,7 @@ const VipModal: React.FC<Props> = ({ superGameList = [], thatStoreData = { gameL
     }
     }
 
 
     return <Modal
     return <Modal
-        title={`${initialValues?.id ? '修改' : '新增'}VIP位`}
+        title={`${initialValues?.id ? '修改' : '新增'}VIP位`}
         visible={visible}
         visible={visible}
         onCancel={onClose}
         onCancel={onClose}
         onOk={handleOk}
         onOk={handleOk}
@@ -57,8 +57,8 @@ const VipModal: React.FC<Props> = ({ superGameList = [], thatStoreData = { gameL
             colon={false}
             colon={false}
             initialValues={{ ...initialValues }}
             initialValues={{ ...initialValues }}
         >
         >
-            <Form.Item label="VIP挡位" name="vipLevel" rules={[{ required: true, message: '请输入vip挡位!' }]}>
-                <InputNumber min={0} placeholder="请输入vip位" style={{ minWidth: 130 }} />
+            <Form.Item label="VIP档位" name="vipLevel" rules={[{ required: true, message: '请输入vip档位!' }]}>
+                <InputNumber min={0} placeholder="请输入vip位" style={{ minWidth: 130 }} />
             </Form.Item>
             </Form.Item>
             <Form.Item label="超父游戏" name='superGameId' rules={[{ required: true, message: '请选择超父游戏!' }]}>
             <Form.Item label="超父游戏" name='superGameId' rules={[{ required: true, message: '请选择超父游戏!' }]}>
                 <Select
                 <Select

+ 3 - 3
src/services/gameData/roleOperate.ts

@@ -454,7 +454,7 @@ export interface GameVipProps {
     vipLevel?: number
     vipLevel?: number
 }
 }
 /**
 /**
- * vip位列表
+ * vip位列表
  * @param data 
  * @param data 
  * @returns 
  * @returns 
  */
  */
@@ -466,7 +466,7 @@ export async function getGameVipApi(data: GameVipProps) {
 }
 }
 
 
 /**
 /**
- * 删除vip
+ * 删除vip
  * @param ids 
  * @param ids 
  * @returns 
  * @returns 
  */
  */
@@ -486,7 +486,7 @@ export interface modalGameVipApi {
     id?: number
     id?: number
 }
 }
 /**
 /**
- * 新增修改vip
+ * 新增修改vip
  * @param data 
  * @param data 
  * @returns 
  * @returns 
  */
  */