bug fix

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

@@ -192,7 +192,7 @@ class OverView extends React.Component {
       endDate: '',
       startDate: '',
       buildingId: [],
-      targetType: []
+      targetType: [],
     }
   }
 
@@ -243,9 +243,13 @@ class OverView extends React.Component {
     const targetType = this.props.form.getFieldValue("targetType");
     if (this.props.form.getFieldValue("startDate") != undefined){
       startDate = this.props.form.getFieldValue("startDate").toDate()
+    }else{
+      startDate = moment().subtract(7, 'day').toDate()
     }
     if (this.props.form.getFieldValue("endDate") != undefined){
       endDate = this.props.form.getFieldValue("endDate").toDate()
+    }else{
+      endDate = new Date
     }
     const { formData } = this.state
     this.setState({
@@ -263,6 +267,7 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    this.getAllList()
   }
 
   exportActivityStats = () => {
@@ -347,16 +352,12 @@ class OverView extends React.Component {
         </Radio.Group>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('startDate', {initialValue: moment(startDate)
-              
-            })(
+            {getFieldDecorator('startDate')(
                 <DatePicker placeholder="开始日期"/>,
             )}
             </Form.Item>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('endDate', {initialValue: moment(endDate)
-              
-            })(
+            {getFieldDecorator('endDate')(
                 <DatePicker placeholder="结束日期"/>,
             )}
             </Form.Item>
@@ -380,7 +381,10 @@ 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)}/>
+          
           </Form>     
+          
         <div>
 
             <div style={{ display: 'flex', marginBottom: '33px' }}>

src/pages/statistical/activity/index.jsx

@@ -48,14 +48,16 @@ function EditHouse(props) {
 
   return (
     <>
+    
       <Tabs type="card" value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <TabPane tab="统计总况" key="overView" ></TabPane>
         <TabPane tab="统计内容" key="content" ></TabPane>
-        {/* <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} /> */}
       </Tabs>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'overView' && <OverView />)}
         { (tab === 'content' && <Content />)}
+        { (tab === 'desc' && <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} />)}
+        
       </div>
     </>
   )

src/pages/statistical/activity/shareNum.jsx

@@ -33,7 +33,7 @@ let columns = [
     key: 'shareType',
     render: (text, records) => {
       if (records.sharePersonType === 'drift') { return '游客' }
-      if (records.sharePersonType === 'customer') { return '客户' }
+      if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
     },
   },

src/pages/statistical/activity/sharePersonNum.jsx

@@ -85,7 +85,7 @@ let columns = [
     key: 'sharePersonType',
     render: (text, records) => {
       if (records.sharePersonType === 'drift') { return '游客' }
-      if (records.sharePersonType === 'customer') { return '客户' }
+      if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
     },
   },

src/pages/statistical/activity/visitPersonNum.jsx

@@ -59,15 +59,10 @@ let columns = [
     key: 'realtyConsultantPhone',
   },
   {
-    title: '分享者',
+    title: '推广人',
     dataIndex: 'sharePersonName',
     key: 'sharePersonName',
   },
-  {
-    title: '分享者电话',
-    dataIndex: 'sharePersonPhone',
-    key: 'sharePersonPhone',
-  },
   {
     title: '访问次数',
     dataIndex: 'visitNum',