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

src/pages/activity/SignList.jsx

     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>
+    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>,
   },
   {
     title: '推广人',
     key: 'orgName',
     align: 'center',
   },
+  {
+    title: '状态',
+    dataIndex: 'isCheckin',
+    key: 'isCheckin',
+    align: 'center',
+    render: (x, row) => <><span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span></>,
+  },
 ];
 
 
 
-const header = (props) => {
-  const [ data, setData ] = useState({list: {}})
+const header = props => {
+  const [data, setData] = useState({list: {}})
 //   const [page, changePage] = useState({})
+// 存入导入数据的值
+const { getFieldDecorator, getFieldsValue } = props.form
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getSignList({pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId });
-  },[])
+    // eslint-disable-next-line no-use-before-define
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }, [])
 
   // 查询列表
-  const getSignList = (params) => {
-    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
+  const getSignList = params => {
+    // eslint-disable-next-line no-shadow
+    request({ ...apis.activity.signList, params: { ...params } }).then(data => {
         console.log(data)
         setData(data)
     })
       pathname: '/activity/ActivityList',
     });
   }
+    // 提交事件
+// eslint-disable-next-line no-shadow
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId, isCheckin: values.isCheckin, name: values.name, phone: values.phone })
+    });
+  }
+   // 重置搜索
+   function handleReset() {
+    props.form.resetFields();
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId })
+  }
+ // eslint-disable-next-line class-methods-use-this
+ function exportHelp() {
+  const fieldsValue = getFieldsValue()
+  console.log('fieldsValue', fieldsValue)
+    request({ ...apis.activity.getTaActivityDynamicEnlistExport, params: { ...fieldsValue, dynamicId: props.location.query.dynamicId } })
+      .then(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()
+      }).catch(() => {
+
+      })
+  }
 
   return (
     <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('isCheckin')(
+            <Select style={{ width: '180px' }} placeholder="签到状态">
+              <Option value="0">未签到</Option>
+              <Option value="1">已签到</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="用户姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="手机号"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
+      <Button type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/activity/groupActivity/editGroupActivity.jsx

       submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
       if (groupActivityId) {
-        submitValue.groupActicityId = groupActivityId
+        submitValue.groupActivityId = groupActivityId
         request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()

src/pages/activity/groupActivity/helpRecord.jsx

 
   componentDidUpdate (preProps, preState) {
     const { groupActivityId } = this.props.visibleData
-    console.log("groupActivityId",this.props.visibleData);
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });

src/pages/activity/groupActivity/list.jsx

           {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={ getSignList.bind(this, row.groupActivityId)}>拼团记录<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>
 
           {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: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<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>
 
           {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', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<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 endGroupActivity = (row) => () => {
-      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActicityId} }).then((data) => {
+      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId} }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
 
   //置顶
   const topGroupActivity = (row, weight) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, weight: weight } }).then((data) => {
+    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, weight: weight } }).then((data) => {
         console.log(data)
         message.info('操作成功！')
         getList({ pageNum: 1, pageSize: 10 })
 
   //首页推荐
   const recommendGroupActivity = (row, code) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, sort: row.sort } }).then((data) => {
+    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
         console.log(data)
         message.info('操作成功！')
         getList({ pageNum: 1, pageSize: 10 })

src/pages/activity/helpActivity/helpRecord.jsx

 
   // eslint-disable-next-line class-methods-use-this
   exportHelp() {
-    console.log('this.state.25252464122', this.state.visibleData)
     request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
       .then(data => {
         if (!data) {

src/services/apis.js

         method: 'GET',
         action: 'admin.SignList.get',
       },
+      getTaActivityDynamicEnlistExport: {
+        url: `${prefix}/activityDynamicEnlist/export`,
+        method: 'GET',
+        action: 'admin.SignList.get',
+      },
       taDrainage: {
         url: `${prefix}/taDrainage`,
         method: 'GET',