zls

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

@@ -124,7 +124,7 @@ function Help(props) {
                 </Form.Item>
                 <Form.Item label="活动开始～结束时间">
                     {getFieldDecorator('date', {
-                        initialValue: data.date,
+                        initialValue: data.date || [],
                     })(
                         <RangePicker />,
                     )}

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

@@ -69,7 +69,7 @@ function RedPacket(props) {
                 <Col span={8} style={{ padding: '0 10px' }}>
                     <div className={Styles.redHeader}>
                         {/* packetSendedNum */}
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.packetSendedNum}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
                     </div>
                 </Col>
@@ -108,7 +108,7 @@ function RedPacket(props) {
                 </Form.Item>
                 <Form.Item label="发放红包个数上限">
                     {getFieldDecorator('limitPacketNum', {
-                        initialValue: data.limitPacketNum,
+                        initialValue: data.limitPacketNum === -1 ? 0 : data.limitPacketNum,
                     })(
                         <Input type="number" />,
                     )}

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

@@ -9,11 +9,16 @@ function RedPacketRecord(props) {
 
     // const [taNoticeList, setTaNoticeList] = useState([])
 
-    const { id, name } = props
+    const { id, toRedPacketRecord } = props
     const [data, setData] = useState({})
 
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
+        console.log(toRedPacketRecord, 'toRedPacketRecord')
+        if (toRedPacketRecord === 1) {
+            props.form.setFieldsValue({ packetStatus: '1' })
+            getList({ pageNum: 1, pageSize: 10, packetStatus: '1' });
+        } else { getList({ pageNum: 1, pageSize: 10 }); }
+
     }, [])
     // 查询列表
 
@@ -29,7 +34,7 @@ function RedPacketRecord(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
-
+                getList({ pageNum: 1, pageSize: 10, ...values })
             }
         });
     }
@@ -42,11 +47,11 @@ function RedPacketRecord(props) {
 
     const changePageNum = pageNumber => {
         props.form.validateFields((err, values) => {
-          if (!err) {
-            getList({ pageNum: pageNumber, pageSize: 10, ...values })
-          }
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+            }
         });
-      }
+    }
 
     const columns = [
         {

src/pages/activity/drainage/h5edit.jsx

@@ -16,6 +16,7 @@ const H5configuration = props => {
 
     const [tab, setTab] = useState('5')
     const [data, setData] = useState({})
+    const [toRedPacketRecord, setToRedPacketRecord] = useState()
 
     const { id, name } = props.location.query
     // const type = props.activeType
@@ -38,10 +39,12 @@ const H5configuration = props => {
     function tabsCallback(e) {
 
         setTab(e.target.value)
+        setToRedPacketRecord()
     }
     const onDetai = (e) => {
         console.log(e)
         setTab('4')
+        setToRedPacketRecord(e)
     }
 
 
@@ -73,7 +76,7 @@ const H5configuration = props => {
                 {/* 红包配置 */}
                 {(tab === '3' && <RedPacket toDetail={onDetai} id={id} name={name} />)}
                 {/* 红包记录 */}
-                {(tab === '4' && <RedPacketRecord id={id} />)}
+                {(tab === '4' && <RedPacketRecord id={id} toRedPacketRecord={toRedPacketRecord} />)}
                 {/* 客户数据 */}
                 {(tab === '5' && <CustomerData id={id} />)}
                 {/* 排行榜 */}

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

@@ -42,13 +42,10 @@ class ShowVoucher extends React.Component {
             bannerList: this.props.bannerList,
         }
 
-        console.log(this.props, ' props.bannerList')
-
         this.slider = null
     }
 
     componentDidMount() {
-        console.log(this.props, ' props.bannerList')
         this.showSwiper()
 
 
@@ -105,7 +102,6 @@ class ShowVoucher extends React.Component {
                         </div>
                     </div>
                 </div>}
-                11
             </>
         )
     }