zhoulisen 5 years ago
parent
commit
d430fc174e

+ 3
- 2
src/pages/activity/drainage/components/Help.jsx View File

33
     const updateRedPacket = values => {
33
     const updateRedPacket = values => {
34
 
34
 
35
         const [startDate, endDate] = values.date
35
         const [startDate, endDate] = values.date
36
-        values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
37
-        values.endDate = `${moment(endDate).format('YYYY-MM-DDT00:00:00.000')}Z`
36
+        console.log(values.date)
37
+        values.startDate = `${moment(startDate).format('YYYY-MM-DDTH:mm:ss.000')}Z`
38
+        values.endDate = `${moment(endDate).format('YYYY-MM-DDTH:mm:ss.000')}Z`
38
         values.activityId = id
39
         values.activityId = id
39
         request({ ...apis.redPacket.updateHelp, urlData: { id }, data: { ...values } }).then(data => {
40
         request({ ...apis.redPacket.updateHelp, urlData: { id }, data: { ...values } }).then(data => {
40
             message.info('操作成功')
41
             message.info('操作成功')

+ 3
- 3
src/pages/activity/drainage/components/RedPacket.jsx View File

134
                             { required: false, message: '请设置合适的发放红包个数上限', pattern: new RegExp('^[0-9]{1,99}\d*$') },
134
                             { required: false, message: '请设置合适的发放红包个数上限', pattern: new RegExp('^[0-9]{1,99}\d*$') },
135
                             {
135
                             {
136
                                 validator: (rule, value, callback) => {
136
                                 validator: (rule, value, callback) => {
137
-                                    callback(value < data.sendNum ? '不能小于已发送个数' : undefined)
138
-                                }
139
-                            }
137
+                                    callback((data.limitPacketNum !== -1 && value < data.sendNum) ? '不能小于已发送个数' : undefined)
138
+                                },
139
+                            },
140
                         ],
140
                         ],
141
                     })(
141
                     })(
142
                         <Input type="number" />,
142
                         <Input type="number" />,