合并

config/routes.js

@@ -114,7 +114,7 @@ export default [
               },
               {
                 path: '/customer/recommendCustomer/audit',
-                name: '客户审核', 
+                name: '客户审核',
                 hideInMenu: true,
                 component: './customer/recommendCustomer/audit',
               },
@@ -263,6 +263,17 @@ export default [
                 hideInMenu: true,
                 component: './activity/SignList',
               },
+              {
+                path: '/activity/drainage/DrainageList',
+                name: '全网投放引流',
+                component: './activity/drainage/DrainageList',
+              },
+              {
+                path: '/activity/drainage/Detail',
+                name: '查看详情',
+                hideInMenu: true,
+                component: './activity/drainage/Detail',
+              },
               {
                 path: '/activity/helpActivity/list',
                 name: '助力活动',
@@ -334,7 +345,7 @@ export default [
                 name: '添加角色',
                 hideInMenu: true,
                 component: './staff/list/addRole',
-              },  
+              },
             ],
           },
           {

src/pages/activity/drainage/Detail.jsx

@@ -0,0 +1,144 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import { SSL_OP_SSLEAY_080_CLIENT_DH_BUG } from 'constants';
+
+
+
+const data = []
+
+const header = (props) => {
+  const drainageId = props.location.query.drainageId
+
+
+  const [datas, setDatas] = useState([])
+  const [content, setContent] = useState([{}, {}])
+  const [columns, setColumns] = useState([])
+  const [startDate, setStartDate] = useState('')
+  const [endDate, setEndDate] = useState('')
+  let daterange = []
+  // let content = {}
+  useEffect(() => {
+
+    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId })
+
+  }, [])
+
+  function gettaDrainageRecord (params) {
+    request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
+      // setDatas(data)
+      console.log(data, '3333333333333')
+      setDatas(tableData(data.records))
+      // content = data.records[0]
+      console.log('json: ', eval('(' + data.records[0].content + ')'))
+      setContent(eval('(' + data.records[0].content + ')'))
+      setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+  function tableData (data) {
+    console.log('data', data)
+    return data.map((row, inx) => {
+      return eval('(' + row.content + ')').reduce((acc, col) => {
+        const r = {
+          key: inx + 1,
+          [`${col.key}`]: col.value,
+          ...acc,
+        }
+        console.log('r', r)
+        return r
+      }, {})
+    })
+  }
+
+  function tableTitle (data) {
+    return data.map((item) => {
+      const col = {
+        title: item.label,
+        dataIndex: item.key,
+        key: item.key
+      }
+      return col
+    })
+  }
+
+
+  function datalist() {
+
+    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate)  })
+  }
+
+  function fromTime(str) {
+    return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
+  }
+
+  function onChangetime(dates, dateStrings) {
+ 
+    setEndDate(dateStrings[1])
+    setStartDate(dateStrings[0])
+    
+  }
+
+  function excelPort(){
+    // const fieldsValue = getFieldsValue()
+    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate) }  })
+      .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()
+  }
+
+  const { RangePicker } = DatePicker;
+  return (
+    <>
+
+<RangePicker
+          style={{ width: '400px' }}
+          // ranges={{
+          //   Today: [moment(), moment()],
+          //   'This Month': [moment().startOf('month'), moment().endOf('month')],
+          // }}
+          // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+          showTime
+          onChange={onChangetime}
+        />
+        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
+          搜索
+      </Button>
+    
+      <div>
+        {/* H5项目名称 */}
+        {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px',marginBottom: '30px' }} onClick={excelPort}>导出数据</Button>
+        <Table columns={columns} dataSource={datas}  pagination={false} />
+      </div>
+
+
+
+
+    </>
+  )
+}
+
+
+export default header

src/pages/activity/drainage/DrainageList.jsx

