合并

src/pages/activity/groupActivity/editGroupActivity.jsx

     if (groupActivityId) {
       console.log(groupActivityId, 'groupActivityId')
       useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'activity' } }).then((data) => {
+        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setPosterId(data[0].posterId)
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
 
     if (groupActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'activity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
     const submitShare = () => {
       if (groupActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/activity/groupActivity/helpRecord.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message} from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
   constructor(props) {
     super(props);
     this.state = {
-      helpRecordInitiateId: { id: '' },
-      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' },
+      groupActivityId: { id: '' },
+      visibleData: { visible: false, groupActivityId: '' },
     }
   }
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+    const { groupActivityId } = this.state.visibleData
   }
 
   componentDidUpdate (preProps, preState) {
-    const { customerId } = this.state.visibleData
+    const { groupActivityId } = this.state.visibleData
     console.log('this.state.visibleData', this.state.visibleData)
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.setState({ visibleData: this.props.visibleData });
     }
   }
   // 弹框取消按钮
   handleCancel () {
     // this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
-    this.props.onCancel();
+    // this.props.onCancel();
+    this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
   }
 
-  getList (params) {
-    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
-        console.log(res);
-      this.setState({ dataSource: res })
+   getVerCodeList (params) {
+    request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
+      // eslint-disable-next-line no-undef
+      message.info('核销成功')
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
 
   // eslint-disable-next-line class-methods-use-this
   verify(e) {
-    console.log('111', e.target.value)
+    this.setState({ visibleData: { visible: true, groupActivityId: this.props.visibleData.groupActivityId, verificationCode: e.target.value } })
   }
 
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
-    console.log('this.state.visibleData', this.state.visibleData)
-      alert(1)
+    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode })
+    this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
   }
 
   render () {
 function body(props) {
   const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId : '', recordId:'',  groupStatus: ''})
 
-  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', groupStatus: '' })
+  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '' })
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
     const { value } = e.target
     setgroupStatus(value)
     if (value == 0) { 
-        console.log("success", value)
         getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId }) }
     if (value == 1 || value == 2) {
-        console.log("faile", value)
          getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId })
          }
   }
 function helpRecord(row) {
 // 关闭核销
 // eslint-disable-next-line max-len
-  setVerifierData({ visible: false, helpRecordInitiateId: row.helpRecordInitiateId})
+  setVerifierData({ visible: false, groupActivityId: row.groupActivityId,  groupStatus: 0})
   // eslint-disable-next-line max-len
-  console.log("tttttttttt",row);
   setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId})
 }
  // 核销
- function helpInitiateRecordVerify(row) {
+ function shareRecordVerify(row) {
 // 关闭助力记录弹框
 // eslint-disable-next-line max-len
-  setVerifierData({ visible: true, helpRecordInitiateId: row.helpRecordInitiateId})
+  setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0})
   // eslint-disable-next-line max-len
-  setGInviteData({ visible: false, helpRecordInitiateId: row.helpRecordInitiateId})
+  setGInviteData({ visible: false, groupActivityId: row.groupActivityId})
+ }
+
+ function onSuccess(e) {
+  setVerifierData({ visible: false, groupActivityId: '', groupStatus: 0})
+  getList({ pageNumber: 1, pageSize: 10, ...e});
  }
 
   const publicColumns = [
         <>
           {row.verificationStatus === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => helpInitiateRecordVerify(row)}>核销</span>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
           </AuthButton>
         }
         </>
       }
        <InviteTable visibleData={gInviteData} />
        {/* 核销 */}
-       <Verifier visibleData={gVerifierData} />
+       <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
     </>
   );
 }

src/services/apis.js

     url: `${prefix}/taShareRecord/export`,
     method: 'get',
     action: 'admin.taRole.get',
+  },
+  verification: {
+    url: `${prefix}/taShareRecord/verificate`,
+    method: 'put',
+    action: 'admin.taRole.get',
   }
  },
  third: {