Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

config/routes.js

@@ -291,6 +291,25 @@ export default [
                 hideInMenu: true,
                 component: './activity/helpActivity/edithelpActivity',
               },
+              
+              {
+                path: '/activity/groupActivity/list',
+                name: '拼团活动',
+                component: './activity/groupActivity/list',
+              },
+              {
+                path: '/activity/groupActivity/helpRecord',
+                name: '拼团记录',
+                hideInMenu: true,
+                component: './activity/groupActivity/helpRecord',
+              },
+              {
+                path: '/activity/groupActivity/editgroupActivity',
+                name: '新增',
+                hideInMenu: true,
+                component: './activity/groupActivity/editgroupActivity',
+              },
+
             ],
           },
           {

src/components/Wangedit/Wangedit.jsx

@@ -33,7 +33,9 @@ class Wangedit extends React.Component {
       }
     }
     this.editor.customConfig.zIndex = 100
+    this.editor.customConfig.uploadImgShowBase64 = true   
     this.editor.create()
+    this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)
   }
 

src/pages/activity/ActivityList.jsx

@@ -87,10 +87,10 @@ const toEditGoods = dynamicId => () => {
     },
     {
       title: '状态',
-      dataIndex: 'isEnlist',
-      key: 'isEnlist',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
       align: 'center',
-      render: isEnlist => <><span>{isEnlist == 0 ? "未开始" : isEnlist == 1 ? '进行中' : '已结束'}</span></>,
+      render: activityStatus => <><span>{activityStatus == 0 ? "进行中" : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
     },
     {
       title: '操作',
@@ -106,7 +106,7 @@ const toEditGoods = dynamicId => () => {
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.isEnlist != 2 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
+            {row.isEnlist == 1 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>

src/pages/activity/editActivity.jsx

@@ -20,163 +20,200 @@ import xiaochengxu from '../../assets/xiaochengxu.png'
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1)
+
+  const radioOnChange = e => {
+    // console.log(e.target.value)
+    setIsEnlist(e.target.value)
+  }
+
+  const { dynamicId } = props
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setIsEnlist(data.isEnlist)
+      props.form.setFieldsValue(data)
+    })
+  }
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      props.form.setFieldsValue({ isEnlist })
+      if (dynamicId) {
+        getDynamicData(dynamicId);
+      }
+    }, [])
+ 
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values
+        const [startDate, endDate] = activityTime
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        
+        console.log('submit data --->', values)
+        if (dynamicId) {
+          values.dynamicId = dynamicId
+          request({ ...apis.activity.update, data: values }).then(data => {
+            message.info('保存成功')
+            router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
+            router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect />)}
+        </Form.Item>
+        <Form.Item label="主图">
+          {getFieldDecorator('imgUrl')(<ImageUploader />)}
+          <span>建议图片尺寸：750px*560px</span>
+        </Form.Item>
+        <Form.Item label="活动标题">
+        {getFieldDecorator('title', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动标题',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+        <Form.Item label="活动时间">
+        {getFieldDecorator('activityTime', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动时间',
+            },
+          ],
+        })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+        </Form.Item>
+        <Form.Item label="活动地点">
+        {getFieldDecorator('address', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动地点',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+        <Form.Item label="活动人数">
+        {getFieldDecorator('personNum', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动人数',
+            },
+          ],
+        })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="最大报名人数">
+        {getFieldDecorator('maxEnlistByPerson', {
+          rules: [
+            {
+              required: true,
+              message: '请输入最大报名人数',
+            },
+          ],
+        })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="活动详情">
+        {getFieldDecorator('desc')(<Wangedit />)}
+        </Form.Item>
+        <Form.Item label="是否需要报名">
+        {getFieldDecorator('isEnlist')(
+          <Radio.Group onChange={(e) => radioOnChange(e)}>
+            <Radio value={1}>是</Radio>
+            <Radio value={0}>否</Radio>
+          </Radio.Group>,
+        )}
+        </Form.Item>
+        {
+          isEnlist === 1 && (<Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+          </Form.Item>)
+        }
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
 /**
  *
  *
  * @param {*} props
  * @returns
  */
-const Edit = (props) => {
+const Edit = props => {
   const [tab, changeTab] = useState('basic')
-  const dynamicId = props.location.query.dynamicId
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-  if (dynamicId) {
-    useEffect(() => {
-      getDynamicData(dynamicId);
-    }, [])
-
-    // 查询列表
-    const getDynamicData = (dynamicId) => {
-      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
-        console.log(data)
-        setDynamicData(data)
-      })
-    }
-  }
-
+  const { dynamicId } = props.location.query
+  
   const cancelPage = () => {
     router.push({
       pathname: '/activity/ActivityList',
     });
   }
 
-  const radioOnChange = e => {
-    console.log(e.target.value)
-    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  }
-
-  const Basic = (props) => {
-    const fields = [
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: dynamicData.buildingId,
-        rules: [
-          { required: true, message: '请选择所属项目' },
-        ]
-      },
-      {
-        label: '主图',
-        name: 'imgUrl',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.imgUrl,
-        help: '建议图片尺寸：750px*560px',
-      },
-      {
-        label: '活动标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: dynamicData.title,
-        rules: [
-          { required: true, message: '请输入活动标题' },
-        ]
-      },
-      {
-        label: '活动时间',
-        name: 'activityTime',
-        type: FieldTypes.RangePicker,
-        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
-        props: {showTime:{ format: 'HH:mm' }},
-        rules: [
-          { required: true, message: '请选择活动时间' },
-        ]
-      },
-      {
-        label: '活动地点',
-        name: 'address',
-        type: FieldTypes.Text,
-        value: dynamicData.address,
-        rules: [
-          { required: true, message: '请输入活动地点' },
-        ]
-      },
-      {
-        label: '活动人数',
-        name: 'personNum',
-        type: FieldTypes.Text,
-        value: dynamicData.personNum,
-        rules: [
-          { required: true, message: '请输入活动人数' },
-        ]
-      },
-      {
-        label: '最大报名人数',
-        name: 'maxEnlistByPerson',
-        type: FieldTypes.Text,
-        value: dynamicData.maxEnlistByPerson,
-        rules: [
-          { required: true, message: '请输入最大报名人数' },
-        ]
-      },
-      {
-        label: '活动详情',
-        name: 'desc',
-        render: <Wangedit />,
-        value: dynamicData.desc,
-      },
-      {
-        label: '是否需要报名',
-        name: 'isEnlist',
-        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
-          <Radio value={1}>是</Radio>
-          <Radio value={0}>否</Radio>
-        </Radio.Group>,
-        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
-      },
-      {
-        label: '报名时间',
-        name: 'signupTime',
-        // type: FieldTypes.RangePicker,
-        render: dynamicData.isEnlist === 1 ? (<RangePicker format={ 'YYYY/MM/DD HH:mm' } style={{ width: '100%' }} />) : '',
-        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
-        // props: {showTime:{ format: 'HH:mm' }},
-        rules: [
-          { required: true, message: '请选择报名时间' },
-        ]
-      },
-    ]
-
-    const handleSubmit = val => {
-      let { activityTime, signupTime, ...submitValue } = val
-      const [startDate, endDate] = activityTime
-      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
-      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
-      const [enlistStart, enlistEnd] = signupTime
-      submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
-      submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
-      console.log('submit data --->', submitValue)
-      if (dynamicId) {
-        submitValue.dynamicId = dynamicId
-        request({ ...apis.activity.update, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.activity.add, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
-    }
-
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  }
-
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
@@ -244,8 +281,13 @@ const Edit = (props) => {
               <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
             </div>
             <p style={{
-              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
-              display: '-webkit-box', lineClamp: '3', height: '60px',
+              margin: '10px 20px',
+fontSize: '20px',
+color: '#222',
+fontWeight: '600',
+              display: '-webkit-box',
+lineClamp: '3',
+height: '60px',
               WebkitLineClamp: '2',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
@@ -254,8 +296,12 @@ const Edit = (props) => {
 
             <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
             <p style={{
-              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
-              display: '-webkit-box', lineClamp: '3', height: '72px',
+              margin: '16px 20px 28px 20px',
+fontSize: '17px',
+color: '#999',
+              display: '-webkit-box',
+lineClamp: '3',
+height: '72px',
               WebkitLineClamp: '3',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
@@ -326,7 +372,7 @@ const Edit = (props) => {
           request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
-          }).catch((err) => {
+          }).catch(err => {
             message.info(err.msg || err.message)
           })
         }
@@ -367,7 +413,7 @@ const Edit = (props) => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
         {tab === 'poster' && <Poster />}
         {tab === 'share' && <Share />}
       </div>
@@ -375,6 +421,4 @@ const Edit = (props) => {
   );
 }
 
-
-
 export default Edit

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -0,0 +1,350 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+import yinhao from '../../../assets/yinhao.png'
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import logo from '../../../assets/logo.png';
+import touxiang from '../../../assets/touxiang.jpg';
+import poster1 from '../../../assets/poster1.png';
+import poster2 from '../../../assets/poster2.png';
+import xiaochengxu from '../../../assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  // const [help, helpTab] = useState('1')
+  const { groupActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  if (groupActivityId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      // eslint-disable-next-line no-use-before-define
+      getDynamicData(groupActivityId);
+    }, [])
+
+    // 详情
+    const getDynamicData = (groupActivityId) => {
+      request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+      })
+    }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/activity/groupActivity/list',
+    });
+  }
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
+
+  const Basic = props => {
+    const fields = [
+      {
+        label: '选择项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          { required: true, message: '请选择项目' },
+        ],
+      },
+      {
+        label: '活动标题',
+        name: 'activityName',
+        type: FieldTypes.Text,
+        value: dynamicData.activityName,
+        rules: [
+          { required: true, message: '请输入活动标题' },
+        ]
+      },
+      {
+        label: '活动主图',
+        name: 'mainImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.mainImg,
+        help: '建议图片尺寸：750px*560px',
+      },
+      {
+        label: '活动时间',
+        name: 'activityTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
+        props: { showTime: { format: 'HH:mm' } },
+        rules: [
+          { required: true, message: '请选择活动时间' },
+        ],
+      },
+      {
+        label: '成团人数',
+        name: 'groupBuyPeople',
+        type: FieldTypes.Text,
+        value: dynamicData.groupBuyPeople,
+        rules: [
+          { required: true, message: '请输入成团人数' },
+        ]
+      },
+      {
+        label: '所需积分',
+        name: 'integral',
+        type: FieldTypes.Text,
+        value: dynamicData.integral,
+        rules: [
+          { required: true, message: '请输入所需积分' },
+        ]
+      },
+      {
+        label: '活动说明',
+        name: 'descImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.descImg,
+        help: '建议图片尺寸：750px*560px',
+      },
+    ]
+
+    const handleSubmit = val => {
+      const { activityTime, signupTime, ...submitValue } = val
+      console.log('val', val)
+      const [startTime, endTime] = activityTime
+      submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
+      submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
+      console.log('submit data --->', submitValue)
+      if (groupActivityId) {
+        submitValue.groupActicityId = groupActivityId
+        request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.groupActivity.add, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if (groupActivityId) {
+      console.log(groupActivityId, 'groupActivityId')
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'activity' } }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+        getMiniappName()
+      }, [])
+    }else{
+      getMiniappName()
+    }
+    // 获取小程序名称
+    const [miniappName, setMiniappName] = useState('')
+    function getMiniappName() {
+      request({ ...apis.building.getMiniappName }).then(res => {
+        console.log(res, "0000000000000")
+        setMiniappName(res)
+      })
+    }
+
+    const submitPoster = () => {
+      if (groupActivityId) {
+        if (posterId) {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>{miniappName || '置业V顾问'}</span>报名活动</p>
+              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述1</p>
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+
+  }
+
+
+
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+
+    if (groupActivityId) {
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'activity' }, }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if (groupActivityId) {
+        if (shareContentId) {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'activity', 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) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板1</p>
+        <div>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片1</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息1</Radio.Button>
+          <Radio.Button value="poster">海报图片1</Radio.Button>
+          <Radio.Button value="share">分享设置1</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic />}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+    </div>
+  );
+}
+export default Edit

