bug

src/pages/activity/drainage/components/RedPacket.jsx

@@ -91,19 +91,29 @@ function RedPacket(props) {
                         initialValue: data.budget / 100,
                         rules: [
 
-                            { required: true, message: '请设置本次红包预算' },
-
+                            { required: true, message: '请设置合适的红包预算金额', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
+                            {
+                                validator: (rule, value, callback) => {
+                                    callback(value > (data.availableBalance + data.sendTotalAmount) / 100 ? '预算超支' : value < data.sendTotalAmount / 100 ? '红包预算不能小于已发送红包金额' : undefined)
+                                }
+                            }
                         ],
                     },
                     )(
-                        <Input type="number" min={0} max={99999} />,
+                        <Input type="number"
+                            // formatter={value => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                            // parser={value => value.replace(/\$\s?|(,*)/g, '')}
+                            min={0}
+                            max={99999}
+                            step={0.01}
+                        />,
                     )}
                 </Form.Item>
                 <Form.Item label="单个红包金额范围/元">
                     {getFieldDecorator('minPacket', {
                         initialValue: data.minPacket / 100 || 3,
                         rules: [
-                            { required: true, message: '请设置最小红包值' },
+                            { required: true, message: '请设置合适的最小红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
                         ],
                     })(
                         <InputNumber min={1} max={199} />,
@@ -111,7 +121,7 @@ function RedPacket(props) {
                      {getFieldDecorator('maxPacket', {
                         initialValue: data.maxPacket / 100 || 3,
                         rules: [
-                            { required: true, message: '请设置最大红包值' },
+                            { required: true, message: '请设置合适的最大红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
                         ],
                     })(
                         <InputNumber min={1} max={199} />,
@@ -121,7 +131,12 @@ function RedPacket(props) {
                     {getFieldDecorator('limitPacketNum', {
                         initialValue: data.limitPacketNum === -1 ? 0 : data.limitPacketNum,
                         rules: [
-                            { required: true, message: '请设置发放红包个数上限' },
+                            { required: true, message: '请设置合适的发放红包个数上限', pattern: new RegExp('^[1-9]\d*$') },
+                            {
+                                validator: (rule, value, callback) => {
+                                    callback(value < data.sendNum ? '不能小于已发送个数' : undefined)
+                                }
+                            }
                         ],
                     })(
                         <Input type="number" />,
@@ -149,6 +164,7 @@ color:rgba(102,102,102,1); */}
                         initialValue: data.mchName,
                         rules: [
                             { required: true, message: '请设置商户名称' },
+                            { max: 10, message: '标商户名称长度不能超过10个字符' }
                         ],
                     })(
                         <Input placeholder="{小程序名}" />,

src/pages/funds/accountfunds/components/Basic.jsx

@@ -32,6 +32,10 @@ function Basic(props) {
 
     const handleOkRecharge = e => {
         console.log(e, '123123')
+        if (e == 0) {
+            message.error('充值金额不能为0')
+            return
+        }
         if (e) {
 
             request({ ...apis.funds.saveOrder, data: { amount: e * 100 } }).then(data => {

src/pages/funds/accountfunds/components/ConsumerOrder.jsx

@@ -85,7 +85,8 @@ function RechargeOrder(props) {
             dataIndex: 'itemType',
             key: 'itemType',
             align: 'center',
-            render: (x, row) => <><span>{`${row.itemType == 'RedPacket' ? '红包' : ''}`}</span></>,
+            // render: () => <>红包</>,
+            render: (x, row) => <><span>{`${row.consumeType === 'RedPacket' ? '红包' : ''}`}</span></>,
         },
         {
             title: '活动名称',

src/pages/funds/accountfunds/components/Recharge.jsx

@@ -7,9 +7,11 @@ import ContactText from './contactText'
 const Recharge = props => {
 
     const [value, setValue] = useState()
-
+    // /^1[3456789]\d{9}$/
     function onChange(e) {
+        if (e.target.value == 0) { setValue(0); return }
         if (e.target.value <= 0) return
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
         if (e.target.value > 99999.99) { setValue(99999.99); return }
         console.log('changed', e.target.value);
         setValue(e.target.value)

src/pages/funds/accountfunds/components/Refund.jsx

@@ -6,10 +6,19 @@ import ContactText from './contactText'
 const Recharge = props => {
     const { balance } = props
 
+    // if (e.target.value == 0) { setValue(0); return }
+    // if (e.target.value <= 0) return
+    // if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+    // if (e.target.value > 99999.99) { setValue(99999.99); return }
+    // console.log('changed', e.target.value);
+    // setValue(e.target.value)
+
     const [value, setValue] = useState()
 
     function onChange(e) {
+        if (e.target.value == 0) { setValue(0); return }
         if (e.target.value <= 0) return
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
         if (e.target.value > balance) { setValue(balance); return }
         // console.log('changed', e.target.value);
         setValue(e.target.value)

src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -187,18 +187,11 @@ function RechargeOrder(props) {
                         <Select style={{ width: '180px' }} placeholder="退款状态">
                             <Option value="">全部</Option>
                             <Option value="checking">已申请</Option>
-                            <Option value="agree">已驳回</Option>
-                            <Option value="unagree">已退款</Option>
+                            <Option value="unagree">已驳回</Option>
+                            <Option value="agree">已退款</Option>
                         </Select>,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('phone')(
-                        <Input
-                            placeholder="接收人手机号"
-                        />,
-                    )}
-                </Form.Item>
                 <Form.Item>
                     <Button type="primary" htmlType="submit"> 搜索</Button>
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>