bug fix

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

@@ -5,9 +5,17 @@ import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
+const formateValue = v => {
+    return {
+        ...v,
+        startTime: v.startTime ? `${v.startTime.format('YYYY-MM-DDT00:00:00')}Z` : undefined,
+        endTime: v.endTime ? `${v.endTime.format('YYYY-MM-DDT23:59:59')}Z` : undefined,
+    }
+}
+
 function CustomerData(props) {
 
-    const { id } = props
+    const { id, drainageId } = props
     // const [taNoticeList, setTaNoticeList] = useState([])
     const [data, setData] = useState({})
 
@@ -17,7 +25,7 @@ function CustomerData(props) {
     // 查询列表
 
     const getList = params => {
-        request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id } }).then(data => {
+        request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id, drainageId } }).then(data => {
             setData(data)
         })
     }
@@ -25,7 +33,7 @@ function CustomerData(props) {
     const changePageNum = pageNumber => {
         props.form.validateFields((err, values) => {
             if (!err) {
-                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+                getList({ pageNum: pageNumber, pageSize: 10, ...formateValue(values) })
             }
         });
     }
@@ -36,7 +44,11 @@ function CustomerData(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
-                getList({ pageNum: 1, pageSize: 10 }, ...values)
+                getList({
+                    pageNum: 1,
+                    pageSize: 10,
+                    ...formateValue(values),
+                })
             }
         });
     }
@@ -110,7 +122,7 @@ function CustomerData(props) {
 
     const exportReport = () => {
 
-        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id } }).then(data => {
+        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id, drainageId } }).then(data => {
             download(data)
         }).catch()
     }

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

@@ -7,6 +7,10 @@ import request from '../../../../utils/request';
 
 const { RangePicker } = DatePicker;
 
