wjx 1 rok pred
rodič
commit
41eb98e91f
1 zmenil súbory, kde vykonal 8 pridanie a 8 odobranie
  1. 8 8
      src/components/QueryForm/index.tsx

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

@@ -1608,13 +1608,10 @@ const QueryForm: React.FC<Props> = (props) => {
             {isRoleCount && <Col><Form.Item name='roleCount'>
                 <IntervalTime {...isRoleCount} />
             </Form.Item></Col>}
-            
+
             {/* 创角24小时内单笔充值金额 */}
             {isRechargeAmountWithin24h && <Col><Form.Item name='roleCount'>
                 <Space size={0}>
-                    <Form.Item name={'rechargeAmountWithin24h'} noStyle>
-                        <Input placeholder="创角24小时内单笔充值金额" allowClear/>
-                    </Form.Item>
                     <Form.Item name={'rechargeAmountWithin24hUnit'} noStyle>
                         <Select placeholder="条件" style={{ width: 70 }} allowClear>
                             <Select.Option value=">=">{`>=`}</Select.Option>
@@ -1624,6 +1621,9 @@ const QueryForm: React.FC<Props> = (props) => {
                             <Select.Option value="<">{`<`}</Select.Option>
                         </Select>
                     </Form.Item>
+                    <Form.Item name={'rechargeAmountWithin24h'} noStyle>
+                        <Input placeholder="创角24小时内单笔充值金额" allowClear />
+                    </Form.Item>
                     <Tooltip title={'创角24小时内单笔充值金额,条件默认">="'}>
                         <QuestionCircleOutlined style={{ marginLeft: 10 }} />
                     </Tooltip>
@@ -1633,10 +1633,7 @@ const QueryForm: React.FC<Props> = (props) => {
             {/* 创角24小时以内累计充值金额 */}
             {isRechargeTotalAmountWithin24h && <Col><Form.Item name='roleCount'>
                 <Space size={0}>
-                    <Form.Item name={'rechargeTotalAmountWithin24h'} noStyle>
-                        <Input placeholder="创角24小时以内累计充值金额" allowClear/>
-                    </Form.Item>
-                    <Form.Item name={'rechargeTotalAmountWithin24hUnit '} noStyle>
+                    <Form.Item name={'rechargeTotalAmountWithin24hUnit'} noStyle>
                         <Select placeholder="条件" style={{ width: 70 }} allowClear>
                             <Select.Option value=">=">{`>=`}</Select.Option>
                             <Select.Option value="<=">{`<=`}</Select.Option>
@@ -1645,6 +1642,9 @@ const QueryForm: React.FC<Props> = (props) => {
                             <Select.Option value="<">{`<`}</Select.Option>
                         </Select>
                     </Form.Item>
+                    <Form.Item name={'rechargeTotalAmountWithin24h'} noStyle>
+                        <Input placeholder="创角24小时以内累计充值金额" allowClear />
+                    </Form.Item>
                     <Tooltip title={'创角24小时以内累计充值金额,条件默认">="'}>
                         <QuestionCircleOutlined style={{ marginLeft: 10 }} />
                     </Tooltip>