commit

config/routes.js

@@ -244,7 +244,7 @@ export default [
                 component: './activity/ActivityList',
               },
               {
-                path: '/activity/editActivity',
+                path: '/activity/editActivity', 
                 name: '编辑活动',
                 hideInMenu: true,
                 component: './activity/editActivity',

src/pages/activity/SignList.jsx

@@ -67,10 +67,10 @@ const columns = [
 
 
 const header = props => {
-  const [data, setData] = useState({list: {}})
-//   const [page, changePage] = useState({})
-// 存入导入数据的值
-const { getFieldDecorator, getFieldsValue } = props.form
+  const [data, setData] = useState({ list: {} })
+  //   const [page, changePage] = useState({})
+  // 存入导入数据的值
+  const { getFieldDecorator, getFieldsValue } = props.form
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
@@ -81,8 +81,8 @@ const { getFieldDecorator, getFieldsValue } = props.form
   const getSignList = params => {
     // eslint-disable-next-line no-shadow
     request({ ...apis.activity.signList, params: { ...params } }).then(data => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
@@ -95,23 +95,23 @@ const { getFieldDecorator, getFieldsValue } = props.form
       pathname: '/activity/ActivityList',
     });
   }
-    // 提交事件
-// eslint-disable-next-line no-shadow
-const handleSubmit = (e, props) => {
+  // 提交事件
+  // 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() {
+  // 重置搜索
+  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)
+  // 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) {
@@ -131,7 +131,7 @@ const handleSubmit = (e, props) => {
 
   return (
     <>
-    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('isCheckin')(
             <Select style={{ width: '180px' }} placeholder="签到状态">
@@ -161,13 +161,14 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
+        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>返回</Button>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
-      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
-      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity"/>
+
+     <div style={{textAlign:'right',margin:'6px 0 10px 0'}}> <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" onClick={exportHelp}>导出</Button></div>
+      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity" />
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div> */}

src/pages/activity/dataRecord/index.jsx

@@ -46,7 +46,7 @@ const DataRecord = props => {
         <div>
             <div>
                 <span>{data.activityName || '0'}</span>
-                <Button type="primary" style={{ float: 'right', marginLeft: '20px', zIndex: 1 }} onClick={() => router.go(-1)}>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
                     返回
                </Button>
             </div>

src/pages/activity/drainage/Detail.jsx

@@ -30,7 +30,7 @@ const header = (props) => {
 
   }, [])
 
-  function gettaDrainageRecord (params) {
+  function gettaDrainageRecord(params) {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
       // setDatas(data) 
       console.log(data, '3333333333333')
@@ -54,7 +54,7 @@ const header = (props) => {
       message.info(err.msg || err.message)
     })
   }
-  function tableData (data) {
+  function tableData(data) {
     console.log('tabledata', data)
     return data.map((row, inx) => {
       return eval('(' + row.content + ')').reduce((acc, col) => {
@@ -71,7 +71,7 @@ const header = (props) => {
     })
   }
 
-  function tableTitle (data) {
+  function tableTitle(data) {
     tableTitle = eval('(' + data[0].content + ')')
     const cols = [{
       title: "提交时间",
@@ -93,15 +93,15 @@ const header = (props) => {
   //   gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
   // }
 
-  function fromTime (str) {
+  function fromTime(str) {
     return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
   }
 
-  function Time (str) {
+  function Time(str) {
     return str === '' ? null : `${moment(str).format('YYYY-MM-DD')}`
   }
   // 2019-10-30T11:04:49
-  function onChangetime (dates, dateStrings) {
+  function onChangetime(dates, dateStrings) {
     console.log(dateStrings[1])
     setEndDate(dateStrings[1])
     setStartDate(dateStrings[0])
@@ -113,7 +113,7 @@ const header = (props) => {
   }
 
 
-  function excelPort () {
+  function excelPort() {
     // const fieldsValue = getFieldsValue()
 
     request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
@@ -126,7 +126,7 @@ const header = (props) => {
 
 
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -139,7 +139,7 @@ const header = (props) => {
     link.click()
   }
 
-  function handleReset (e) {
+  function handleReset(e) {
     console.log(e)
     props.form.resetFields();
     setEndDate('')
@@ -157,10 +157,10 @@ const header = (props) => {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item label="提交时间">
-        {getFieldDecorator('time')(
-            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss" 
-            showTime
-            onChange={onChangetime}
+          {getFieldDecorator('time')(
+            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss"
+              showTime
+              onChange={onChangetime}
             />,
           )}
         </Form.Item>
@@ -171,7 +171,7 @@ const header = (props) => {
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
-            <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
         </Form.Item>
       </Form>
       <div>

src/pages/activity/groupActivity/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, message} 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';
@@ -20,17 +20,17 @@ class InviteTable extends React.Component {
     super(props);
     this.state = {
       dataSource: { records: [] },
-      visibleData: { visible: false, groupActivityId: '', groupStatus: ''},
+      visibleData: { visible: false, groupActivityId: '', groupStatus: '' },
     }
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     const { groupActivityId } = this.state.visibleData
-    this.getList({ groupActivityId: groupActivityId, groupStatus:status,  pageNumber: 1, pageSize: 5 })
+    this.getList({ groupActivityId: groupActivityId, groupStatus: status, pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { groupActivityId } = this.props.visibleData
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
@@ -40,17 +40,17 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
   }
 
-  getList (params) {
-    console.log("params",params);
+  getList(params) {
+    console.log("params", params);
     request({ ...apis.groupActivity.shareChildList, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
@@ -67,12 +67,12 @@ class InviteTable extends React.Component {
   }
 
   // 分页
-  onChange (pageNum) {
+  onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
   exportChildRecord(params) {
-    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params} })
+    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params } })
       .then(data => {
         if (!data) {
           return
@@ -89,7 +89,7 @@ class InviteTable extends React.Component {
       })
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '用户姓名',
@@ -109,7 +109,7 @@ class InviteTable extends React.Component {
         dataIndex: 'createTime',
         key: 'createTime',
         align: 'center',
-        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
       },
     ]
     return (
@@ -148,11 +148,11 @@ class Verifier extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     const { groupActivityId } = this.state.visibleData
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { groupActivityId } = this.state.visibleData
     console.log('this.state.visibleData', this.state.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
@@ -161,18 +161,18 @@ class Verifier extends React.Component {
   }
 
   // 弹框确定按钮
-  handleOk () {
+  handleOk() {
   }
 
   // 弹框取消按钮
-  handleCancel () {
-    this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
+  handleCancel() {
+    this.props.onSuccess({ groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0 });
   }
 
-   getVerCodeList (params) {
+  getVerCodeList(params) {
     request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
       message.info('核销成功')
-      this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
+      this.props.onSuccess({ groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0 });
     }).catch(err => {
       <Alert
         style={{
@@ -191,11 +191,11 @@ class Verifier extends React.Component {
 
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
-    console.log("asdasdasdasd",this.state.visibleData);
-    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId})
+    console.log("asdasdasdasd", this.state.visibleData);
+    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId })
   }
 
-  render () {
+  render() {
     return (
       <>
         <Modal
@@ -207,8 +207,8 @@ class Verifier extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }} onClick={() => this.verification()}><span style={{color:'white'}}>立即核销</span></Button>
+          <div><span>核销码:<input style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
+            <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }} onClick={() => this.verification()}><span style={{ color: 'white' }}>立即核销</span></Button>
           </div>
         </Modal>
       </>
@@ -223,9 +223,9 @@ class Verifier extends React.Component {
  * @returns
  */
 function body(props) {
-  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId : '', recordId:'',  groupStatus: ''})
+  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId: '', recordId: '', groupStatus: '' })
 
-  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: ''})
+  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: '' })
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
@@ -240,7 +240,7 @@ function body(props) {
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false})
+  const [gVisibleData, setGVisibleData] = useState({ visible: false })
 
 
   // 变更状态 ============= end
@@ -251,11 +251,11 @@ function body(props) {
     getList({ pageNumber: 1, pageSize: 10, groupStatus: groupStatus, groupActivityId: groupActivityId })
   }, [])
 
-  
+
   function getFailList(params) {
     // 网路请求
     request({ ...apis.groupActivity.shareFailList, params: { ...params } }).then(res => {
-        console.log(res);
+      console.log(res);
       setDataSource(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -290,7 +290,7 @@ function body(props) {
   }
 
   function displayNone() {
-    setGVisibleData({ visible: false})
+    setGVisibleData({ visible: false })
   }
 
   // 提交事件
@@ -320,21 +320,22 @@ function body(props) {
 
   // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: false})
+    setGInviteData({ visible: false })
     displayNone()
 
     const { value } = e.target
     setgroupStatus(value)
-    if (value == 0) { 
-        getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() }) }
+    if (value == 0) {
+      getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
+    }
     if (value == 1 || value == 2) {
-         getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
-         }
+      getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
+    }
   }
 
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId:groupActivityId })
+    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId: groupActivityId })
   }
 
   function toCustomerDateil(record) {
@@ -346,7 +347,7 @@ function body(props) {
     });
   }
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -359,8 +360,8 @@ function body(props) {
     link.click()
   }
 
-  function exportRecord () {
-    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: {groupActivityId: groupActivityId, groupStatus: groupStatus } })
+  function exportRecord() {
+    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: { groupActivityId: groupActivityId, groupStatus: groupStatus } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -368,30 +369,30 @@ function body(props) {
       })
   }
 
-// 助力记录弹框
-function helpRecord(row) {
-// 关闭核销
-// eslint-disable-next-line max-len
-  setVerifierData({ visible: false, groupActivityId: row.groupActivityId,  groupStatus: 0})
-  // eslint-disable-next-line max-len
-  setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId})
-}
- // 打开核销
- function shareRecordVerify(row) {
-  setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId})
-  setGInviteData({ visible: false, groupActivityId: row.groupActivityId})
- }
-
- function onSuccess(e) {
-  setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
-  getList({ pageNumber: 1, pageSize: 10, ...e});
- }
-
- function returnList(params) {
-  router.push({
+  // 助力记录弹框
+  function helpRecord(row) {
+    // 关闭核销
+    // eslint-disable-next-line max-len
+    setVerifierData({ visible: false, groupActivityId: row.groupActivityId, groupStatus: 0 })
+    // eslint-disable-next-line max-len
+    setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId })
+  }
+  // 打开核销
+  function shareRecordVerify(row) {
+    setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId })
+    setGInviteData({ visible: false, groupActivityId: row.groupActivityId })
+  }
+
+  function onSuccess(e) {
+    setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0 })
+    getList({ pageNumber: 1, pageSize: 10, ...e });
+  }
+
+  function returnList(params) {
+    router.push({
       pathname: '/activity/groupActivity/list',
     });
-}
+  }
 
   const publicColumns = [
     {
@@ -414,7 +415,7 @@ function helpRecord(row) {
       key: 'createTime',
       align: 'center',
       width: '15%',
-      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
     },
     {
       title: '参团者',
@@ -422,7 +423,7 @@ function helpRecord(row) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
     },
   ]
 
@@ -447,15 +448,15 @@ function helpRecord(row) {
       key: 'createTime',
       align: 'center',
       width: '10%',
-      render: (x, row) => <><span>{row.createTime ?`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
     },
     {
-        title: '成团时间',
-        dataIndex: 'endTime',
-        key: 'endTime',
-        align: 'center',
-        width: '10%',
-        render: (x, row) => <><span>{row.endTime ?`${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
+      title: '成团时间',
+      dataIndex: 'endTime',
+      key: 'endTime',
+      align: 'center',
+      width: '10%',
+      render: (x, row) => <><span>{row.endTime ? `${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
     },
     {
       title: '核销状态',
@@ -478,16 +479,16 @@ function helpRecord(row) {
       render: (x, row) => (
         <>
           {row.verificationStatus === 0 &&
-          <AuthButton name="admin.taShare.writeOff" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
-          </AuthButton>
-        }
+            <AuthButton name="admin.taShare.writeOff" noRight={null}>
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
+            </AuthButton>
+          }
         </>
       ),
     },
   ]
 
-  
+
   const changePageNum = pageNumber => {
     getList({ pageNum: pageNumber, pageSize: 10 })
   }
@@ -504,16 +505,16 @@ function helpRecord(row) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              搜索
-            </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+          <Button type="primary" htmlType="submit" >
+            搜索
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={returnList}>
-              返回
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
+        <Button style={{ float: 'right' }} onClick={returnList}>
+          返回
+        </Button>
       </Form>
       <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
@@ -531,11 +532,11 @@ function helpRecord(row) {
 
       {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" /> 
+        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
       }
-       <InviteTable visibleData={gInviteData} />
-       {/* 核销 */}
-       <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
+      <InviteTable visibleData={gInviteData} />
+      {/* 核销 */}
+      <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
     </>
   );
 }

src/pages/activity/groupActivity/list.jsx

@@ -10,6 +10,7 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -28,7 +29,7 @@ const header = props => {
       localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
       getList({ pageNum: 1, pageSize: 10 });
     }
- 
+
   }, [])
 
   // 查询列表
@@ -58,16 +59,16 @@ const header = props => {
         groupActivityId,
       },
     });
-  } 
+  }
 
   const getJoinPeople = (groupActivityId) => () => {
     router.push({
       pathname: '/activity/groupActivity/helpRecord',
       query: {
-          groupActivityId,
+        groupActivityId,
       },
     });
-  } 
+  }
 
   const toDataReacord = id => {
     router.push({
@@ -91,8 +92,9 @@ const header = props => {
       dataIndex: 'activityName',
       key: 'activityName',
       align: 'center',
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
-                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
+        <Navigate onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</Navigate></div></>,
+      // <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
     },
     {
       title: '活动时间',
@@ -112,8 +114,8 @@ const header = props => {
       dataIndex: 'participateNum',
       key: 'participateNum',
       align: 'center',
-      render: (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
-                            <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
+        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
     },
     {
       title: '成团数',
@@ -150,7 +152,7 @@ const header = props => {
           }
           {
             <AuthButton name="admin.taShareActivity.publish" noRight={null}>
-              <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {
@@ -160,7 +162,7 @@ const header = props => {
             <AuthButton name="admin.taShareActivity.top" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>}
-            {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
+          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
           {(row.activityStatus === 0 || row.activityStatus === 1) &&
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
               <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
@@ -170,13 +172,13 @@ const header = props => {
       ),
     },
   ];
-  
+
   const finishDynamic = (row) => {
     Modal.confirm({
       title: '结束以后将无法编辑, 是否继续?',
       okText: '确定',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
@@ -195,7 +197,7 @@ const header = props => {
       title: '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮',
       okText: '确定',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
@@ -278,7 +280,7 @@ const header = props => {
 
   const changePageNum = pageNumber => {
     localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
-   
+
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
@@ -295,7 +297,7 @@ const header = props => {
   }
 
   //重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
     localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
     getList({ pageNum: 1, pageSize: 10 })
@@ -335,9 +337,9 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.taShareActivity.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
@@ -348,13 +350,13 @@ const header = props => {
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table 
-      // onRow={record => {
-      //     return {
-      //       onClick: getActivityDetail(record.groupActivityId),
-      //     };
-      //   }}
-        style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table
+        // onRow={record => {
+        //     return {
+        //       onClick: getActivityDetail(record.groupActivityId),
+        //     };
+        //   }}
+        style={{ marginTop: '30px' }} 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} current={data.current} />
       </div>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -25,12 +25,12 @@ class InviteTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     const { helpId } = this.state.visibleData
     this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { helpId } = this.state.visibleData
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
@@ -40,18 +40,18 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
   }
 
-  getList (params) {
+  getList(params) {
     if (params.helpRecordInitiateId === '') {
       return
     }
@@ -92,12 +92,12 @@ class InviteTable extends React.Component {
 
   // 分页
   // eslint-disable-next-line react/sort-comp
-  onChange (pageNum) {
+  onChange(pageNum) {
     const { helpId } = this.state.visibleData
     this.getList({ helpRecordInitiateId: helpId, pageNum: pageNum, pageSize: 5 })
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '用户姓名',
@@ -132,10 +132,10 @@ class InviteTable extends React.Component {
           onCancel={e => this.handleCancel(e)}
         >
 
-      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
+          <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            导出
       </Button>
-          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
         </Modal>
       </>
     );
@@ -156,11 +156,11 @@ class Verifier extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     const { helpId } = this.state.visibleData
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { helpId } = this.state.visibleData
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       // eslint-disable-next-line react/no-did-update-set-state
@@ -170,19 +170,19 @@ class Verifier extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     console.log('核销关闭');
     // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
     this.props.onCancel()
   }
 
   // eslint-disable-next-line class-methods-use-this
-  audit (params) {
+  audit(params) {
     request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
       // eslint-disable-next-line no-undef
       message.info('核销成功')
@@ -210,7 +210,7 @@ class Verifier extends React.Component {
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
   }
 
-  render () {
+  render() {
     return (
       <>
         <Modal
@@ -222,8 +222,8 @@ class Verifier extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={e => this.handleCancel(e)}
         >
-          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
+          <div><span>核销码:<input style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
+            <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }}><span style={{ color: 'white' }}>立即核销</span></Button>
           </div>
         </Modal>
       </>
@@ -342,7 +342,7 @@ function body(props) {
     });
   }
 
-  function exportCustomer () {
+  function exportCustomer() {
     const fieldsValue = getFieldsValue()
     request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
       .then(response => {
@@ -352,7 +352,7 @@ function body(props) {
       })
   }
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -365,41 +365,41 @@ function body(props) {
     link.click()
   }
 
-// 助力记录弹框
-function helpRecord(row) {
-  setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
-  setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-}
- // 核销
- function helpInitiateRecordVerify(row) {
-// 关闭助力记录弹框
-  setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
-  // 核销
-  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
- }
- // 核销回调
- function onSuccess(e) {
-   console.log('回调：', e)
-   getList(e)
-    
-   // 关闭
-   onCancel()
- }
-
- function onCancel(e) {
+  // 助力记录弹框
+  function helpRecord(row) {
+    setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
+    setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  }
   // 核销
-  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
-  // 助力者
-  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
- }
-
- // 返回到首页
- function returList(params) {
-  router.push({
+  function helpInitiateRecordVerify(row) {
+    // 关闭助力记录弹框
+    setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+    // 核销
+    setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
+  }
+  // 核销回调
+  function onSuccess(e) {
+    console.log('回调：', e)
+    getList(e)
+
+    // 关闭
+    onCancel()
+  }
+
+  function onCancel(e) {
+    // 核销
+    setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+    // 助力者
+    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+  }
+
+  // 返回到首页
+  function returList(params) {
+    router.push({
       pathname: '/activity/helpActivity/list',
     });
-}
+  }
 
   const publicColumns = [
     {
@@ -430,7 +430,7 @@ function helpRecord(row) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
     },
   ]
 
@@ -467,7 +467,7 @@ function helpRecord(row) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
     },
     {
       title: '核销状态',
@@ -488,10 +488,10 @@ function helpRecord(row) {
       render: (x, row) => (
         <>
           {row.verificationStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
-          </AuthButton>
-        }
+            <AuthButton name="admin.SignList.get" noRight={null}>
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
+            </AuthButton>
+          }
         </>
       ),
     },
@@ -499,7 +499,7 @@ function helpRecord(row) {
 
   return (
     <>
-    {console.log('customerType', customerType)}
+      {console.log('customerType', customerType)}
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('tel')(
@@ -510,34 +510,34 @@ function helpRecord(row) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              搜索
-            </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+          <Button type="primary" htmlType="submit" >
+            搜索
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={returList}>
-              返回
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
+        <Button style={{ float: 'right' }} onClick={returList}>
+          返回
+        </Button>
       </Form>
       <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 
       <div style={{ margin: '20px 0' }}>
-          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-            <Radio.Button value="helpSucceed">助力成功</Radio.Button>
-            <Radio.Button value="helpUnderway">进行中</Radio.Button>
-            <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
-          </Radio.Group>
+        <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+          <Radio.Button value="helpSucceed">助力成功</Radio.Button>
+          <Radio.Button value="helpUnderway">进行中</Radio.Button>
+          <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
+        </Radio.Group>
       </div>
       {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" />
       }
-        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
-       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
+      <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
+      <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
     </>
   );
 }

src/pages/activity/helpActivity/signList.jsx

@@ -515,10 +515,10 @@ function helpRecord(row) {
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={returList}>
-              返回
-            </Button>
         </Form.Item>
+        <Button style={{ float: 'right' }} onClick={returList}>
+          返回
+        </Button>
       </Form>
       <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出

src/pages/building/list/add/components/buildingImage.jsx

@@ -223,7 +223,7 @@ function BuildingImageModel(props) {
 
   return (
     <>
-      <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+      <Button style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
       <span style={{ marginTop: '10px', marginBottom: '10px' }}>{props.apartment.apartmentName}({imageList.length})</span>
       <Button type="link" style={{ color: 'blue' }} onClick={() => edi()}>重命名</Button>
       <Button type="link" style={{ color: 'blue' }} onClick={() => deletePhoto()}>删除相册</Button>

src/pages/building/list/add/components/imageSet.jsx

@@ -125,7 +125,7 @@ function imageSet(props) {
           // openNotificationWithIcon('error', err.message)
         })
       },
-      onCancel() {},
+      onCancel() { },
     });
   }
 
@@ -140,31 +140,31 @@ function imageSet(props) {
       title: '销售状态',
       dataIndex: 'marketStatus',
       key: 'marketStatus',
-      render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
+      render: (_, record) => <span>{(saleType.filter(x => x.id == record.marketStatus)[0] || {}).name}</span>,
     },
     {
       title: '户型',
       dataIndex: 'houseType',
       key: 'houseType',
-      render: (_, record) => <span>{ (houseType.filter(x => x.id == record.houseType)[0] || {}).name }</span>,
+      render: (_, record) => <span>{(houseType.filter(x => x.id == record.houseType)[0] || {}).name}</span>,
     },
     {
       title: '面积',
       dataIndex: 'buildingArea',
       key: 'buildingArea',
-      render: (buildingArea, _) => <span>{ `${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}` }</span>,
+      render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
     },
     {
       title: '使用面积',
       dataIndex: 'insideArea',
       key: 'insideArea',
-      render: (insideArea, _) => <span>{ `${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}` }</span>,
+      render: (insideArea, _) => <span>{`${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}`}</span>,
     },
     {
       title: '创建时间',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (_, record) => <span>{ moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span>,
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>,
     },
     {
       title: '操作',
@@ -181,13 +181,15 @@ function imageSet(props) {
 
   return (
     <>
-      <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
-      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
+        <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
+      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
     </>
   )
 }

src/pages/building/list/add/components/panoramaImage.jsx

@@ -99,11 +99,11 @@ function panoramaImage(props) {
    */
   function showEdi(record) {
     // 网路请求
-    request({ ...apis.paorama.panoramaApartList, params: { buildingId:  props.building.buildingId } }).then(res => {
+    request({ ...apis.paorama.panoramaApartList, params: { buildingId: props.building.buildingId } }).then(res => {
       setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId, panoramaType: "apartment", panoramaList: res })
-     }).catch(err => {
+    }).catch(err => {
       this.openNotificationWithIcon('error', err)
-     })
+    })
   }
 
   /**
@@ -126,7 +126,7 @@ function panoramaImage(props) {
           // openNotificationWithIcon('error', err.message)
         })
       },
-      onCancel() {},
+      onCancel() { },
     });
   }
 
@@ -136,7 +136,7 @@ function panoramaImage(props) {
       title: '封面图',
       dataIndex: 'coverImg',
       key: 'coverImg',
-      render: (x, record) =>  <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
+      render: (x, record) => <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
     },
     {
       title: '类型',
@@ -168,13 +168,15 @@ function panoramaImage(props) {
 
   return (
     <>
-      <Button type="primary" onClick={() => showEdi()}>新增全景图</Button>
-      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
+        <Button type="primary" onClick={() => showEdi()}>新增全景图</Button>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
+      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
     </>
   )
 }

src/pages/customer/customerlist/customerDetail.jsx

@@ -123,7 +123,10 @@ function header(props) {
   ];
   return (
     <>
-      <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+      <div style={{ textAlign: 'right', marginBottom:'16px'}}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+
       <div className={styles.cardBox}>
         <div className={styles.rightBox}>
           <p className={styles.tit}>客户信息</p>
@@ -199,7 +202,7 @@ function header(props) {
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
-        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
       <Prompt message={location =>

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination,Button } from 'antd';
+import { Form, Table, Pagination, Button } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import publicStyle from './publicStyle.less';
 import apis from '../../../services/apis';
@@ -16,8 +16,8 @@ function header(props) {
    * @returns
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState([{ }])
-  const [tableData, setTableDataData] = useState([{ }])
+  const [data, setData] = useState([{}])
+  const [tableData, setTableDataData] = useState([{}])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
   const [buildingIdValue, setBuildingIdData] = useState()
@@ -44,8 +44,8 @@ function header(props) {
         }]),
       )
       arr.push(a)
-   }
-   setIntentionData(arr)
+    }
+    setIntentionData(arr)
   }
 
   // 查询
@@ -62,12 +62,12 @@ function header(props) {
       setIntentionData(res.intentions)
     })
   }
-// 分页
-// 分页
-function onChange(number) {
-  if (id === '' || id === undefined) {
-    return
-  }
+  // 分页
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return
+    }
     request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { pageNumber: number, pageSize: 10 } }).then(res => {
       setData(res)
       setTableDataData(res.visitRecords)
@@ -98,14 +98,14 @@ function onChange(number) {
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
     },
     {
       title: '停留时间',
       dataIndex: 'visitDuration',
       key: 'visitDuration',
       align: 'center',
-      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>,
     },
   ]
   // 意向
@@ -113,8 +113,8 @@ function onChange(number) {
     {
       title: 'Name',
       dataIndex: 'name',
-      width:200,
-    render: (_, record) => <span>{record.buildingName}</span>,
+      width: 200,
+      render: (_, record) => <span>{record.buildingName}</span>,
     },
     {
       title: 'Address',
@@ -125,28 +125,30 @@ function onChange(number) {
 
   return (
     <>
-    <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px' }}>返回</Button>
+      <div style={{ textAlign: 'right', marginBottom: '16px' }}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
       <div className={publicStyle.cardBox}>
-     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={publicStyle.rightBox}>
           <p className={publicStyle.tit}>客户信息</p>
-          <img className={publicStyle.touxiang} src={ data.avatarurl && data.avatarurl } />
+          <img className={publicStyle.touxiang} src={data.avatarurl && data.avatarurl} />
           <div className={publicStyle.right}>
-            <p className={publicStyle.rightItem}>用户名称：{ data.name === null ? data.nickname : data.name }</p>
-            <p className={publicStyle.rightItem}>手机号码：{ data.phone }</p>
+            <p className={publicStyle.rightItem}>用户名称：{data.name === null ? data.nickname : data.name}</p>
+            <p className={publicStyle.rightItem}>手机号码：{data.phone}</p>
             <p className={publicStyle.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
           </div>
           <div className={publicStyle.Centered}>
-          <p>访问时长：{ data.duration }秒</p>
-          <p>访问次数：{ data.visitTimes }次</p>
-          <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
-          {/* <p>预约人数：{ data.visiteNum }</p> */}
+            <p>访问时长：{data.duration}秒</p>
+            <p>访问次数：{data.visitTimes}次</p>
+            <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
+            {/* <p>预约人数：{ data.visiteNum }</p> */}
           </div>
           {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
           <div className={publicStyle.rightInfo}>
-            <p className={publicStyle.rightItem}>国家：{ data && data.country }</p>
-            <p className={publicStyle.rightItem}>省份：{ data && data.province }</p>
-            <p className={publicStyle.rightItem}>城市：{ data && data.city }</p>
+            <p className={publicStyle.rightItem}>国家：{data && data.country}</p>
+            <p className={publicStyle.rightItem}>省份：{data && data.province}</p>
+            <p className={publicStyle.rightItem}>城市：{data && data.city}</p>
             {/* <p className={styles.rightItem}>详细信息：</p> */}
             {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
             {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
@@ -155,19 +157,19 @@ function onChange(number) {
         {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={publicStyle.leftBoxCentre}>
           <div className={publicStyle.tit}>
-                <span>项目名称</span>
-                <span style={{ float: 'right' }}>意向值</span>
+            <span>项目名称</span>
+            <span style={{ float: 'right' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={publicStyle.infoItem}>
-          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData.length >= 3 ? { y: 240 } : false}/>
+            <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData.length >= 3 ? { y: 240 } : false} />
           </div>
         </div>
       </div>
       <div className={publicStyle.recordBox}>
         <p className={publicStyle.tableName}>访问记录</p>
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
-        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
       </div>
       <Prompt message={location =>
         location.pathname.startsWith("/customer/customerlist")

src/pages/eContract/manage/edit.jsx

@@ -115,6 +115,7 @@ const header = props => {
     return (
 
         <>
+            <div align="right"><Button onClick={() => router.go(-1)}>返回</Button></div>
 
             {datas.map((x) => {
                 return <Row style={{ margin: '20px 0' }}>
@@ -130,7 +131,7 @@ const header = props => {
                     </Col>
                 </Row>
             })}
-            <div align="center"><Button className={Styles.rebtn} onClick={() => router.go(-1)}>返回</Button></div>
+        
 
         </>
     )

src/pages/eContract/template/detail.jsx

@@ -28,6 +28,8 @@ const header = props => {
 
   return (
     <>
+      <div align="right"><Button onClick={() => toCancel()}>返回</Button></div>
+
       <Form labelCol={{ span: 6 }} wrapperCol={{ span: 14 }} style={{ position: 'relative' }}>
         <Form.Item label="合同标题">
           <span>{data.contractTemplateName}</span>
@@ -36,13 +38,6 @@ const header = props => {
           <div><a href={data.contractTemplateAddress} target='_blank' style={{ color: '#66B3FF', fontSize: '14px' }}>
             查看文件</a></div>
         </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <div style={{ margin: '0.16rem 0 0.06rem' }}>
-            <Button onClick={() => toCancel()} style={{ marginLeft: '20px' }}>
-              返回
-          </Button>
-          </div>
-        </Form.Item>
       </Form>
     </>
   )

src/pages/house/house/edit/components/house.jsx

@@ -233,6 +233,7 @@ function House(props) {
   const { getFieldDecorator } = props.form
   return (
     <>
+      <div align="right"><Button onClick={() => router.go(-1)}>返回</Button></div>
       <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('termName')(
@@ -289,7 +290,7 @@ function House(props) {
       <Button type="danger" onClick={() => showEdi({ type: "add", houseId: '' })} style={{ marginTop: '20px' }}>新增房源</Button>
       <Button type="primary" onClick={() => showEdi({ type: "batch" })} style={{ marginLeft: '18px' }}>批量导入房源</Button>
       <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px' }}>批量修改对应户型</Button>
-      <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ defaultCurrent: 1, current: data.current, total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px' }} rowKey={r => r.houseId} />
 
       <Modal

src/pages/indexEcharts/userBehavior.jsx

@@ -1,5 +1,5 @@
 import React, { Component, useState, useEffect } from 'react';
-import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table , Row, Col, Menu, Dropdown } from 'antd';
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Row, Col, Menu, Dropdown } from 'antd';
 
 import moment from 'moment';
 import UserBehavior from './components/UserBehavior'
@@ -151,31 +151,31 @@ const header = props => {
 
   const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
   return (
-  <>
-    <div>
+    <>
       <div>
-        <Form layout="inline" onSubmit={handleSubmit}>
-          <Form.Item>
-            {getFieldDecorator('radioGroup')(
-              <Radio.Group buttonStyle="solid">
-                <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-                <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-              </Radio.Group>,
-            )}
-          </Form.Item>
-          <Form.Item>
-            {getFieldDecorator('rangePicker')(
-              <RangePicker
-                style={{ paddingLeft: '30px', 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
-              />,
-            )}
-          </Form.Item>
+        <div>
+          <Form layout="inline" onSubmit={handleSubmit}>
+            <Form.Item>
+              {getFieldDecorator('radioGroup')(
+                <Radio.Group buttonStyle="solid">
+                  <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+                  <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+                </Radio.Group>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('rangePicker')(
+                <RangePicker
+                  style={{ paddingLeft: '30px', 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
+                />,
+              )}
+            </Form.Item>
 
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
               搜索
@@ -184,52 +184,52 @@ const header = props => {
               重置
             </Button>
 
-            <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
-
-          <div style={{ display: 'flex', margin: '24px 0' }}>
-            <Form.Item>
-              {getFieldDecorator('buildingId')(
-                <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
-              )}
-            </Form.Item>
-            <Form.Item>
-              {getFieldDecorator('handleType')(
-                <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+            <Button style={{ float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+
+            <div style={{ display: 'flex', margin: '24px 0' }}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleType')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
                     {eventypes.map(type => (
                       <Option key={type.typeId}>{type.typeName}</Option>
                     ))}
-                </Select>,
-              )}
-            </Form.Item>
-            <Form.Item>
-              {getFieldDecorator('handleEvent')(
-                 <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
-                      {eventList.map(event => (
-                        <Option key={event.eventId}>{event.eventName}</Option>
-                      ))}
                   </Select>,
-              )}
-            </Form.Item>
-            <Form.Item>
-              {getFieldDecorator('handleProperty')(
-                 <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleEvent')(
+                  <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+                    {eventList.map(event => (
+                      <Option key={event.eventId}>{event.eventName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleProperty')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
                     {properties.map(property => (
                       <Option key={property.propertyId}>{property.propertyName}</Option>
                     ))}
-                </Select>,
-              )}
-            </Form.Item>
-          </div>
-        </Form>
-      </div>
+                  </Select>,
+                )}
+              </Form.Item>
+            </div>
+          </Form>
+        </div>
 
-      <div style={{ margin: '24px 0' }}>
-       <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
-      </div>
+        <div style={{ margin: '24px 0' }}>
+          <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
+        </div>
 
-      {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
-    </div>
-  </>
+        {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
+      </div>
+    </>
   )
 }
 

src/pages/indexEcharts/userSource.jsx

@@ -99,7 +99,7 @@ class Header extends React.Component {
 
   datalist = () => {
     console.log()
-    this.setState({ 
+    this.setState({
       endDate: daterange[1] === '' ? new Date() : daterange[1],
       startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
     })
@@ -114,11 +114,11 @@ class Header extends React.Component {
   onTabledatas = (e) => {
     console.log('this.state.userType: ', this.state.userType)
     e.tdWxDicts.map(x => {
-        columns = columns.filter(y => y.key != x.sceneType).concat({
-          title: x.sceneAlias,
-          dataIndex: x.sceneType,
-          key: x.sceneType,
-        })
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
     })
     const data = (e.list || []).reduce((acc, item) => {
       const { sceneType, fromNum, registeredNum, createTime } = item
@@ -127,16 +127,16 @@ class Header extends React.Component {
       return acc
     }, {})
 
-    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
       const { sceneType } = item
       acc[sceneType] = 0
       return acc
-    },{})
+    }, {})
 
-    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
       acc[index] = { ...dictData, ...item }
       return acc
-    },[])
+    }, [])
 
     this.setState({ tableData })
 
@@ -151,61 +151,55 @@ class Header extends React.Component {
 
   render() {
     return (
-    <>
-      <div style={{
-        backgroundColor: '#fff',
-        padding: '32PX 28px',
-        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-        borderRadius: '12px',
-        minHeight: '60vh'
-      }}>
-        <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
-        </Radio.Group>
-        <RangePicker
-          style={{ paddingLeft: '30px' }}
-          ranges={{
-            Today: [moment(), moment()],
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
-          }}
-          // showTime
-          // format="YYYY/MM/DD HH:mm:ss"
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
-        />
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
-          搜索
-        </Button>
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>
+      <>
         <div>
-  
-          <div style={{ display: 'flex' }}>
-            <div style={{
-              width: '1060px',
-              height: '560px',
-              paddingTop: '40px',
-              marginRight: ' 40px',
-            }}>
-              <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
-            </div>
-            <div style={{
-              width: '509px',
-              height: '600px',
-              paddingTop: '40px',
-  
-            }}>
-              <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
+          <Radio.Group buttonStyle="solid" defaultValue="a">
+            <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
+            <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+          </Radio.Group>
+          <RangePicker
+            style={{ paddingLeft: '30px' }}
+            ranges={{
+              Today: [moment(), moment()],
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
+            }}
+            // showTime
+            // format="YYYY/MM/DD HH:mm:ss"
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+          />
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
+            搜索
+        </Button>
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+          <div>
+
+            <div style={{ display: 'flex' }}>
+              <div style={{
+                width: '1060px',
+                height: '560px',
+                paddingTop: '40px',
+                marginRight: ' 40px',
+              }}>
+                <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
+              </div>
+              <div style={{
+                width: '509px',
+                height: '600px',
+                paddingTop: '40px',
+
+              }}>
+                <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
+              </div>
             </div>
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
+              <Option value='all'>所有用户</Option>
+              <Option value='registered'>注册用户</Option>
+            </Select>
+
+            <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
           </div>
-          <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
-            <Option value='all'>所有用户</Option>
-            <Option value='registered'>注册用户</Option>
-          </Select>
-  
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
         </div>
-      </div>
-    </>
+      </>
     )
   }
 }

src/pages/integralMall/verifyList.jsx

@@ -11,16 +11,16 @@ const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
 
   useEffect(() => {
-    getVerifyList({pageNum: 1,pageSize: 10, phone: props.location.query.telValue });
-  },[])
+    getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue });
+  }, [])
 
   // 查询列表
   const getVerifyList = (params) => {
-    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
-        setData(data)
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params }, }).then((data) => {
+      setData(data)
     })
   }
 
@@ -38,12 +38,12 @@ const header = (props) => {
     // console.log(new Date())
     row.verifyDate = new Date()
     // console.log('row.verifyDate: ', row.verifyDate)
-    request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
-        message.info("操作成功")
-        getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row }).then((data) => {
+      message.info("操作成功")
+      getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
     })
   }
-  
+
   const columns = [
     {
       title: '用户姓名',
@@ -56,7 +56,7 @@ const header = (props) => {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
+      render: (personType) => <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
     },
     {
       title: '手机号',
@@ -96,24 +96,24 @@ const header = (props) => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '已领取' : '未领取'}</span></>
+      render: (status) => <><span>{status == 1 ? '已领取' : '未领取'}</span></>
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <span style={{ color: '#1990FF' }} onClick={changeStatus(row)}>{ row.status == 1?'':'核销' }</span>
-           
+      render: (x, row) => <span style={{ color: '#1990FF' }} onClick={changeStatus(row)}>{row.status == 1 ? '' : '核销'}</span>
+
     },
   ];
 
   return (
     <>
-      <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
+      <div align="right" style={{marginBottom:'16px'}}><Button onClick={toBack}>返回</Button></div>
       <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )

src/pages/record/share/clickCountList.jsx

@@ -19,21 +19,21 @@ function record(props) {
   const { getFieldDecorator } = props.form
 
   // 获取初始化数据
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
   const personId = props.location.query.id
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, personId: personId });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.activity.clickCountList, params: { ...params },}).then((data) => {
-        if (data){
-            setData(data)
-        }
-        
-        console.log("data:",data)
+    request({ ...apis.activity.clickCountList, params: { ...params }, }).then((data) => {
+      if (data) {
+        setData(data)
+      }
+
+      console.log("data:", data)
     })
   }
 
@@ -42,24 +42,24 @@ function record(props) {
     props.form.resetFields();
   }
 
-  function back(){
+  function back() {
     router.go(-1);
   }
-  
+
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {shareTime,receiveTime, ...submitValue} = values
-        if(null != shareTime && shareTime.length > 0){
+        let { shareTime, receiveTime, ...submitValue } = values
+        if (null != shareTime && shareTime.length > 0) {
           const [startCreateDate, endCreateDate] = shareTime
           submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
           submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-        }else{
+        } else {
           submitValue.startCreateDate = null
           submitValue.endCreateDate = null
-        }        
+        }
         console.log(submitValue)
         getList({ pageNum: 1, pageSize: 10, personId: personId, ...submitValue })
       }
@@ -83,17 +83,17 @@ function record(props) {
       align: 'center',
     },
     {
-        title: '用户名',
-        dataIndex: 'personName',
-        key: 'personName',
-        align: 'center',
-      },
-      {
-        title: '手机号',
-        dataIndex: 'personPhone',
-        key: 'personPhone',
-        align: 'center',
-      },
+      title: '用户名',
+      dataIndex: 'personName',
+      key: 'personName',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'personPhone',
+      key: 'personPhone',
+      align: 'center',
+    },
     {
       title: '访问时间',
       dataIndex: 'createDate',
@@ -106,34 +106,33 @@ function record(props) {
   return (
 
     <>
+      <div align="right" style={{ marginBottom: '16px' }}><Button onClick={back}>返回</Button></div>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <div style={{ display: 'flex' }}>
-            <Form.Item label="分享类型" >
-                {getFieldDecorator('shareType')(
-                <Select placeholder="分享类型" style={{ width: '200px' }}>
-                    <Option value="dynamic_share">报名活动</Option>
-                    <Option value="help_share">助力活动</Option>
-                    <Option value="group_share">拼团活动</Option>
-                    <Option value="h5_share">H5活动</Option>
-                    <Option value="building_share">项目</Option>
-                    <Option value="news_share">资讯</Option>
-                    <Option value="house_share">房源</Option>
-                    <Option value="card_share">名片</Option>
-                </Select>,
-                )}
-            </Form.Item>
+          <Form.Item label="分享类型" >
+            {getFieldDecorator('shareType')(
+              <Select placeholder="分享类型" style={{ width: '200px' }}>
+                <Option value="dynamic_share">报名活动</Option>
+                <Option value="help_share">助力活动</Option>
+                <Option value="group_share">拼团活动</Option>
+                <Option value="h5_share">H5活动</Option>
+                <Option value="building_share">项目</Option>
+                <Option value="news_share">资讯</Option>
+                <Option value="house_share">房源</Option>
+                <Option value="card_share">名片</Option>
+              </Select>,
+            )}
+          </Form.Item>
           <Form.Item>
             {getFieldDecorator('shareTitle')(
-                <Input
+              <Input
                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                 placeholder="分享标题"
-                />,
+              />,
             )}
           </Form.Item>
-          <Form.Item style={{position:'absolute',right:'38px'}}>
-            <Button style={{ marginRight: 8 }} onClick={back}>
-              返回
-            </Button>
+          <Form.Item style={{ position: 'absolute', right: '38px' }}>
+
             <AuthButton name="admin.taGoods.exchange" noRight={null}>
               <Button type="primary" htmlType="submit">
                 搜索
@@ -145,9 +144,9 @@ function record(props) {
           </Form.Item>
         </div>
       </Form>
-      <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
+      <Table rowKey="exchangeRecords" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )

src/pages/record/share/shareCountList.jsx

@@ -91,6 +91,7 @@ function record(props) {
   return (
 
     <>
+     <div align="right" style={{marginBottom:'16px'}}><Button onClick={back}>返回</Button></div>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <div style={{ display: 'flex' }}>
             <Form.Item label="分享类型" >
@@ -116,9 +117,6 @@ function record(props) {
             )}
           </Form.Item>
           <Form.Item style={{position:'absolute',right:'38px'}}>
-            <Button style={{ marginRight: 8 }} onClick={back}>
-              返回
-            </Button>
             <AuthButton name="admin.taGoods.exchange" noRight={null}>
               <Button type="primary" htmlType="submit">
                 搜索

src/pages/statistical/activity/addRegistNum.jsx

@@ -15,10 +15,10 @@ const { RangePicker } = DatePicker;
 const { Option } = Select
 
 const formItemLayout = {
-    labelCol: { span: 10},
-    wrapperCol: { span: 14 },
-  };
-  
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
 let daterange = []
 let tableTitle = ['类型']
 
@@ -76,31 +76,31 @@ class SharePersonNum extends React.Component {
     super(props)
     let startDate;
     let endDate;
-    if (props.location.query.queryDate){
-      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
-    }else{
-      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+    if (props.location.query.queryDate) {
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
     console.log(startDate)
     this.state = {
       formData: {
         personFrom: '',
         province: '',
-        pageNum:'',
-        pageSize:'',
+        pageNum: '',
+        pageSize: '',
         startDate: startDate,
         endDate: endDate,
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType,
-        buildingId: props.location.query.buildingId,      
+        activityType: props.location.query.activityType,
+        buildingId: props.location.query.buildingId,
       },
-      personData: [],  
+      personData: [],
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      activityName:  props.location.query.activityName
+      activityName: props.location.query.activityName
     }
   }
 
@@ -108,12 +108,12 @@ class SharePersonNum extends React.Component {
     this.getTableList()
   }
 
-  getTableList () {
+  getTableList() {
     const { formData } = this.state
     console.log(formData)
     request({ ...apis.activityDataStatis.activityAddRegist, params: formData }).then(data => {
       console.log(data)
-      this.setState({ tableData: data.records, total: data.total})
+      this.setState({ tableData: data.records, total: data.total })
     }).catch()
   }
 
@@ -139,37 +139,37 @@ class SharePersonNum extends React.Component {
     this.props.form.resetFields()
     let startDate;
     let endDate;
-    if (this.props.location.query.queryDate){
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
-    }else{
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+    if (this.props.location.query.queryDate) {
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
     this.setState({
       formData: {
         personFrom: '',
         province: '',
-        pageNum:'',
-        pageSize:'',
+        pageNum: '',
+        pageSize: '',
         startDate: startDate,
         endDate: endDate,
         activityId: this.props.location.query.activityId,
-        activityType:this.props.location.query.activityType,
-        buildingId: this.props.location.query.buildingId,      
+        activityType: this.props.location.query.activityType,
+        buildingId: this.props.location.query.buildingId,
       },
-      personData: [],  
+      personData: [],
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      activityName:  this.props.location.query.activityName
-    },this.getTableList)
+      activityName: this.props.location.query.activityName
+    }, this.getTableList)
   }
 
   goback = () => {
     router.go(-1);
   }
-  
+
   exportActivityStats = () => {
     const { formData } = this.state
     request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: formData }).then(data => {
@@ -177,12 +177,12 @@ class SharePersonNum extends React.Component {
         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 link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '分享统计.xlsx')
+      document.body.append(link)
+      link.click()
     }).catch()
   }
 
@@ -205,44 +205,42 @@ class SharePersonNum extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     return (
-    <>
+      <>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
         <div>
-          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+          <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
         </div>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
-        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('province')(<Input placeholder="请输入归属地"/>)}
-        </Form.Item>
-        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-          {getFieldDecorator('personFrom')(
-            <WxDictSelect />,
-          )}
-        </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+          </Form.Item>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('personFrom')(
+              <WxDictSelect />,
+            )}
+          </Form.Item>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
-                搜索
+              搜索
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          </Form>     
+        </Form>
         <div>
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }} onClick={this.goback}>
-                返回
-            </Button>
-        <AuthButton name="admin.statistical.activity.export" noRight={null}>
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
-                导出
+              导出
             </Button>
-            </AuthButton>
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+          </AuthButton>
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
         </div>
         <Prompt message={location =>
-        location.pathname.startsWith("/statistical/activity")
-          ? true
-          : localStorage.removeItem("tabState")} />
-    </>
+          location.pathname.startsWith("/statistical/activity")
+            ? true
+            : localStorage.removeItem("tabState")} />
+      </>
     )
-    
+
   }
 }
 const WrappedTypeForm = Form.create()(SharePersonNum);

src/pages/statistical/activity/detail.jsx

@@ -368,7 +368,7 @@ function record(props) {
     return (
 
         <>
-            <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+            <div align="right" style={{ marginBottom: '16px' }}><Button onClick={() => router.go(-1)}>返回</Button></div>
             <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Radio.Group buttonStyle="solid" value={radioVal} onChange={setFormData} style={{ marginRight: '16px', }}>

src/pages/statistical/activity/shareNum.jsx

@@ -14,10 +14,10 @@ const { RangePicker } = DatePicker;
 const { Option } = Select
 
 const formItemLayout = {
-    labelCol: { span: 10},
-    wrapperCol: { span: 14 },
-  };
-  
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 },
+};
+
 let daterange = []
 let tableTitle = ['类型']
 let queryDate = ''
@@ -65,34 +65,34 @@ class SharePersonNum extends React.Component {
     queryDate = props.location.query.queryDate
     let startDate;
     let endDate;
-    if (props.location.query.queryDate){
-      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
-    }else{
-      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+    if (props.location.query.queryDate) {
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
     this.state = {
       formData: {
         sharePhone: '',
         sharePersonType: '',
-        pageNum:'',
-        pageSize:'',
-        shareName:'',
-        sort:null,
-        colKey:null,
+        pageNum: '',
+        pageSize: '',
+        shareName: '',
+        sort: null,
+        colKey: null,
         startDate: startDate,
         endDate: endDate,
         activityId: props.location.query.activityId,
-        activityType:props.location.query.activityType,
+        activityType: props.location.query.activityType,
         personId: props.location.query.personId,
-        buildingId: props.location.query.buildingId   
+        buildingId: props.location.query.buildingId
       },
-      personData: [],  
+      personData: [],
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      activityName:  props.location.query.activityName
+      activityName: props.location.query.activityName
     }
   }
 
@@ -100,12 +100,12 @@ class SharePersonNum extends React.Component {
     this.getTableList()
   }
 
-  getTableList () {
+  getTableList() {
     const { formData } = this.state
     console.log(formData)
     request({ ...apis.activityDataStatis.activityShareNum, params: formData }).then(data => {
       console.log(data)
-      this.setState({ tableData: data.records, total: data.total})
+      this.setState({ tableData: data.records, total: data.total })
     }).catch()
   }
 
@@ -133,41 +133,41 @@ class SharePersonNum extends React.Component {
     this.props.form.resetFields()
     let startDate;
     let endDate;
-    if (this.props.location.query.queryDate){
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
-    }else{
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+    if (this.props.location.query.queryDate) {
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
+    } else {
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
     this.setState({
       formData: {
         sharePhone: '',
         sharePersonType: '',
-        pageNum:'',
-        pageSize:'',
-        shareName:'',
-        sort:null,
-        colKey:null,
+        pageNum: '',
+        pageSize: '',
+        shareName: '',
+        sort: null,
+        colKey: null,
         startDate: startDate,
         endDate: endDate,
         activityId: this.props.location.query.activityId,
-        activityType:this.props.location.query.activityType,
+        activityType: this.props.location.query.activityType,
         personId: this.props.location.query.personId,
-        buildingId: this.props.location.query.buildingId   
+        buildingId: this.props.location.query.buildingId
       },
-      personData: [],  
+      personData: [],
       dataSoures: [],
       tableData: [],
       userType: 'all',
-      activityName:  this.props.location.query.activityName
-    },this.getTableList)
+      activityName: this.props.location.query.activityName
+    }, this.getTableList)
   }
 
   goback = () => {
     router.go(-1);
   }
-  
+
   exportActivityStats = () => {
     const { formData } = this.state
     request({ ...apis.activityDataStatis.activityShareNumExport, params: formData }).then(data => {
@@ -175,12 +175,12 @@ class SharePersonNum extends React.Component {
         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 link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '分享统计.xlsx')
+      document.body.append(link)
+      link.click()
     }).catch()
   }
 
@@ -207,52 +207,51 @@ class SharePersonNum extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     return (
-    <>
+      <>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
         <div>
-          <span style={{marginLeft:'20px'}}>分享内容：{this.state.activityName}</span>
+          <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
         </div>
-        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)} style={{ display: 'flex', alignItems: 'center' }}>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
             {getFieldDecorator('sharePersonType')(
-                <Select placeholder="分享者类型" style={{ width: 150, marginLeft:'20px'  }}>
+              <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
                 <Option value="drift">游客</Option>
                 <Option value="customer">普通客户</Option>
                 <Option value="Realty Consultant">置业顾问</Option>
                 <Option value="estate agent">专业经纪人</Option>
-            </Select>
+              </Select>
             )}
           </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-              {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话"/>)}
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
           </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-              {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名"/>)}
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+            {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
           </Form.Item>
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
-                搜索
+              搜索
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          </Form>     
-        <div>
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }} onClick={this.goback}>
-                返回
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+            <Button type="primary" style={{ position: 'absolute',right:'27px', zIndex: 1 }} onClick={this.exportActivityStats}>
+              导出
             </Button>
-        <AuthButton name="admin.statistical.activity.export" noRight={null}>
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
-                导出
-            </Button>
-            </AuthButton>
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
+          </AuthButton>
+        </Form>
+        <div>
+
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
         </div>
         <Prompt message={location =>
-        location.pathname.startsWith("/statistical/activity")
-          ? true
-          : localStorage.removeItem("tabState")} />
-    </>
+          location.pathname.startsWith("/statistical/activity")
+            ? true
+            : localStorage.removeItem("tabState")} />
+      </>
     )
-    
+
   }
 }
 const WrappedTypeForm = Form.create()(SharePersonNum);