zhoulisen hace 5 años
padre
commit
b8a9397117

+ 1
- 1
src/pages/activity/drainage/components/Help.jsx Ver fichero

124
                 </Form.Item>
124
                 </Form.Item>
125
                 <Form.Item label="活动开始~结束时间">
125
                 <Form.Item label="活动开始~结束时间">
126
                     {getFieldDecorator('date', {
126
                     {getFieldDecorator('date', {
127
-                        initialValue: data.date,
127
+                        initialValue: data.date || [],
128
                     })(
128
                     })(
129
                         <RangePicker />,
129
                         <RangePicker />,
130
                     )}
130
                     )}

+ 2
- 2
src/pages/activity/drainage/components/RedPacket.jsx Ver fichero

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

+ 12
- 7
src/pages/activity/drainage/components/RedPacketRecord.jsx Ver fichero

9
 
9
 
10
     // const [taNoticeList, setTaNoticeList] = useState([])
10
     // const [taNoticeList, setTaNoticeList] = useState([])
11
 
11
 
12
-    const { id, name } = props
12
+    const { id, toRedPacketRecord } = props
13
     const [data, setData] = useState({})
13
     const [data, setData] = useState({})
14
 
14
 
15
     useEffect(() => {
15
     useEffect(() => {
16
-        getList({ pageNum: 1, pageSize: 10 });
16
+        console.log(toRedPacketRecord, 'toRedPacketRecord')
17
+        if (toRedPacketRecord === 1) {
18
+            props.form.setFieldsValue({ packetStatus: '1' })
19
+            getList({ pageNum: 1, pageSize: 10, packetStatus: '1' });
20
+        } else { getList({ pageNum: 1, pageSize: 10 }); }
21
+
17
     }, [])
22
     }, [])
18
     // 查询列表
23
     // 查询列表
19
 
24
 
29
             if (!err) {
34
             if (!err) {
30
                 // eslint-disable-next-line no-console
35
                 // eslint-disable-next-line no-console
31
                 console.log('提交数据: ', values)
36
                 console.log('提交数据: ', values)
32
-
37
+                getList({ pageNum: 1, pageSize: 10, ...values })
33
             }
38
             }
34
         });
39
         });
35
     }
40
     }
42
 
47
 
43
     const changePageNum = pageNumber => {
48
     const changePageNum = pageNumber => {
44
         props.form.validateFields((err, values) => {
49
         props.form.validateFields((err, values) => {
45
-          if (!err) {
46
-            getList({ pageNum: pageNumber, pageSize: 10, ...values })
47
-          }
50
+            if (!err) {
51
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
52
+            }
48
         });
53
         });
49
-      }
54
+    }
50
 
55
 
51
     const columns = [
56
     const columns = [
52
         {
57
         {

+ 4
- 1
src/pages/activity/drainage/h5edit.jsx Ver fichero

16
 
16
 
17
     const [tab, setTab] = useState('5')
17
     const [tab, setTab] = useState('5')
18
     const [data, setData] = useState({})
18
     const [data, setData] = useState({})
19
+    const [toRedPacketRecord, setToRedPacketRecord] = useState()
19
 
20
 
20
     const { id, name } = props.location.query
21
     const { id, name } = props.location.query
21
     // const type = props.activeType
22
     // const type = props.activeType
38
     function tabsCallback(e) {
39
     function tabsCallback(e) {
39
 
40
 
40
         setTab(e.target.value)
41
         setTab(e.target.value)
42
+        setToRedPacketRecord()
41
     }
43
     }
42
     const onDetai = (e) => {
44
     const onDetai = (e) => {
43
         console.log(e)
45
         console.log(e)
44
         setTab('4')
46
         setTab('4')
47
+        setToRedPacketRecord(e)
45
     }
48
     }
46
 
49
 
47
 
50
 
73
                 {/* 红包配置 */}
76
                 {/* 红包配置 */}
74
                 {(tab === '3' && <RedPacket toDetail={onDetai} id={id} name={name} />)}
77
                 {(tab === '3' && <RedPacket toDetail={onDetai} id={id} name={name} />)}
75
                 {/* 红包记录 */}
78
                 {/* 红包记录 */}
76
-                {(tab === '4' && <RedPacketRecord id={id} />)}
79
+                {(tab === '4' && <RedPacketRecord id={id} toRedPacketRecord={toRedPacketRecord} />)}
77
                 {/* 客户数据 */}
80
                 {/* 客户数据 */}
78
                 {(tab === '5' && <CustomerData id={id} />)}
81
                 {(tab === '5' && <CustomerData id={id} />)}
79
                 {/* 排行榜 */}
82
                 {/* 排行榜 */}

+ 0
- 4
src/pages/funds/accountfunds/components/ShowVoucher.jsx Ver fichero

42
             bannerList: this.props.bannerList,
42
             bannerList: this.props.bannerList,
43
         }
43
         }
44
 
44
 
45
-        console.log(this.props, ' props.bannerList')
46
-
47
         this.slider = null
45
         this.slider = null
48
     }
46
     }
49
 
47
 
50
     componentDidMount() {
48
     componentDidMount() {
51
-        console.log(this.props, ' props.bannerList')
52
         this.showSwiper()
49
         this.showSwiper()
53
 
50
 
54
 
51
 
105
                         </div>
102
                         </div>
106
                     </div>
103
                     </div>
107
                 </div>}
104
                 </div>}
108
-                11
109
             </>
105
             </>
110
         )
106
         )
111
     }
107
     }