fix

src/pages/activity/ActivityList.jsx

@@ -115,7 +115,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 getJoinPeople = (helpActivityId) => () => {
       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/statistical/activity/compenents/Content.jsx

@@ -225,7 +225,7 @@ class OverView extends React.Component {
   constructor(props) {
     super(props)
 
-    const defaultDays = 7
+    const defaultDays = 6
     dateType = defaultDays
     console.log(dateType)
     this.state = {
@@ -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: '',
@@ -245,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()
@@ -262,7 +262,7 @@ class OverView extends React.Component {
         targetType: targetType
       }
     }, this.getAllList)
-    this.setState({ startDate: startDate, endDate: endDate, buildingId: this.props.form.getFieldValue("buildingId"), targetType: this.props.form.getFieldValue("targetType") })
+    // this.setState({ startDate: startDate, endDate: endDate, buildingId: this.props.form.getFieldValue("buildingId"), targetType: this.props.form.getFieldValue("targetType") })
   }
 
   //重置搜索
@@ -287,18 +287,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)
@@ -337,7 +325,6 @@ class OverView extends React.Component {
   }
 
   setShowHelp = (e) => {
-    console.log(e,"sssssssssssssssss")
     this.setState({ ...this.state, helpVisible: e })
   }
 
@@ -352,17 +339,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>
@@ -394,32 +386,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>
           

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'