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

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)
   }
@@ -177,6 +180,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',
@@ -232,7 +232,7 @@ class OverView extends React.Component {
       radioVal: defaultDays,
       formData: {
 
-        startDate: moment().subtract(7, 'day').toDate(),
+        startDate: moment().subtract(6, 'day').toDate(),
         endDate: new Date,
         buildingId: '',
         targetType: '',

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

@@ -193,6 +193,7 @@ class OverView extends React.Component {
       startDate: '',
       buildingId: [],
       targetType: [],
+      helpVisible: false,
     }
   }
 
@@ -335,6 +336,10 @@ class OverView extends React.Component {
     }, this.getAllList)
   }
 
+  setShowHelp = (e) => {
+    console.log(e,"sssssssssssssssss")
+    this.setState({ ...this.state, helpVisible: e })
+  }
 
   render() {
     const { radioVal } = this.state
@@ -381,7 +386,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>     
           
@@ -431,6 +436,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>
     </>
     )