+function validatorNum (rule, value, callback) {
+    callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
+}
+
 function Help(props) {
 
     const { id, name } = props
@@ -61,14 +65,22 @@ function Help(props) {
                 <Form.Item label="助力成功需要人数">
                     {getFieldDecorator('helpSuccesPersons', {
                         initialValue: data.helpSuccesPersons || 3,
+                        rules: [
+                            { required: true, message: '请设置 助力成功需要人数' },
+                            { validator: validatorNum },
+                        ],
                     },
                     )(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
-                <Form.Item label="单人每人助力次数限制">
+                <Form.Item label="单人每日助力次数限制">
                     {getFieldDecorator('limitNumPerDay', {
                         initialValue: data.limitNumPerDay || 3,
+                        rules: [
+                            { required: true, message: '请设置 单人每日助力次数限制' },
+                            { validator: validatorNum },
+                        ],
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
@@ -76,6 +88,9 @@ function Help(props) {
                 <Form.Item label="超出时提示文案">
                     {getFieldDecorator('limitPerDayIllegalTip', {
                         initialValue: data.limitPerDayIllegalTip || '每人每天最多只能助力3次',
+                        rules: [
+                            { required: true, message: '请设置 超出时提示文案' },
+                        ],
                     })(
                         <Input placeholder="每人每天最多只能助力3次" />,
                     )}
@@ -83,6 +98,10 @@ function Help(props) {
                 <Form.Item label="单人总助力次数限制">
                     {getFieldDecorator('limitNumPerPerson', {
                         initialValue: data.limitNumPerPerson || 3,
+                        rules: [
+                            { required: true, message: '请设置 单人总助力次数限制' },
+                            { validator: validatorNum },
+                        ],
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
@@ -90,13 +109,20 @@ function Help(props) {
                 <Form.Item label="超出时提示文案">
                     {getFieldDecorator('limitPerPersonIllegalTip', {
                         initialValue: data.limitPerPersonIllegalTip || '每人最多只能为他人助力3次',
+                        rules: [
+                            { required: true, message: '请设置 超出时提示文案' },
+                        ],
                     })(
                         <Input placeholder="每人最多只能为他人助力3次" />,
                     )}
                 </Form.Item>
                 <Form.Item label="为同一人助力次数限制">
                     {getFieldDecorator('limitNumForEachPerson', {
-                        initialValue: data.limitNumForEachPerson || 3,
+                        initialValue: data.limitNumForEachPerson || 1,
+                        rules: [
+                            { required: true, message: '请设置 为同一人助力次数限制' },
+                            { validator: validatorNum },
+                        ],
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
@@ -104,6 +130,9 @@ function Help(props) {
                 <Form.Item label="超出时提示文案">
                     {getFieldDecorator('limitForEachPersonIllegalTip', {
                         initialValue: data.limitForEachPersonIllegalTip || '只能为同一人助力1次',
+                        rules: [
+                            { required: true, message: '请设置 超出时提示文案' },
+                        ],
                     })(
                         <Input placeholder="只能为同一人助力1次" />,
                     )}
@@ -111,6 +140,9 @@ function Help(props) {
                 <Form.Item label="助力成功时提示文案">
                     {getFieldDecorator('successTip', {
                         initialValue: data.successTip || '助力成功！快去告诉你的好友吧',
+                        rules: [
+                            { required: true, message: '请设置 助力成功时提示文案' },
+                        ],
                     })(
                         <Input placeholder="助力成功！快去告诉你的好友吧" />,
                     )}
@@ -118,6 +150,9 @@ function Help(props) {
                 <Form.Item label="其他无法助力时提示文案">
                     {getFieldDecorator('warnningTip', {
                         initialValue: data.warnningTip || '无法助力！具体原因请看活动规则',
+                        rules: [
+                            { required: true, message: '请设置 其他无法助力时提示文案' },
+                        ],
                     })(
                         <Input placeholder="无法助力！具体原因请看活动规则" />,
                     )}
@@ -125,13 +160,19 @@ function Help(props) {
                 <Form.Item label="活动开始～结束时间">
                     {getFieldDecorator('date', {
                         initialValue: data.date || [],
+                        rules: [
+                            { required: true, message: '请设置 活动开始～结束时间' },
+                        ],
                     })(
                         <RangePicker />,
                     )}
                 </Form.Item>
-                <Form.Item label="超出时提示文案">
+                <Form.Item label="活动结束提示文案">
                     {getFieldDecorator('activityEndTip', {
                         initialValue: data.activityEndTip,
+                        rules: [
+                            { required: true, message: '请设置 活动结束提示文案' },
+                        ],
                     })(
                         <Input placeholder="活动已经结束啦" />,
                     )}

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

@@ -81,8 +81,8 @@ function Ranking(props) {
         },
         {
             title: '助力人数',
-            dataIndex: 'num',
-            key: 'num',
+            dataIndex: 'votes',
+            key: 'votes',
             align: 'center',
         },
     ]

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

@@ -5,6 +5,12 @@ import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
+const TradingStatus = {
+    processing: '进行中',
+    success: '成功',
+    fail: '失败',
+}
+
 function RedPacketRecord(props) {
 
     // const [taNoticeList, setTaNoticeList] = useState([])
@@ -15,8 +21,8 @@ function RedPacketRecord(props) {
     useEffect(() => {
         console.log(toRedPacketRecord, 'toRedPacketRecord')
         if (toRedPacketRecord === 1) {
-            props.form.setFieldsValue({ packetStatus: '1' })
-            getList({ pageNum: 1, pageSize: 10, packetStatus: '1' });
+            props.form.setFieldsValue({ tradingStatus: 'success' })
+            getList({ pageNum: 1, pageSize: 10, tradingStatus: 'success' });
         } else { getList({ pageNum: 1, pageSize: 10 }); }
 
     }, [])
@@ -55,9 +61,9 @@ function RedPacketRecord(props) {
 
     const columns = [
         {
-            title: '微信订单号',
-            dataIndex: 'wxOrderId',
-            key: 'wxOrderId',
+            title: '订单号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
             align: 'center',
         },
         {
@@ -81,10 +87,9 @@ function RedPacketRecord(props) {
         },
         {
             title: '发放时间',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>,
         },
         {
             title: '金额（元）',
@@ -94,9 +99,10 @@ function RedPacketRecord(props) {
         },
         {
             title: '发送状态',
-            dataIndex: 'packetStatus',
-            key: 'packetStatus',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
             align: 'center',
+            render: x => <span>{ TradingStatus[x] || ''}</span>,
         },
     ]
 
@@ -107,7 +113,7 @@ function RedPacketRecord(props) {
         <>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                 <Form.Item>
-                    {getFieldDecorator('wxOrderId')(
+                    {getFieldDecorator('tradeNo')(
                         <Input
                             placeholder="订单号"
                         />,
@@ -121,11 +127,15 @@ function RedPacketRecord(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('packetStatus')(
+                    {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="发送状态">
                             <option value="">全部</option>
-                            <option value="1">成功</option>
-                            <option value="0">失败</option>
+                            {
+                                Object.keys(TradingStatus).map(k => {
+                                    const key = `tds-${k}`;
+                                    return (<option key={key} value={k}>{TradingStatus[k]}</option>);
+                                })
+                            }
                         </Select>,
                     )}
                 </Form.Item>

src/pages/activity/drainage/detailDrainage.jsx

@@ -28,6 +28,7 @@ const BasicForm = props => {
       query: {
         id: data.activityId,
         name: data.name,
+        drainageId,
       },
     });
   }

src/pages/activity/drainage/h5edit.jsx

@@ -18,7 +18,7 @@ const H5configuration = props => {
     const [data, setData] = useState({})
     const [toRedPacketRecord, setToRedPacketRecord] = useState()
 
-    const { id, name } = props.location.query
+    const { id, name, drainageId } = props.location.query
     // const type = props.activeType
 
 
@@ -78,7 +78,7 @@ const H5configuration = props => {
                 {/* 红包记录 */}
                 {(tab === '4' && <RedPacketRecord id={id} toRedPacketRecord={toRedPacketRecord} />)}
                 {/* 客户数据 */}
-                {(tab === '5' && <CustomerData id={id} />)}
+                {(tab === '5' && <CustomerData id={id} drainageId={drainageId} />)}
                 {/* 排行榜 */}
                 {(tab === '6' && <Ranking id={id} />)}
             </div>