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

src/pages/activity/ActivityList.jsx

@@ -126,7 +126,7 @@ const header = props => {
       render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
     },
     {
-      title: '已参加人数',
+      title: '已参与人数',
       dataIndex: 'count',
       key: 'count',
       align: 'center',

src/pages/activity/helpActivity/list.jsx

@@ -93,7 +93,7 @@ const header = props => {
       render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
-      title: '已参加人数',
+      title: '已参与人数',
       dataIndex: 'enlistNum',
       key: 'enlistNum',
       align: 'center',

src/pages/customer/customerlist/index.jsx

@@ -585,7 +585,7 @@ function body(props) {
         <Form.Item>
           <AuthButton name="admin.customer.recommend.search" noRight={null}>
             <Button type="primary" htmlType="submit" >
-              查询
+              搜索
               </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>

src/pages/customer/drift/index.jsx

@@ -96,7 +96,7 @@ function costomerDrift(props) {
         <Form.Item>
             {/* <AuthButton name="admin.customer.recommend.search" noRight={null}> */}
             <Button type="primary" htmlType="submit" >
-              查询
+              搜索
             </Button>
             {/* </AuthButton> */}
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
@@ -104,7 +104,7 @@ function costomerDrift(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+      <Table style={{marginTop:'10px'}} dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
     </>
     // eslint-disable-next-line max-len
     

src/pages/integralMall/exchangeRecords.jsx

@@ -20,17 +20,17 @@ function record(props) {
   const { getFieldDecorator } = props.form
 
   // 获取初始化数据
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
-        setData(data)
-        console.log("data:",data)
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params }, }).then((data) => {
+      setData(data)
+      console.log("data:", data)
     })
   }
 
@@ -40,31 +40,31 @@ function record(props) {
   }
 
 
-  
+
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {exchangeTime,receiveTime, ...submitValue} = values
-        if(null != exchangeTime && exchangeTime.length > 0){
+        let { exchangeTime, receiveTime, ...submitValue } = values
+        if (null != exchangeTime && exchangeTime.length > 0) {
           const [startCreateDate, endCreateDate] = exchangeTime
           submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
           submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-        }else{
+        } else {
           submitValue.startCreateDate = null
           submitValue.endCreateDate = null
         }
-        
-        if(null != receiveTime && receiveTime.length > 0){
+
+        if (null != receiveTime && receiveTime.length > 0) {
           const [startVerifyDate, endVerifyDate] = receiveTime
           submitValue.startVerifyDate = moment(startVerifyDate).format('YYYY-MM-DD');
           submitValue.endVerifyDate = moment(endVerifyDate).format('YYYY-MM-DD');
-        }else{
+        } else {
           submitValue.startVerifyDate = null
           submitValue.endVerifyDate = null
         }
-        
+
         console.log(submitValue)
         getList({ pageNum: 1, pageSize: 10, ...submitValue })
       }
@@ -92,7 +92,7 @@ function record(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: '手机号',
@@ -132,7 +132,7 @@ function record(props) {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '已领取' : '未领取'}</span></>
+      render: (status) => <><span>{status == 1 ? '已领取' : '未领取'}</span></>
     },
   ];
 
@@ -182,8 +182,22 @@ function record(props) {
               </Select>,
             )}
           </Form.Item>
-          
-          <Form.Item style={{position:'absolute',right:'38px'}}>
+
+        </div>
+        <div style={{ margin: '10px 0' }}>
+          <Form.Item>
+            <span style={{ marginRight: '10px' }}>兑换时间：</span>
+            {getFieldDecorator('exchangeTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
+          <Form.Item>
+            <span style={{ marginRight: '10px' }}>领取时间：</span>
+            {getFieldDecorator('receiveTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
+          <Form.Item >
             <AuthButton name="admin.taGoods.exchange" noRight={null}>
               <Button type="primary" htmlType="submit">
                 搜索
@@ -194,24 +208,11 @@ function record(props) {
             </Button>
           </Form.Item>
         </div>
-        <div style={{margin:'10px 0'}}>
-        <Form.Item>
-          <span style={{marginRight:'10px'}}>兑换时间：</span>
-            {getFieldDecorator('exchangeTime')(
-              <RangePicker placeholder={['开始时间','结束时间']}/>
-            )}
-          </Form.Item>
-          <Form.Item>
-          <span style={{marginRight:'10px'}}>领取时间：</span>
-            {getFieldDecorator('receiveTime')(
-              <RangePicker placeholder={['开始时间','结束时间']}/>
-            )}
-          </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/news/type/NewsType.jsx

@@ -136,7 +136,7 @@ function header(props) {
         <Form.Item>
             <AuthButton name="admin.taNewsType.search" noRight={null}>
               <Button type="primary" htmlType="submit" >
-                查询
+                搜索
               </Button>
             </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>

src/pages/statistical/activity/addRegistNum.jsx

@@ -86,6 +86,7 @@ class SharePersonNum extends React.Component {
     this.state = {
       formData: {
         personFrom: '',
+        province: '',
         pageNum:'',
         pageSize:'',
         startDate: startDate,
@@ -119,11 +120,13 @@ class SharePersonNum extends React.Component {
     let startDate = null
     let endDate = null
     const personFrom = this.props.form.getFieldValue("personFrom");
+    const province = this.props.form.getFieldValue("province");
     const { formData } = this.state
     this.setState({
       formData: {
         ...formData,
         personFrom: personFrom,
+        province: province,
       }
     }, this.getTableList)
   }
@@ -131,6 +134,34 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     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).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        province: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        buildingId: this.props.location.query.buildingId,      
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {
@@ -177,6 +208,9 @@ class SharePersonNum extends React.Component {
           <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 />,

src/pages/statistical/activity/compenents/Content.jsx

@@ -155,24 +155,6 @@ let columns = [
     dataIndex: 'activityName',
     key: 'activityName',
   },
-  {
-    title: '分享人数',
-    dataIndex: 'sharePersonNum',
-    key: 'sharePersonNum',
-    sorter: true,
-    render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
-    ),
-  },
-  {
-    title: '分享次数',
-    dataIndex: 'shareNum',
-    key: 'shareNum',
-    sorter: true,
-    render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
-    ),
-  },
   {
     title: '访问人数',
     dataIndex: 'visitPersonNum',
@@ -200,6 +182,24 @@ let columns = [
       <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
     ),
   },
+  {
+    title: '分享人数',
+    dataIndex: 'sharePersonNum',
+    key: 'sharePersonNum',
+    sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
+    ),
+  },
+  {
+    title: '分享次数',
+    dataIndex: 'shareNum',
+    key: 'shareNum',
+    sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+    ),
+  },
   {
     title: '详情',
     align: 'center',
@@ -225,14 +225,14 @@ class OverView extends React.Component {
   constructor(props) {
     super(props)
 
-    const defaultDays = 7
+    const defaultDays = 6
     dateType = defaultDays
     console.log(dateType)
     this.state = {
       radioVal: defaultDays,
       formData: {
 
-        startDate: moment().subtract(7, 'day').toDate(),
+        startDate: moment().subtract(6, 'day').toDate(),
         endDate: new Date,
         buildingId: '',
         targetType: '',
@@ -295,7 +295,6 @@ class OverView extends React.Component {
         activityName: activityName
       }
     }, this.getTableList)
-    // this.setState({ startDate: startDate, endDate: endDate, buildingId: this.props.form.getFieldValue("buildingId"), targetType: this.props.form.getFieldValue("targetType") })
   }
 
   //重置搜索
@@ -319,18 +318,6 @@ class OverView extends React.Component {
     }).catch()
   }
 
-  getDataOf = (days) => {
-    this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
-    this.getList({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
-  }
-
-  datalist = () => {
-    this.setState({
-      endDate: daterange[1] === '' ? new Date() : daterange[1],
-      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
-    })
-  }
-
   //排序
   handleTableChange = (pagination, filters, sorter) => {
     console.log(pagination, filters, sorter)
@@ -377,7 +364,7 @@ class OverView extends React.Component {
       <div >
         <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
           <Radio.Button value={0}>今日</Radio.Button>
-          <Radio.Button value={7}>最近7天</Radio.Button>
+          <Radio.Button value={6}>最近7天</Radio.Button>
           <Radio.Button value={30}>最近1月</Radio.Button>
         </Radio.Group>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
@@ -415,7 +402,7 @@ class OverView extends React.Component {
             </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>

src/pages/statistical/activity/compenents/ContentDesc.jsx

@@ -1,21 +0,0 @@
-import React, { PureComponent } from 'react'
-import { Modal, Row, Col } from 'antd'
-
-import Style from './style.less'
-
-
-export default function SaleBatchListHelpDoc(props) {
-  return (
-    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
-      <div className={Style.article}>
-        <div className={Style.section}>
-          <div>
-          1.楼盘多次开盘加推等销售行为，记录为多个“销售批次”，每个批次销售当前楼盘的一批不同房源。同一楼盘不同批次中房源不能重叠。<br/><br/>
-          2.发布状态为销售批次的发布状态，若为未发布，则小程序端无法查看房源、预选认筹。<br/><br/>
-          3.房源预选功能在预选管理中管理。房源认筹功能在认筹管理中管理。如果看不到左侧相关菜单或功能，请联系管理员配置。</div>
-        </div>
-        
-      </div>
-    </Modal>
-  );
-}

src/pages/statistical/activity/compenents/NewUsers.jsx

@@ -58,7 +58,7 @@ const NewUsers = (props) => {
       },
       icon: "rect",
       legend: {
-        data: ["分享次数", "分享人数", "访问次数", "访问人数", "新增注册用户"]
+        data: ["访问人数", "访问次数", "新增注册用户", "分享人数", "分享次数"]
       },
       toolbox: {},
       xAxis: {
@@ -68,7 +68,17 @@ const NewUsers = (props) => {
       dataZoom,
       series: [
         {
-          name: "分享次数",
+          name: "访问人数",
+          type: "line",
+          smooth:true, 
+        },
+        {
+          name: "访问次数",
+          type: "line",
+          smooth:true, 
+        },
+        {
+          name: "新增注册用户",
           type: "line",
           smooth:true, 
         },
@@ -78,23 +88,13 @@ const NewUsers = (props) => {
           smooth:true, 
         },
         {
-            name: "访问次数",
-            type: "line",
-            smooth:true, 
-          },
-          {
-            name: "访问人数",
-            type: "line",
-            smooth:true, 
-          },
-          {
-            name: "新增注册用户",
-            type: "line",
-            smooth:true, 
-          }
+          name: "分享次数",
+          type: "line",
+          smooth:true, 
+        },
       ],
       dataset: {
-        dimensions: ['date', 'shareCount', 'sharePersonCount', 'visitCount', 'visitPersonCount', 'addregistCount'],
+        dimensions: ['date', 'visitPersonCount', 'visitCount', 'addregistCount', 'sharePersonCount',  'shareCount'],
         source: dataset
       }
     

src/pages/statistical/activity/compenents/OverView.jsx

@@ -107,24 +107,6 @@ let columns = [
     dataIndex: 'date',
     key: 'date',
   },
-  {
-    title: '分享人数',
-    dataIndex: 'sharePersonNum',
-    key: 'sharePersonNum',
-    sorter: true,
-    render: (text, record) => (
-    <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
-    ),
-  },
-  {
-    title: '分享次数',
-    dataIndex: 'shareNum',
-    key: 'shareNum',
-    sorter: true,
-    render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
-      ),
-  },
   {
     title: '访问人数',
     dataIndex: 'visitPersonNum',
@@ -152,6 +134,24 @@ let columns = [
       <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
       ),
   },
+  {
+    title: '分享人数',
+    dataIndex: 'sharePersonNum',
+    key: 'sharePersonNum',
+    sorter: true,
+    render: (text, record) => (
+    <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
+    ),
+  },
+  {
+    title: '分享次数',
+    dataIndex: 'shareNum',
+    key: 'shareNum',
+    sorter: true,
+    render: (text, record) => (
+      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+      ),
+  },
 ]
 
 
@@ -170,12 +170,12 @@ class OverView extends React.Component {
   constructor(props) {
     super(props)
 
-    const defaultDays = 7
+    const defaultDays = 6
 
     this.state = {
       radioVal: defaultDays,
       formData: {
-        startDate: moment().subtract(7, 'day').toDate(),
+        startDate: moment().subtract(6, 'day').toDate(),
         endDate: new Date,
         buildingId: '',
         targetType: '',
@@ -193,6 +193,7 @@ class OverView extends React.Component {
       startDate: '',
       buildingId: [],
       targetType: [],
+      helpVisible: false,
     }
   }
 
@@ -244,7 +245,7 @@ class OverView extends React.Component {
     if (this.props.form.getFieldValue("startDate") != undefined){
       startDate = this.props.form.getFieldValue("startDate").toDate()
     }else{
-      startDate = moment().subtract(7, 'day').toDate()
+      startDate = moment().subtract(6, 'day').toDate()
     }
     if (this.props.form.getFieldValue("endDate") != undefined){
       endDate = this.props.form.getFieldValue("endDate").toDate()
@@ -267,6 +268,29 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    this.setState( {
+      radioVal: 6,
+      formData: {
+        startDate: moment().subtract(6, 'day').toDate(),
+        endDate: new Date,
+        buildingId: '',
+        targetType: '',
+        pageNum:'',
+        pageSize:'',
+        sort:null,
+        colKey:null
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      barData: {},
+      userType: 'all',
+      endDate: '',
+      startDate: '',
+      buildingId: [],
+      targetType: [],
+      helpVisible: false,
+    })
     this.getAllList()
   }
 
@@ -286,18 +310,6 @@ class OverView extends React.Component {
     }).catch()
   }
 
-  getDataOf = (days) => {
-    this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
-    this.getList({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
-  }
-
-  datalist = () => {
-    this.setState({ 
-      endDate: daterange[1] === '' ? new Date() : daterange[1],
-      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
-    })
-  }
-
   //排序
   handleTableChange = (pagination, filters, sorter) => {
     console.log(pagination, filters, sorter)
@@ -335,6 +347,9 @@ class OverView extends React.Component {
     }, this.getAllList)
   }
 
+  setShowHelp = (e) => {
+    this.setState({ ...this.state, helpVisible: e })
+  }
 
   render() {
     const { radioVal } = this.state
@@ -347,17 +362,22 @@ class OverView extends React.Component {
       <div >
         <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
           <Radio.Button value={0}>今日</Radio.Button>
-          <Radio.Button value={7}>最近7天</Radio.Button>
+          <Radio.Button value={6}>最近7天</Radio.Button>
           <Radio.Button value={30}>最近1月</Radio.Button>
         </Radio.Group>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('startDate')(
+            {getFieldDecorator('startDate', {initialValue: moment(startDate)
+              
+            })(
                 <DatePicker placeholder="开始日期"/>,
             )}
             </Form.Item>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('endDate')(
+            {getFieldDecorator('endDate', {
+                initialValue: moment(endDate)
+
+              })(
                 <DatePicker placeholder="结束日期"/>,
             )}
             </Form.Item>
@@ -381,7 +401,7 @@ class OverView extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          <Icon type="question-circle" theme="filled" style={{ marginTop:'25px', fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)}/>
+          <Icon type="question-circle" theme="filled" style={{ marginTop:'25px', fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => this.setShowHelp(true)}/>
           
           </Form>     
           
@@ -389,32 +409,32 @@ class OverView extends React.Component {
 
             <div style={{ display: 'flex', marginBottom: '33px' }}>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-                borderRadius: '12px', width: '32%', marginRight: '2%'
-            }}>
-                <span style={{ fontSize: '24px', color: '#fff' }}>分享总次数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.shareNum || '0'}</span>
-            </div>
-            <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: '#FFC6AA', height: '100px',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
-                <span style={{ fontSize: '24px', color: '#fff' }}>分享总人数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.sharePersonNum || '0'}</span>
-            </div>
+                <span style={{ fontSize: '24px', color: '#fff' }}>访问总人数 </span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitPersonNum || '0'}</span>
+            </div>  
             <div style={{
                 textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
                 <span style={{ fontSize: '24px', color: '#fff' }}>访问总次数 </span>
                 <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitNum || '0'}</span>
+            </div>  
+            <div style={{
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: '#FFC6AA', height: '100px',
+                borderRadius: '12px', width: '32%', marginRight: '2%'
+            }}>
+                <span style={{ fontSize: '24px', color: '#fff' }}>分享总人数 </span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.sharePersonNum || '0'}</span>
             </div>
             <div style={{
-                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
+                textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
                 borderRadius: '12px', width: '32%', marginRight: '2%'
             }}>
-                <span style={{ fontSize: '24px', color: '#fff' }}>访问总人数 </span>
-                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.visitPersonNum || '0'}</span>
+                <span style={{ fontSize: '24px', color: '#fff' }}>分享总次数 </span>
+                <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{ this.state.personData.shareNum || '0'}</span>
             </div>
             </div>
           
@@ -431,6 +451,40 @@ class OverView extends React.Component {
           <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
         </div>
       </div>
+
+      <Modal
+          title="指标说明"
+          visible={this.state.helpVisible}
+          onCancel={() => this.setShowHelp(false)}
+          footer={null}
+        >
+          <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+            
+            
+          </Row>
+          <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+          </Row>
+          
+          <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过分享的活动授权手机号的总人数</p>
+          </Row>
+          
+          <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+          </Row>
+          
+          <Row>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p> 
+          </Row>
+          
+        </Modal>
     </>
     )
     

src/pages/statistical/activity/detail.jsx

@@ -37,7 +37,7 @@ function record(props) {
     // 查询列表
     const getList = (params) => {
         request({ ...apis.stats.activityDetail, params: { ...params }, }).then((data) => {
-            setData(data)
+            setData((data || []).slice().reverse())
             setChartsData(data)
             updataLoading(false)
         }).catch(err => {
@@ -47,7 +47,18 @@ function record(props) {
 
     //重置搜索
     function handleReset() {
+        updateRadioVal(6)
+        updateFormData({
+            ...formData,
+            startDate: moment().subtract(6, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+        })
         props.form.resetFields();
+        getList({
+            ...formData,
+            startDate: moment().subtract(6, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+        });
     }
 
     // 提交事件
@@ -63,17 +74,18 @@ function record(props) {
             }
         });
     }
+
     // 切换日期 与picker联动
     function setFormData(e) {
         updateRadioVal(e.target.value)
         updateFormData({
             ...formData,
-            startDate: moment().subtract(e.target.value, 'day').format('YYYY-MM-DD'),
-            endDate: moment().format('YYYY-MM-DD'),
+            startDate: moment().subtract(e.target.value, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
         })
         getList({
-            ...formData, startDate: moment().subtract(e.target.value, 'day').format('YYYY-MM-DD'),
-            endDate: moment().format('YYYY-MM-DD'),
+            ...formData, startDate: moment().subtract(e.target.value, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
         });
 
     }
@@ -187,29 +199,12 @@ function record(props) {
             key: 'statisDate',
             align: 'center',
         },
-        {
-            title: '分享人数',
-            dataIndex: 'sharePersons',
-            key: 'sharePersons',
-            sorter: true,
-            render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toSharePersons(record)}><span>{record.sharePersons}</span></a>
-            ),
-        },
-        {
-            title: '分享次数',
-            dataIndex: 'shareNum',
-            key: 'shareNum',
-            sorter: true,
-            render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
-            ),
-        },
         {
             title: '访问人数',
             dataIndex: 'visitPersons',
             key: 'visitPersons',
             sorter: true,
+            align: 'center',
             render: (text, record) => (
                 <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersons}</span></a>
             ),
@@ -219,6 +214,7 @@ function record(props) {
             dataIndex: 'visitNum',
             key: 'visitNum',
             sorter: true,
+            align: 'center',
             render: (text, record) => (
                 <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
             ),
@@ -228,10 +224,31 @@ function record(props) {
             dataIndex: 'newCustomers',
             key: 'newCustomers',
             sorter: true,
+            align: 'center',
             render: (text, record) => (
                 <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.newCustomers}</span></a>
             ),
         },
+        {
+            title: '分享人数',
+            dataIndex: 'sharePersons',
+            key: 'sharePersons',
+            sorter: true,
+            align: 'center',
+            render: (text, record) => (
+                <a style={{ color: '#66B3FF' }} onClick={toSharePersons(record)}><span>{record.sharePersons}</span></a>
+            ),
+        },
+        {
+            title: '分享次数',
+            dataIndex: 'shareNum',
+            key: 'shareNum',
+            sorter: true,
+            align: 'center',
+            render: (text, record) => (
+                <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+            ),
+        },
     ];
     // 下载文档
     function download(data) {
@@ -284,7 +301,7 @@ function record(props) {
         },
         icon: "rect",
         legend: {
-            data: ["分享次数", "分享人数", "访问次数", "访问人数", "新增注册用户"]
+            data: ["访问人数", "访问次数", "新增注册用户", "分享人数", "分享次数"]
         },
         toolbox: {},
         xAxis: {
@@ -294,28 +311,29 @@ function record(props) {
         dataZoom,
         series: [
             {
-                name: "分享次数",
+                name: "访问人数",
                 type: "line",
             },
             {
-                name: "分享人数",
+                name: "访问次数",
                 type: "line",
             },
+
             {
-                name: "访问次数",
+                name: "新增注册用户",
                 type: "line",
             },
             {
-                name: "访问人数",
+                name: "分享人数",
                 type: "line",
             },
             {
-                name: "新增注册用户",
+                name: "分享次数",
                 type: "line",
             }
         ],
         dataset: {
-            dimensions: ['statisDate', 'shareNum', 'sharePersons', 'visitNum', 'visitPersons', 'newCustomers'],
+            dimensions: ['statisDate', 'visitPersons', 'visitNum', 'newCustomers', 'sharePersons', 'shareNum'],
             source: dataset
         }
     }
@@ -339,8 +357,8 @@ function record(props) {
                     <Form.Item>
                         <RangePicker value={dateRange} onChange={handleDateChange} placeholder={['开始日期', '结束日期']} />
                     </Form.Item>
-                    <Form.Item style={{ position: 'absolute', right: '38px' }}>
-                        <Button type="primary" onClick={handleSubmit}>查询</Button>
+                    <Form.Item>
+                        <Button type="primary" onClick={handleSubmit}>搜索</Button>
                         <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                     </Form.Item>
                 </div>

src/pages/statistical/activity/index.jsx

@@ -7,7 +7,6 @@ import { router } from 'umi';
 
 import OverView from './compenents/OverView'
 import Content from './compenents/Content'
-import ContentDesc from './compenents/ContentDesc'
 
 
 

src/pages/statistical/activity/shareNum.jsx

@@ -128,6 +128,38 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     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).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum:'',
+        pageSize:'',
+        shareName:'',
+        sort:null,
+        colKey:null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        personId: this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId   
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/sharePersonNum.jsx

@@ -209,6 +209,44 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    queryDate = this.props.location.query.queryDate
+    activityName = this.props.location.query.activityName
+    staticStartDate = this.props.location.query.startDate;
+    staticEndDate = this.props.location.query.endDate;
+    activityId = this.props.location.query.activityId;
+    activityType = this.props.location.query.activityType;
+    
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        sharePhone: '',
+        sharePersonType: '',
+        pageNum:'',
+        pageSize:'',
+        shareName:'',
+        sort:null,
+        colKey:null,
+        startDate: startDate,
+        endDate: endDate,
+        activityId: this.props.location.query.activityId,
+        activityType: this.props.location.query.activityType,
+        buildingId: this.props.location.query.buildingId,         
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    }) 
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/visitNum.jsx

@@ -151,6 +151,37 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     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).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        personId: this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/visitPersonNum.jsx

@@ -146,6 +146,38 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     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).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    this.setState({
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: this.props.location.query.activityId,
+        activityType: this.props.location.query.activityType ,
+        personId:  this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName: this.props.location.query.activityName
+    })
+    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/building/detail.jsx

@@ -29,12 +29,13 @@ class buildingDetailStats extends React.Component {
       startDate: {},
       buildingId: props.location.query.buildingId,
       buildingName: props.location.query.buildingName,
+      radioValue: 'a'
     }
   }
 
   componentDidMount() {
-    this.getTimeBarDate(moment().subtract(7, 'day').toDate(),new Date())
-    this.getTimeTableData(moment().subtract(7, 'day').toDate(),new Date())
+    this.getTimeBarDate(moment().subtract(6, 'day').toDate(),new Date())
+    this.getTimeTableData(moment().subtract(6, 'day').toDate(),new Date())
     this.setState({...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
     
   }
@@ -66,20 +67,20 @@ class buildingDetailStats extends React.Component {
   }
 
   //切换三个标签页
-  getDataOf = (days) => {
+  getDataOf = (days,val) => {
     this.getTimeBarDate(moment().subtract(days, 'day').toDate(),new Date())
     this.getTimeTableData(moment().subtract(days, 'day').toDate(),new Date())
-    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate(), radioValue: val })
   }
 
   //点击查询
   datalist = () => {
-    this.getTimeBarDate(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
-    this.getTimeTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTimeBarDate(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTimeTableData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],daterange[1] === undefined ? new Date() : daterange[1])
     this.setState({ 
       ...this.state,
       endDate: daterange[1] === undefined ? new Date() : daterange[1],
-      startDate: daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],
+      startDate: daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],
     })
     
   }
@@ -113,6 +114,9 @@ class buildingDetailStats extends React.Component {
   handleReset = () => {
     daterange = []
     this.props.form.resetFields();
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate(), radioValue: "a" })
+    this.getTimeBarDate(moment().subtract(6, 'day').toDate(),new Date())
+    this.getTimeTableData(moment().subtract(6, 'day').toDate(),new Date())
   }
 
   render() {
@@ -152,15 +156,14 @@ class buildingDetailStats extends React.Component {
     return (
     <div>
       <Form layout="inline">
-      <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</Radio.Button>
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+      <Radio.Group buttonStyle="solid" value={this.state.radioValue}>
+          <Radio.Button value="c" onClick={() => this.getDataOf(0,"c")}>今日</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6,"a")}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={() => this.getDataOf(30,"b")}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
         {getFieldDecorator('time', {
             initialValue: [],
-            rules: [{ required: true, message: '请上传封面图1' }],
         })(
           <RangePicker
             style={{ paddingLeft: '30px' }}
@@ -173,9 +176,9 @@ class buildingDetailStats extends React.Component {
         )}
         </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
-          查询
+          搜索
         </Button>
-        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
         </Form>
         <StatsChartLine title={this.state.buildingName} data={this.state.barData} />
         <Row>

src/pages/statistical/building/index.jsx

@@ -27,14 +27,15 @@ class buildingStats extends React.Component {
       userType: 'all',
       endDate: {},
       startDate: {},
-      buildingId: ''
+      buildingId: '',
+      radioValue: 'a'
     }
   }
 
   componentDidMount() {
-    this.getBarData(moment().subtract(7, 'day').toDate(), new Date())
-    this.getTableData(moment().subtract(7, 'day').toDate(), new Date(), this.state.buildingId)
-    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
+    this.getBarData(moment().subtract(6, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(6, 'day').toDate(), new Date(), this.state.buildingId)
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate() })
 
   }
 
@@ -65,20 +66,20 @@ class buildingStats extends React.Component {
   }
 
   //切换三个标签页
-  getDataOf = (days) => {
+  getDataOf = (days,val) => {
     this.getBarData(moment().subtract(days, 'day').toDate(), new Date())
     this.getTableData(moment().subtract(days, 'day').toDate(), new Date(), this.state.buildingId)
-    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(days, 'day').toDate(), radioValue: val })
   }
 
   //点击查询
   datalist = () => {
-    this.getBarData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1])
-    this.getTableData(daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1], this.state.buildingId)
+    this.getBarData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1])
+    this.getTableData(daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0], daterange[1] === undefined ? new Date() : daterange[1], this.state.buildingId)
     this.setState({
       ...this.state,
       endDate: daterange[1] === undefined ? new Date() : daterange[1],
-      startDate: daterange[0] === undefined ? moment().subtract(7, 'day').toDate() : daterange[0],
+      startDate: daterange[0] === undefined ? moment().subtract(6, 'day').toDate() : daterange[0],
     })
 
   }
@@ -129,6 +130,9 @@ class buildingStats extends React.Component {
   handleReset = () => {
     daterange = []
     this.props.form.resetFields();
+    this.setState({ ...this.state, endDate: new Date(), startDate: moment().subtract(6, 'day').toDate(), radioValue: "a" })
+    this.getBarData(moment().subtract(6, 'day').toDate(), new Date())
+    this.getTableData(moment().subtract(6, 'day').toDate(), new Date(), this.state.buildingId)
   }
 
   render() {
@@ -181,15 +185,14 @@ class buildingStats extends React.Component {
 
     <div>
       <Form layout="inline">
-      <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="c" onClick={() => this.getDataOf(0)}>今日</Radio.Button>
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+      <Radio.Group buttonStyle="solid" value={this.state.radioValue}>
+          <Radio.Button value="c" onClick={() => this.getDataOf(0,"c")}>今日</Radio.Button>
+          <Radio.Button value="a" onClick={() => this.getDataOf(6,"a")}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={() => this.getDataOf(30,"b")}>最近1月</Radio.Button>
         </Radio.Group>
         <Form.Item>
         {getFieldDecorator('time', {
             initialValue: [],
-            rules: [{ required: true, message: '请上传封面图1' }],
         })(
           <RangePicker
               style={{ paddingLeft: '30px' }}
@@ -202,9 +205,9 @@ class buildingStats extends React.Component {
         )}
         </Form.Item>
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
-          查询
+          搜索
         </Button>
-        <Button type="danger" onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
+        <Button onClick={this.handleReset} style={{ marginBottom: '18px', marginLeft: '30px' }}>重置</Button>
         </Form>
         <div style={{fontSize:'0.09rem',color:'#999',marginBottom:'0.16rem'}}>最多显示6个项目，其他项目请在下方详细数据中搜索</div>
         <Row>

src/pages/statistical/consultant/homePagePersons.jsx

@@ -115,7 +115,8 @@ function record(props) {
 
         <>
             <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
-            <Table rowKey={record => (record.phone + record.buildingId || '')}
+            <Table rowKey={(index => { index })}
+                // <Table rowKey={record => (record.phone + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}

src/pages/statistical/consultant/index.jsx

@@ -385,7 +385,7 @@ function record(props) {
     return (
 
         <>
-            <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00',marginBottom:'10px' }} onClick={() => setVisible(true)} />
+            <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginBottom: '10px' }} onClick={() => setVisible(true)} />
             <Modal
                 title="指标说明（数据会存在一定时间延迟）"
                 centered
@@ -425,8 +425,8 @@ function record(props) {
                     <Form.Item>
                         <BuildSelect value={formData.buildingId} onChange={handleBuildingChange} />
                     </Form.Item>
-                    <Form.Item style={{ position: 'absolute', right: '38px' }}>
-                        <Button type="primary" onClick={handleSubmit}>查询</Button>
+                    <Form.Item >
+                        <Button type="primary" onClick={handleSubmit}>搜索</Button>
                         <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                     </Form.Item>
                 </div>
@@ -436,7 +436,7 @@ function record(props) {
                     导出
                 </Button>
             </AuthButton>
-            <Table rowKey={record => (record.userId + record.buildingId || '')}
+            <Table rowKey={(index => { index })}
                 style={{ marginTop: '30px' }}
                 dataSource={_list}
                 // dataSource={data.records}

src/pages/statistical/consultant/sharetable.jsx

@@ -64,6 +64,10 @@ const showTypeList = [
         label: '在线选房',
         value: 'houseApp',
     },
+    {
+        label: '个人主页',
+        value: 'consultant',
+    },
 ]
 
 /**
@@ -137,10 +141,10 @@ function record(props) {
         },
         {
             title: '分享时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];
@@ -175,7 +179,8 @@ function record(props) {
                     </Form.Item>
                 </div>
             </Form>
-            <Table rowKey={record => (record.personId + record.buildingId || '')}
+            <Table rowKey={(index => { index })}
+            // <Table rowKey={record => (record.personId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}

src/pages/statistical/consultant/table.jsx

@@ -135,10 +135,10 @@ function record(props) {
                 [
                     {
                         title: '报备时间',
-                        dataIndex: 'reportDate',
-                        key: 'reportDate',
+                        dataIndex: 'visitTime',
+                        key: 'visitTime',
                         align: 'center',
-                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+                        render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
                     },
                 ]
     const columns = basicColunms.concat(lastColum)

src/pages/statistical/consultant/visitPersons.jsx

@@ -95,10 +95,10 @@ function record(props) {
         },
         {
             title: '最后访问时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.visitTime && moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];
@@ -107,7 +107,8 @@ function record(props) {
 
         <>
             <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
-            <Table rowKey={record => (record.personId + record.buildingId || '')}
+            <Table rowKey={(index => { index })}
+            // <Table rowKey={record => (record.personId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}

src/pages/system/document/list.jsx

@@ -139,7 +139,7 @@ function body(props) {
         <Form.Item>
         <AuthButton name="admin.documentVerify.search" noRight={null}>
           <Button type="primary" htmlType="submit">
-            查询
+            搜索
           </Button>
           </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;