@@ -0,0 +1,323 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import moment from 'moment';
+
+const toEditList = (drainageId) => () => {
+  console.log(drainageId,'12344567')
+  router.push({
+    pathname: '/activity/drainage/Detail',
+    query: {
+      drainageId
+    },
+  });
+}
+
+
+
+const data = [
+
+  {
+    Id: '1',
+    name: 'zls',
+    // StartTime:'',
+    // EndTime:'',
+    number: 33,
+  }
+
+
+];
+
+const header = (props) => {
+  // const [data, setData] = useState({ data: [] })
+  const [datas, setDatas] = useState([])//表格数据
+  const [date, setDate] = useState({})
+  const [formsdate, setFormsDate] = useState({})
+  //   const [page, changePage] = useState({})
+  useEffect(() => {
+
+    gettaDrainage({ pageNum: 1, pageSize: 10 })
+    setDate({
+      ModalText: 'Content of the modal',
+      visible: false,
+      confirmLoading: false,
+    })
+    
+  }, [])
+
+  function gettaDrainage (params) {
+    request({ ...apis.activity.taDrainage, params: params  }).then((data) => {
+      setDatas(data)
+      console.log(data.records, '_213_')
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  const deleteDrainage = (drainageIid) => () => {
+    Modal.confirm({
+      title: '确认删除该引流？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }).then((data) => {
+          message.info('操作成功！')
+          gettaDrainage({ pageNum: 1, pageSize: 10 })
+        }).catch((err) => {
+          console.log('111111',err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+  
+  const columns = [
+    {
+      title: 'H5项目编号',
+      dataIndex: 'drainageId',
+      key: 'drainageId',
+      align: 'center',
+    },
+    {
+      title: 'H5项目名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+    },
+    {
+      title: '新建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.createDate && moment(row.createDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '截止时间',
+      dataIndex: 'endDate',
+      key: 'endDate',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.endDate && moment(row.endDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '参与数',
+      dataIndex: 'enlistNum',
+      key: 'enlistNum',
+      align: 'center',
+      // render:
+    },
+    {
+      title: '操作',
+      key: 'action',
+      align: 'center',
+      render: (text, datas) => (
+        <>
+          <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas.drainageId)}>
+            查看详情
+            </span>
+  
+          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
+            删除
+            </span>
+        </>
+      ),
+    },
+  ];
+  const Forms = props => {
+   
+    console.log(date,'---------------')
+    console.log(formsdate,'---------------')
+    console.log(formsdate,'22222222')
+    const fields = [
+      {
+        label: 'H5项目名称',
+        name: 'name',
+        type: FieldTypes.Text,
+        placeholder:"请输入H5项目名称",
+        value: formsdate.name,
+
+      },
+      {
+        label: '截止时间',
+        name: 'endDate',
+        type: FieldTypes.DatePicker,
+        value:formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+        // render: <DatePicker placeholder="截止时间" value= {formsdate.endDate} />,
+      },
+
+
+    ]
+
+    const handleSubmit = val => {
+      console.log(date,'111---------------')
+    console.log(formsdate,'111---------------')
+    console.log(formsdate,'11122222222')
+      // data: { ...submitValue }
+      alert(val)
+      console.log(formsdate.drainageId,'9999999999999')
+      if (formsdate.drainageId) {
+        // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
+        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val}).then((data) => {
+          message.info('操作成功！')
+          // gettaDrainage({ pageNum: 1, pageSize: 10 })
+        }).catch((err) => {
+          console.log('111111',err)
+          message.info(err.msg || err.message)
+        })
+       
+      } else {
+
+     
+
+        request({ ...apis.activity.addtaDrainage, data: val }).then((data) => {
+          message.info("保存成功")
+          console.log(data, '22222')
+          
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+    }
+
+    return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+    
+  }
+
+
+
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+  }
+
+  
+
+  function addshowModal (datas) {
+
+    // alert(datas.drainageId)
+console.log(datas,'22222222')
+    setFormsDate({
+      drainageId:datas.drainageId,
+      name:datas.name,
+      endDate:datas.endDate,
+    })
+    console.log(formsdate,'22222222')
+    setDate({
+      visible: true,
+    });
+  };
+  function showModal () {
+    setFormsDate({
+      drainageId:'',
+      name:'',
+      endDate:'',
+    })
+    setDate({
+      visible: true,
+    });
+  };
+
+
+  function handleOk () {
+
+
+    setDate({
+      ModalText: 'The modal will be closed after two seconds',
+      confirmLoading: true,
+    });
+    function setTimeout () {
+      setDate({
+        visible: false,
+        confirmLoading: false,
+      });
+    };
+  };
+
+  function handleCancel () {
+    console.log('Clicked cancel button');
+    setDate({
+      visible: false,
+    });
+  };
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log('values', values)
+      if (!err) {
+        console.log('values', values)
+        gettaDrainage({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  const { visible, confirmLoading, ModalText } = date;
+  return (
+    <>
+      <div>
+        <Form layout="inline" onSubmit={handleSubmit}>
+          <Form.Item>
+            {getFieldDecorator('drainageId')(
+              <Input
+                // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="H5项目编号"
+              />,
+
+              // {getFieldDecorator('name', {
+              // })(<Input/>)}
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('name')(
+              <Input
+                // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="H5项目名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
+              搜索
+          </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={showModal}>新增</Button>
+
+        <Modal
+          title="新建H5项目"
+          visible={visible}
+          //  onOk={handleOk}
+          confirmLoading={confirmLoading}
+          onCancel={handleCancel}
+          footer={null}
+        >
+          <Forms />
+        </Modal>
+        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList"/>
+     
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

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

@@ -60,7 +60,7 @@ const toEditActivity = (groupActivityId) => () => {
       dataIndex: 'startTime',
       key: 'startTime',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD')} —— ${moment(row.endTime).format('YYYY-MM-DD')}`}</span></>
+      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: '所需积分',
@@ -82,13 +82,13 @@ const toEditActivity = (groupActivityId) => () => {
     },  
     {
       title: '状态',
-      dataIndex: 'status',
-      key: 'status',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
       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 '已结束' }
       },
     },
     {
@@ -98,16 +98,16 @@ const toEditActivity = (groupActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.status === 0 &&
+          {row.activityStatus === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
         
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <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.status === 1 &&
+          {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>
@@ -116,9 +116,9 @@ const toEditActivity = (groupActivityId) => () => {
         </AuthButton>
           }
 
-          {row.status === 2 &&
+          {row.activityStatus === 2 &&
         <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <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>
@@ -127,11 +127,11 @@ const toEditActivity = (groupActivityId) => () => {
       ),
     },
   ];
-  const getSignList = recordId => {
+  const getSignList = groupActivityId => {
       router.push({
           pathname: '/activity/groupActivity/helpRecord',
           query: {
-            recordId,
+            groupActivityId,
           },
         });
   }

src/services/apis.js

@@ -357,6 +357,7 @@ export default {
       url: `${prefix}/selectCityUser`,
       action: 'admin.selectCityUser.get',
     },
+    
 
   },
   activity: {
@@ -434,6 +435,36 @@ export default {
         url: `${prefix}/SignList`,
         method: 'GET',
         action: 'admin.SignList.get',
+      },
+      taDrainage: {
+        url: `${prefix}/taDrainage`,
+        method: 'GET',
+        action: 'admin.taDrainage.get',
+      },
+      addtaDrainage: {
+        url: `${prefix}/taDrainage/add`,
+        method: 'POST',
+        action: 'admin.taDrainage.add.post',
+      },
+      deletetaDrainage: {
+        url: `${prefix}/taDrainage/:id`,
+        method: 'DELETE',
+        action: 'admin.taDrainage.id.delete',
+      },
+      updatetaDrainage: {
+        url: `${prefix}/taDrainage/:id`,
+        method: 'PUT',
+        action: 'admin.taDrainage.id.put',
+      },
+      taDrainageRecord:{
+        url: `${prefix}/taDrainageRecord`,
+        method: 'GET',
+        action: 'admin.taDrainageRecord.get',
+      },
+      exporttaDrainageRecord:{
+        url: `${prefix}/taDrainageRecord/export`,
+        method: 'GET',
+        action: 'admin.taDrainageRecord/export.get',
       }
   },
   integralMall: {
@@ -761,11 +792,16 @@ export default {
     method: 'put',
     action: 'admin.taShareActivity.weight',
   },
-  record: {
-    url: `${prefix}/helpRecord`,
+  shareSuccList: {
+    url: `${prefix}/taShareSuccessRecord`,
     method: 'get',
     action: 'admin.taRole.get',
   },
+  shareFailList : {
+    url: `${prefix}/taShareFailAndProcessingRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  }
  },
  third: {
   thirdPartyMiniapp: {