src/pages/activity/groupActivity/helpRecord.jsx

@@ -0,0 +1,528 @@
+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 moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 拼团者弹框
+ */
+class InviteTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { customerId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { customerId } = this.state.visibleData
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList (params) {
+    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 分页
+  onChange (pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render () {
+    const columns = [
+      {
+        title: '用户姓名',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+      },
+      {
+        title: '手机号',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+        render: text => <a>{text}</a>,
+      },
+      {
+        title: '开团时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        align: 'center',
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="参团者"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+
+
+
+
+
+
+/**
+ * 拼团者弹框
+ */
+class Verifier extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      helpRecordInitiateId: { id: '' },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { customerId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { customerId } = 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 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList (params) {
+    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
+        console.log(res);
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verify(e) {
+    console.log('111', e.target.value)
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verification(e) {
+    console.log('this.state.visibleData', this.state.visibleData)
+      alert(1)
+  }
+
+  render () {
+    return (
+      <>
+        <Modal
+          title="核销"
+          destroyOnClose="true"
+          width={300}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
+           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
+          </div>
+        </Modal>
+      </>
+    );
+  }
+}
+
+/**
+ *主体列表
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
+  const [gVerifierData, setVerifierData] = useState({ visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' })
+
+  const { getFieldDecorator, getFieldsValue } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const [columns, setColumns] = useState(privateColumns)
+
+  // 默认成功
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [groupStatus, setgroupStatus] = useState('0')
+
+  // 调整归属 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
+
+  // 变更状态 ============= end
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { groupActivityId } = props.location.query
+  useEffect(() => {
+    getList({ pageNumber: 1, pageSize: 10, status: groupStatus, groupActivityId: groupActivityId })
+  }, [])
+
+  
+  function getFailList(params) {
+    // 网路请求
+    request({ ...apis.groupActivity.shareFailList, params: { ...params } }).then(res => {
+        console.log(res);
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
+        console.log(res);
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  function displayNone() {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    displayNone()
+
+
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, groupStatus, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNum, pageSize: 10, groupStatus })
+  }
+
+  // 助力成功/进行中/助力失败
+  function radioButtonHandleSizeChange(e) {
+    setGInviteData({ visible: true, customerId: '', realtyConsultant: '' })
+    displayNone()
+
+    const { value } = e.target
+    setgroupStatus(value)
+    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
+    if (value == 0) { 
+        console.log("success", value)
+        getList({ pageNumber: 1, pageSize: 10, status: value, groupActivityId }) }
+    if (value == 1 || value == 2) {
+        console.log("faile", value)
+         getFailList({ pageNumber: 1, pageSize: 10, status: value, groupActivityId })
+         }
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10, groupStatus })
+  }
+
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/customerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+
+  function exportCustomer () {
+    const fieldsValue = getFieldsValue()
+    request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, groupStatus } })
+      .then(response => {
+        download(response)
+      }).catch(error => {
+
+      })
+  }
+
+  function download (data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '客户列表.xlsx')
+    document.body.append(link)
+    link.click()
+  }
+
+// 助力记录弹框
+function helpRecord(row) {
+// 关闭核销
+// eslint-disable-next-line max-len
+setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  // eslint-disable-next-line max-len
+  setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+}
+ // 核销
+ function helpInitiateRecordVerify(row) {
+// 关闭助力记录弹框
+// eslint-disable-next-line max-len
+  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  // eslint-disable-next-line max-len
+  setGInviteData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+ }
+
+  const publicColumns = [
+    {
+      title: '拼团者',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '拼团者手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '拼团时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '参团者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
+      align: 'center',
+      width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.joinPeople}/{record.groupBuyPeople}</a>,
+    },
+  ]
+
+  const privateColumns = [
+    {
+      title: '拼团者',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      width: '15%',
+      // render: (_, record) => <Avatar shape="square" src={groupStatus === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      // render: (_, record) => <><span>{groupStatus === 'helpSucceed' ? record.name : record.nickname}</span></>,
+    },
+    {
+      title: '发起时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+    },
+    {
+        title: '成团时间',
+        dataIndex: 'endTime',
+        key: 'endTime',
+        align: 'center',
+        width: '10%',
+        // eslint-disable-next-line no-nested-ternary
+    },
+    {
+      title: '核销状态',
+      dataIndex: 'verificationStatus',
+      key: 'verificationStatus',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (text, records) => {
+        if (records.verificationStatus === 0) { return '未核销' }
+        if (records.verificationStatus === 1) { return '已核销' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '25%',
+      render: (x, row) => (
+        <>
+          {row.verificationStatus === 0 &&
+          <AuthButton name="admin.SignList.get" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
+          </AuthButton>
+        }
+        </>
+      ),
+    },
+  ]
+
+  
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              返回
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+
+      <div style={{ margin: '20px 0' }}>
+        <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          <Radio.Group value={groupStatus} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+            <Radio.Button value="0">拼团成功</Radio.Button>
+            <Radio.Button value="1">进行中</Radio.Button>
+            <Radio.Button value="2">拼团失败</Radio.Button>
+          </Radio.Group>
+        </AuthButton>
+      </div>
+
+      {groupStatus === '0' ?
+        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+      }
+       {/* <InviteTable visibleData={gInviteData} />
+       <Verifier visibleData={gVerifierData} /> */}
+    </>
+  );
+}
+
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/activity/groupActivity/list.jsx

@@ -0,0 +1,278 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+      console.log(params);
+    request({ ...apis.groupActivity.list, params: { ...params } }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到拼团活动新增
+const toEditActivity = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/editGroupActivity',
+      query: {
+        groupActivityId
+      },
+    });
+  }
+  
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD hh:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD hh:mm:ss')}`}</span></>
+    },
+    {
+        title: '所需积分',
+        dataIndex: 'integral',
+        key: 'integral',
+        align: 'center',
+      },
+    {
+      title: '已参与人数',
+      dataIndex: 'joinPeople',
+      key: 'joinPeople',
+      align: 'center',
+    },
+    {
+      title: '成团数',
+      dataIndex: 'groupBuyPeople',
+      key: 'groupBuyPeople',
+      align: 'center',
+    },  
+    {
+      title: '状态',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.activityStatus === 0) { return '进行中' }
+        if (records.activityStatus === 1) { return '未开始' }
+        if (records.activityStatus === 2) { return '已结束' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          {row.activityStatus === 0 &&
+          <AuthButton name="admin.SignList.get" noRight={null}>
+        
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActicityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton> }
+
+          {row.activityStatus === 1 &&
+           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActicityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton>
+          }
+
+          {row.activityStatus === 2 &&
+        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActicityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton>
+          }
+        </>
+      ),
+    },
+  ];
+  const getSignList = groupActivityId => {
+      router.push({
+          pathname: '/activity/groupActivity/helpRecord',
+          query: {
+            groupActivityId,
+          },
+        });
+  }
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10 })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+  //结束活动
+  const endGroupActivity = (row) => () => {
+      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActicityId} }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+
+  //置顶
+  const topGroupActivity = (row, weight) => () => {
+    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, weight: weight } }).then((data) => {
+        console.log(data)
+        message.info('操作成功！')
+        getList({ pageNum: 1, pageSize: 10 })
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+    })
+  }
+
+  //首页推荐
+  const recommendGroupActivity = (row, code) => () => {
+    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, sort: row.sort } }).then((data) => {
+        console.log(data)
+        message.info('操作成功！')
+        getList({ pageNum: 1, pageSize: 10 })
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+    })
+  }
+    
+  //发布活动
+  const sendDynamic = (row) => {
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+      }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const changePageNum = pageNumber => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('activityName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="活动状态">
+              <Option value="0">进行中</Option>
+              <Option value="1">未开始</Option>
+              <Option value="2">已结束</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -30,18 +30,18 @@ const Edit = props => {
   const [tab, changeTab] = useState('basic')
   // 判断是否展示助力次数的输入框
   // const [help, helpTab] = useState('1')
-  const { dynamicId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({})
-  if (dynamicId) {
+  const { helpActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  if (helpActivityId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       // eslint-disable-next-line no-use-before-define
-      getDynamicData(dynamicId);
+      getDynamicData(helpActivityId);
     }, [])
 
-    // 查询列表
-    const getDynamicData = (dynamicId) => {
-      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+    // 详情
+    const getDynamicData = (helpActivityId) => {
+      request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
         console.log(data)
         setDynamicData(data)
       })
@@ -50,9 +50,13 @@ const Edit = props => {
 
   const cancelPage = () => {
     router.push({
-      pathname: '/activity/ActivityList',
+      pathname: '/activity/helpActivity/list',
     });
   }
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
 
   const Basic = props => {
     const fields = [
@@ -63,7 +67,7 @@ const Edit = props => {
         value: dynamicData.buildingId,
         rules: [
           { required: true, message: '请选择项目' },
-        ]
+        ],
       },
       {
         label: '活动标题',
@@ -93,7 +97,7 @@ const Edit = props => {
       },
       {
         label: '助力邀请人数',
-        name: 'personNum',
+        name: 'persionNum',
         type: FieldTypes.Text,
         value: dynamicData.persionNum,
         rules: [
@@ -102,25 +106,28 @@ const Edit = props => {
       },
       {
         label: '助力次数',
-        name: 'maxEnlistByPerson',
+        name: 'helpNumStatus',
         type: FieldTypes.Text,
-        value: dynamicData.helpNum,
+        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
         rules: [
           { required: true, message: '请选择是否助力' },
         ],
-        render: <Radio.Group name="radiogroup">
-        <Radio value={1}>不限制</Radio>
-        <Radio value={0}>次数限制</Radio>
+        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
+        <Radio value={0}>不限制</Radio>
+        <Radio value={1}>次数限制</Radio>
       </Radio.Group>,
       },
+
       {
-        label: ' ',
-        name: 'personNum',
-        type: FieldTypes.Text,
-        value: dynamicData.personNum,
-        rules: [
-          { required: true, message: '请输入次数' },
-        ],
+        label: '请输入助力人数',
+        name: 'helpNum',
+        // type: FieldTypes.RangePicker,
+        render: dynamicData.isEnlist === 1 ? (<Input/>) : '',
+        value: dynamicData.helpNum,
+        // props: {showTime:{ format: 'HH:mm' }},
+        // rules: [
+        //   { required: true, message: '请输入助力人数' },
+        // ],
       },
       {
         label: '活动说明',
@@ -141,22 +148,22 @@ const Edit = props => {
       // submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
       // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
-      // if (dynamicId) {
-      //   submitValue.dynamicId = dynamicId
-      //   request({ ...apis.activity.update, data: submitValue }).then((data) => {
-      //     message.info("保存成功")
-      //     cancelPage()
-      //   }).catch((err) => {
-      //     message.info(err.msg || err.message)
-      //   })
-      // } else {
-      //   request({ ...apis.activity.add, data: submitValue }).then((data) => {
-      //     message.info("保存成功")
-      //     cancelPage()
-      //   }).catch((err) => {
-      //     message.info(err.msg || err.message)
-      //   })
-      // }
+      if (helpActivityId) {
+        submitValue.helpActivityId = helpActivityId
+        request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.helpActivity.add, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
     }
 
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
@@ -168,10 +175,10 @@ const Edit = props => {
     const [imgValue, changeImg] = useState('')
     const [posterId, setPosterId] = useState('')
 
-    if (dynamicId) {
-      console.log(dynamicId, 'dynamicId')
+    if (helpActivityId) {
+      console.log(helpActivityId, 'helpActivityId')
       useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
+        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setPosterId(data[0].posterId)
@@ -197,15 +204,15 @@ const Edit = props => {
     }
 
     const submitPoster = () => {
-      if (dynamicId) {
+      if (helpActivityId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -257,15 +264,15 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
           </div>
           <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
             <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
@@ -284,9 +291,9 @@ const Edit = props => {
     const [imgValue, changeImg] = useState('')
     const [shareContentId, setShareContentId] = useState('')
 
-    if (dynamicId) {
+    if (helpActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helPactivity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
@@ -300,15 +307,15 @@ const Edit = props => {
     }
 
     const submitShare = () => {
-      if (dynamicId) {
+      if (helpActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {
@@ -322,7 +329,7 @@ const Edit = props => {
 
     return <div style={{ padding: '20px' }}>
       <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
         <div>
           <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
           <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
@@ -330,11 +337,11 @@ const Edit = props => {
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
@@ -346,9 +353,9 @@ const Edit = props => {
     <div>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="basic">基本信息1</Radio.Button>
-          <Radio.Button value="poster">海报图片1</Radio.Button>
-          <Radio.Button value="share">分享设置1</Radio.Button>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
         </Radio.Group>
       </div>
       <div>
@@ -359,7 +366,4 @@ const Edit = props => {
     </div>
   );
 }
-
-
-
 export default Edit

src/pages/activity/helpActivity/helpRecord.jsx

@@ -1,5 +1,5 @@
 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';
@@ -13,12 +13,226 @@ const { Option } = Select;
 const { Meta } = Card;
 
 /**
- *
+ * 助力者弹框
+ */
+class InviteTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { customerId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { customerId } = this.state.visibleData
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList (params) {
+    request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 分页
+  onChange (pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render () {
+    const columns = [
+      {
+        title: '用户姓名',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+      },
+      {
+        title: '手机号',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+        render: text => <a>{text}</a>,
+      },
+      {
+        title: '助力时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        align: 'center',
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="助力者"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+
+          
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+
+/**
+ * 助力者弹框
+ */
+class Verifier extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      verification: { verificationCode: '' },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '', verificationCode: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { customerId } = this.state.visibleData
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { customerId } = this.state.visibleData
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, verificationCode: '' } })
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  getList (params) {
+    request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
+      // eslint-disable-next-line no-undef
+      message.info('核销成功')
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verify(e) {
+    this.setState({ visibleData: { visible: true, customerId: this.props.visibleData.customerId, verificationCode: e.target.value } })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verification(e) {
+    this.getList({ helpRecordInitiateId: this.state.visibleData.customerId, verifyCode: this.state.visibleData.verificationCode })
+  }
+
+  //  exportCustomer() {
+  //   const code = customerType === 'helpSucceed' ? 1 : 0
+  //   request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, code } })
+  //     .then(response => {
+  //       download(response)
+  //     }).catch(() => {
+
+  //     })
+  // }
+
+  //  download(data) {
+  //   if (!data) {
+  //     return
+  //   }
+  //   const url = window.URL.createObjectURL(new Blob([data]))
+  //   const link = document.createElement('a')
+  //   link.style.display = 'none'
+  //   link.href = url
+  //   link.setAttribute('download', '助力记录.xlsx')
+  //   document.body.append(link)
+  //   link.click()
+  // }
+
+
+
+  render () {
+    return (
+      <>
+        <Modal
+          title="核销"
+          destroyOnClose="true"
+          width={300}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
+           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
+          </div>
+        </Modal>
+      </>
+    );
+  }
+}
+
+/**
+ *主体列表
  *
  * @param {*} props
  * @returns
  */
 function body(props) {
+  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
+  const [gVerifierData, setVerifierData] = useState({ visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' })
+
   const { getFieldDecorator, getFieldsValue } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -26,33 +240,27 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   // const [columns, setColumns] = useState(privateColumns)
 
-  // 默认私客
+  // 默认成功
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [customerType, setCustomerType] = useState('private')
+  const [customerType, setCustomerType] = useState('helpSucceed')
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
-  // 调整归属 ============= end
 
-  // 积分记录 ============  start
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
-  // 积分记录 ============= end
 
-  // 变更状态 ============  start
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
   // 变更状态 ============= end
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { helpActivityId } = props.location.query
   useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10, customerType })
+    console.log('customerType', customerType)
+    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
   }, [])
 
   function getList(params) {
     // 网路请求
-    request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
+    request({ ...apis.helpActivity.record, params: { ...params } }).then(res => {
       setDataSource(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -68,9 +276,7 @@ function body(props) {
   }
 
   function displayNone() {
-    setRecordVisibleData({ visible: false, customerId: '' })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: false, customerId: '', status: '' })
   }
 
   // 提交事件
@@ -98,14 +304,15 @@ function body(props) {
     getList({ pageNumber: pageNum, pageSize: 10, customerType })
   }
 
-  // 私客/公客切换
+  // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
+    setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })
     displayNone()
 
     const { value } = e.target
     setCustomerType(value)
-    //setColumns(value === 'private' ? privateColumns : publicColumns)
-    getList({ pageNumber: 1, pageSize: 10, customerType: value })
+    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
+    getList({ pageNumber: 1, pageSize: 10, status: value, helpActivityId })
   }
 
   function handleReset() {
@@ -113,27 +320,6 @@ function body(props) {
     getList({ pageNumber: 1, pageSize: 10, customerType })
   }
 
-
-  // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
-  // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
-
-  function showGM(record) {
-    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
-    setRecordVisibleData({ visible: false, customerId: '' })
-    setStatusVisibleData({ visible: false, customerId: '' })
-  }
-
-  function showRecord(record) {
-    setRecordVisibleData({ visible: true, customerId: record.customerId })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: false, customerId: '' })
-  }
-
-  function showStatus(record) {
-    setRecordVisibleData({ visible: false, customerId: '' })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
-  }
   function toCustomerDateil(record) {
     router.push({
       pathname: '/customer/customerlist/customerDetail',
@@ -145,7 +331,8 @@ function body(props) {
 
   function exportCustomer () {
     const fieldsValue = getFieldsValue()
-    request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, customerType } })
+    const code = customerType === 'helpSucceed' ? 1 : 0
+    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, code } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -161,113 +348,109 @@ function body(props) {
     const link = document.createElement('a')
     link.style.display = 'none'
     link.href = url
-    link.setAttribute('download', '客户列表.xlsx')
+    link.setAttribute('download', '助力记录.xlsx')
     document.body.append(link)
     link.click()
   }
 
+// 助力记录弹框
+function helpRecord(row) {
+// 关闭核销
+console.log('gInviteData', gInviteData)
+
+
+  setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+  setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+}
+ // 核销
+ function helpInitiateRecordVerify(row) {
+
+  console.log('gVerifierData', gVerifierData)
+// 关闭助力记录弹框
+  setGInviteData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+
+ }
+
   const publicColumns = [
     {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
+      title: '发起者',
+      dataIndex: 'name',
+      key: 'name',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
+      title: '发起者手机号',
+      dataIndex: 'phone',
+      key: 'phone',
       align: 'center',
       width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
       align: 'center',
       width: '15%',
     },
     {
-      title: '推广人员',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
       align: 'center',
       width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
     },
   ]
 
   const privateColumns = [
     {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
-      align: 'center',
-      width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
-    },
-    {
-      title: '姓名',
+      title: '发起者',
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      width: '15%',
+      // render: (_, record) => <Avatar shape="square" src={customerType === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
-      title: '电话',
+      title: '手机号',
       dataIndex: 'phone',
       key: 'phone',
       align: 'center',
-      width: '15%',
-    },
-    {
-      title: '性别',
-      dataIndex: 'sex',
-      key: 'sex',
-      align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+      // render: (_, record) => <><span>{customerType === 'helpSucceed' ? record.name : record.nickname}</span></>,
     },
     {
-      title: '置业顾问',
-      dataIndex: 'consultantName',
-      key: 'consultantName',
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
       align: 'center',
-      width: '15%',
+      width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => (
-        <>
-          <span>{record.consultantName}</span>
-          <br />
-          <span>{record.consultTel}</span>
-        </>
-      ),
     },
     {
-      title: '推广人员',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
       align: 'center',
       width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
     },
     {
-      title: '客户状态',
+      title: '核销状态',
       dataIndex: 'reportRecommendStatus',
       key: 'reportRecommendStatus',
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
       render: (text, records) => {
-        if (records.status === 1) { return '报备' }
-        if (records.status === 2) { return '到访' }
-        if (records.status === 3) { return '认筹' }
-        if (records.status === 4) { return '签约' }
+        if (records.verificationStatus === 0) { return '未核销' }
+        if (records.verificationStatus === 1) { return '已核销' }
       },
     },
     {
@@ -276,7 +459,15 @@ function body(props) {
       key: 'customerId',
       align: 'center',
       width: '25%',
-      // eslint-disable-next-line no-nested-ternary
+      render: (x, row) => (
+        <>
+          {row.verificationStatus === 0 &&
+          <AuthButton name="admin.SignList.get" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
+          </AuthButton>
+        }
+        </>
+      ),
     },
   ]
 
@@ -308,19 +499,21 @@ function body(props) {
         导出
       </Button>
 
-      <div style={{ margin: '20px 0'}}>
+      <div style={{ margin: '20px 0' }}>
         <AuthButton name="admin.customer.recommend.get" noRight={null}>
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-            <Radio.Button value="private">助力成功</Radio.Button>
-            <Radio.Button value="public">进行中</Radio.Button>
-            <Radio.Button value="error ">助力失败</Radio.Button>
+            <Radio.Button value="helpSucceed">助力成功</Radio.Button>
+            <Radio.Button value="helpUnderway">进行中</Radio.Button>
+            <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
           </Radio.Group>
         </AuthButton>
       </div>
-      {customerType === 'private' ? 
-        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+      {customerType === 'helpSucceed' ?
+        <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
+       <InviteTable visibleData={gInviteData} />
+       <Verifier visibleData={gVerifierData} />
     </>
   );
 }

src/pages/activity/helpActivity/list.jsx

@@ -13,7 +13,7 @@ import AuthButton from '@/components/AuthButton';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-const header = (props) => {
+const header = props => {
   const [ data, setData ] = useState({})
 //   const [page, changePage] = useState({})
 
@@ -31,11 +31,11 @@ const header = (props) => {
 
   
 // 跳转到助力新增
-const toEditGoods = (dynamicId) => () => {
+const toEditGoods = (helpActivityId) => () => {
     router.push({
       pathname: '/activity/helpActivity/edithelpActivity',
       query: {
-        dynamicId
+        helpActivityId
       },
     });
   }
@@ -79,9 +79,9 @@ const toEditGoods = (dynamicId) => () => {
       key: 'isEnlist',
       align: 'center',
       render: (text, records) => {
-        if (records.status === 0) { return '未开始' }
-        if (records.status === 1) { return '进行中' }
-        if (records.status === 2) { return '已结束' }
+        if (records.activityStatus === 0) { return '未开始' }
+        if (records.activityStatus === 1) { return '进行中' }
+        if (records.activityStatus === 2) { return '已结束' }
       },
     },
     {
@@ -89,31 +89,42 @@ const toEditGoods = (dynamicId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
+          {row.activityStatus === 1 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "助力记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.isEnlist != 2 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
-          </AuthButton>
+        
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton> }
+
+          {row.activityStatus === 0 &&
+           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
+          }
+
+          {row.activityStatus === 2 &&
+        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton>
+          }
         </>
-      )
+      ),
     },
   ];
-  
-  const getSignList = (dynamicId) => {
+  const getSignList = helpActivityId => {
       router.push({
           pathname: '/activity/helpActivity/helpRecord',
           query: {
-              dynamicId
+            helpActivityId,
           },
         });
   }
@@ -137,9 +148,8 @@ const toEditGoods = (dynamicId) => () => {
   }
   
 //   置顶
-  const topDynamic = (row) => () => {
-      const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
+  const topDynamic = (row, code) => () => {
+      request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -149,13 +159,13 @@ const toEditGoods = (dynamicId) => () => {
       })
   }
   
-  const sendOrPublicDynamic = (row) => {
-      if (row.status === 1) {
-          cancelDynamic(row)
-      } else {
-          sendDynamic(row)
-      }
-  }
+  // const sendOrPublicDynamic = (row) => {
+  //     if (row.status === 1) {
+  //         cancelDynamic(row)
+  //     } else {
+  //         sendDynamic(row)
+  //     }
+  // }
   
   // 取消活动
   const cancelDynamic = (row) => {
@@ -229,11 +239,11 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item> */}
         <Form.Item>
-          {getFieldDecorator('isEnlist')(
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="活动状态">
+              <Option value="0">未开始</Option>
               <Option value="1">进行中</Option>
-              <Option value="2">未开始</Option>
-              <Option value="3">已结束</Option>
+              <Option value="2">已结束</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/news/list/NewsList.jsx

@@ -92,13 +92,13 @@ function body(props) {
     }
 
     //删除资讯
-    const changeNewsListStatus = (newsId) => () => {
+    const changeNewsListStatus = (row, newsId) => () => {
       Modal.confirm({
         title: '确认删除该资讯？',
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          request({ ...apis.news.delete, urlData: { id: newsId }, }).then((data) => {
+          request({ ...apis.news.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
           }).catch((err) => {
@@ -201,7 +201,7 @@ function body(props) {
           }
         </AuthButton>
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
-          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
             删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>

src/pages/news/type/NewsType.jsx

@@ -60,7 +60,8 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.newsType.delete, urlData: { id: newsId },}).then((data) => {
+
+        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
         }).catch((err) => {

src/services/apis.js

@@ -715,6 +715,88 @@ export default {
     method: 'GET',
     action: 'admin.taRole.get',
   },
+  add: {
+    url: `${prefix}/helpActivity/add`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  details: {
+    url: `${prefix}/helpActivity/details`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  update: {
+    url: `${prefix}/helpActivity/update`,
+    method: 'put',
+    action: 'admin.taRole.get',
+  },
+  top: {
+    url: `${prefix}/top/update`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  record: {
+    url: `${prefix}/helpRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  helpPeopleDetails: {
+    url: `${prefix}/taHelpRecord/details`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  verification: {
+    url: `${prefix}/helpInitiateRecordVerify`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  HelpInitiateRecordSucceed: {
+    url: `${prefix}/HelpInitiateRecordSucceed/export`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+ },
+ groupActivity: {
+  list: {
+    url: `${prefix}/taShareActivity/list`,
+    method: 'get',
+    action: 'admin.taShareActivity.get',
+  },
+  add: {
+    url: `${prefix}/taShareActivity`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  details: {
+    url: `${prefix}/taShareActivity/:id`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  update: {
+    url: `${prefix}/taShareActivity/update`,
+    method: 'put',
+    action: 'admin.taRole.get',
+  },
+  finish: {
+    url: `${prefix}/taShareActivity/finish/:id`,
+    method: 'put',
+    action: 'admin.taShareActivity.finish',
+  },
+  top: {
+    url: `${prefix}/taShareActivity/weight`,
+    method: 'put',
+    action: 'admin.taShareActivity.weight',
+  },
+  shareSuccList: {
+    url: `${prefix}/taShareSuccessRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  shareFailList : {
+    url: `${prefix}/taShareFailAndProcessingRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  }
  },
  third: {
   thirdPartyMiniapp: {