魏超 пре 5 година
родитељ
комит
861e9033df
2 измењених фајлова са 11 додато и 16 уклоњено
  1. 9
    14
      src/pages/activity/groupActivity/helpRecord.jsx
  2. 2
    2
      src/pages/activity/groupActivity/list.jsx

+ 9
- 14
src/pages/activity/groupActivity/helpRecord.jsx Прегледај датотеку

188
   }
188
   }
189
 
189
 
190
   // eslint-disable-next-line class-methods-use-this
190
   // eslint-disable-next-line class-methods-use-this
191
-  verification(e, groupActivityId) {
192
-    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode })
191
+  verification(e) {
192
+    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode})
193
     this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
193
     this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
194
   }
194
   }
195
 
195
 
196
   render () {
196
   render () {
197
-    console.log(this.props,"33334")
198
     return (
197
     return (
199
       <>
198
       <>
200
         <Modal
199
         <Modal
207
           onCancel={(e) => this.handleCancel(e)}
206
           onCancel={(e) => this.handleCancel(e)}
208
         >
207
         >
209
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
208
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
210
-           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
209
+           <Button onClick={() => this.verification()}>立即核销</Button>
211
           </div>
210
           </div>
212
         </Modal>
211
         </Modal>
213
       </>
212
       </>
382
  }
381
  }
383
 
382
 
384
  function onSuccess(e) {
383
  function onSuccess(e) {
385
-   console.log("eeeeeeee", e);
386
   setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
384
   setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
387
   getList({ pageNumber: 1, pageSize: 10, ...e});
385
   getList({ pageNumber: 1, pageSize: 10, ...e});
388
  }
386
  }
395
 
393
 
396
   const publicColumns = [
394
   const publicColumns = [
397
     {
395
     {
398
-      title: '团者',
396
+      title: '团者',
399
       dataIndex: 'nickname',
397
       dataIndex: 'nickname',
400
       key: 'nickname',
398
       key: 'nickname',
401
       align: 'center',
399
       align: 'center',
402
       width: '15%',
400
       width: '15%',
403
     },
401
     },
404
     {
402
     {
405
-      title: '团者手机号',
403
+      title: '团者手机号',
406
       dataIndex: 'phone',
404
       dataIndex: 'phone',
407
       key: 'phone',
405
       key: 'phone',
408
       align: 'center',
406
       align: 'center',
409
       width: '10%',
407
       width: '10%',
410
     },
408
     },
411
     {
409
     {
412
-      title: '团时间',
410
+      title: '团时间',
413
       dataIndex: 'createTime',
411
       dataIndex: 'createTime',
414
       key: 'createTime',
412
       key: 'createTime',
415
       align: 'center',
413
       align: 'center',
416
       width: '15%',
414
       width: '15%',
417
-      render: (x, row) => <><span>{`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
415
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
418
     },
416
     },
419
     {
417
     {
420
       title: '参团者',
418
       title: '参团者',
433
       key: 'nickname',
431
       key: 'nickname',
434
       align: 'center',
432
       align: 'center',
435
       width: '15%',
433
       width: '15%',
436
-      // render: (_, record) => <Avatar shape="square" src={groupStatus === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
437
     },
434
     },
438
     {
435
     {
439
       title: '拼团者手机号',
436
       title: '拼团者手机号',
441
       key: 'phone',
438
       key: 'phone',
442
       align: 'center',
439
       align: 'center',
443
       width: '10%',
440
       width: '10%',
444
-      // eslint-disable-next-line no-nested-ternary
445
-      // render: (_, record) => <><span>{groupStatus === 'helpSucceed' ? record.name : record.nickname}</span></>,
446
     },
441
     },
447
     {
442
     {
448
       title: '拼团时间',
443
       title: '拼团时间',
450
       key: 'createTime',
445
       key: 'createTime',
451
       align: 'center',
446
       align: 'center',
452
       width: '10%',
447
       width: '10%',
453
-      // eslint-disable-next-line no-nested-ternary
448
+      render: (x, row) => <><span>{row.createTime ?`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
454
     },
449
     },
455
     {
450
     {
456
         title: '成团时间',
451
         title: '成团时间',
458
         key: 'endTime',
453
         key: 'endTime',
459
         align: 'center',
454
         align: 'center',
460
         width: '10%',
455
         width: '10%',
461
-        // eslint-disable-next-line no-nested-ternary
456
+        render: (x, row) => <><span>{row.endTime ?`${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
462
     },
457
     },
463
     {
458
     {
464
       title: '核销状态',
459
       title: '核销状态',

+ 2
- 2
src/pages/activity/groupActivity/list.jsx Прегледај датотеку

70
       },
70
       },
71
     {
71
     {
72
       title: '已参与人数',
72
       title: '已参与人数',
73
-      dataIndex: 'joinPeople',
74
-      key: 'joinPeople',
73
+      dataIndex: 'participateNum',
74
+      key: 'participateNum',
75
       align: 'center',
75
       align: 'center',
76
     },
76
     },
77
     {
77
     {