魏超 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,13 +188,12 @@ class Verifier extends React.Component {
188 188
   }
189 189
 
190 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 193
     this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
194 194
   }
195 195
 
196 196
   render () {
197
-    console.log(this.props,"33334")
198 197
     return (
199 198
       <>
200 199
         <Modal
@@ -207,7 +206,7 @@ class Verifier extends React.Component {
207 206
           onCancel={(e) => this.handleCancel(e)}
208 207
         >
209 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 210
           </div>
212 211
         </Modal>
213 212
       </>
@@ -382,7 +381,6 @@ function helpRecord(row) {
382 381
  }
383 382
 
384 383
  function onSuccess(e) {
385
-   console.log("eeeeeeee", e);
386 384
   setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
387 385
   getList({ pageNumber: 1, pageSize: 10, ...e});
388 386
  }
@@ -395,26 +393,26 @@ function helpRecord(row) {
395 393
 
396 394
   const publicColumns = [
397 395
     {
398
-      title: '团者',
396
+      title: '团者',
399 397
       dataIndex: 'nickname',
400 398
       key: 'nickname',
401 399
       align: 'center',
402 400
       width: '15%',
403 401
     },
404 402
     {
405
-      title: '团者手机号',
403
+      title: '团者手机号',
406 404
       dataIndex: 'phone',
407 405
       key: 'phone',
408 406
       align: 'center',
409 407
       width: '10%',
410 408
     },
411 409
     {
412
-      title: '团时间',
410
+      title: '团时间',
413 411
       dataIndex: 'createTime',
414 412
       key: 'createTime',
415 413
       align: 'center',
416 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 418
       title: '参团者',
@@ -433,7 +431,6 @@ function helpRecord(row) {
433 431
       key: 'nickname',
434 432
       align: 'center',
435 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 436
       title: '拼团者手机号',
@@ -441,8 +438,6 @@ function helpRecord(row) {
441 438
       key: 'phone',
442 439
       align: 'center',
443 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 443
       title: '拼团时间',
@@ -450,7 +445,7 @@ function helpRecord(row) {
450 445
       key: 'createTime',
451 446
       align: 'center',
452 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 451
         title: '成团时间',
@@ -458,7 +453,7 @@ function helpRecord(row) {
458 453
         key: 'endTime',
459 454
         align: 'center',
460 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 459
       title: '核销状态',

+ 2
- 2
src/pages/activity/groupActivity/list.jsx 查看文件

@@ -70,8 +70,8 @@ const toEditActivity = (groupActivityId) => () => {
70 70
       },
71 71
     {
72 72
       title: '已参与人数',
73
-      dataIndex: 'joinPeople',
74
-      key: 'joinPeople',
73
+      dataIndex: 'participateNum',
74
+      key: 'participateNum',
75 75
       align: 'center',
76 76
     },
77 77
     {