Browse Source

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

zhoulisen 5 years ago
parent
commit
00a74dbc79

+ 672
- 669
src/pages/customer/customerlist/index.jsx
File diff suppressed because it is too large
View File


+ 1
- 2
src/pages/statistical/activity/addRegistNum.jsx View File

162
       tableData: [],
162
       tableData: [],
163
       userType: 'all',
163
       userType: 'all',
164
       activityName:  this.props.location.query.activityName
164
       activityName:  this.props.location.query.activityName
165
-    })
166
-    this.getTableList()
165
+    },this.getTableList)
167
   }
166
   }
168
 
167
 
169
   goback = () => {
168
   goback = () => {

+ 1
- 2
src/pages/statistical/activity/shareNum.jsx View File

159
       tableData: [],
159
       tableData: [],
160
       userType: 'all',
160
       userType: 'all',
161
       activityName:  this.props.location.query.activityName
161
       activityName:  this.props.location.query.activityName
162
-    })
163
-    this.getTableList()
162
+    },this.getTableList)
164
   }
163
   }
165
 
164
 
166
   goback = () => {
165
   goback = () => {

+ 1
- 2
src/pages/statistical/activity/sharePersonNum.jsx View File

247
       tableData: [],
247
       tableData: [],
248
       userType: 'all',
248
       userType: 'all',
249
       activityName:  this.props.location.query.activityName
249
       activityName:  this.props.location.query.activityName
250
-    }) 
251
-    this.getTableList()
250
+    },this.getTableList) 
252
   }
251
   }
253
 
252
 
254
   goback = () => {
253
   goback = () => {

+ 31
- 0
src/pages/statistical/activity/visitNum.jsx View File

153
   //重置搜索
153
   //重置搜索
154
   handleReset = e => {
154
   handleReset = e => {
155
     this.props.form.resetFields()
155
     this.props.form.resetFields()
156
+    let startDate;
157
+    let endDate;
158
+    if (this.props.location.query.queryDate){
159
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
160
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
161
+    }else{
162
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
163
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
164
+    }
165
+    console.log(startDate)
166
+    this.setState( {
167
+      formData: {
168
+        personFrom: '',
169
+        pageNum:'',
170
+        pageSize:'',
171
+        startDate: startDate,
172
+        endDate: endDate,
173
+        province:'',
174
+        realtyConsultant:'',
175
+        realtyConsultantPhone:'',
176
+        activityId: this.props.location.query.activityId,
177
+        activityType:this.props.location.query.activityType,
178
+        personId: this.props.location.query.personId,
179
+        buildingId: this.props.location.query.buildingId
180
+      },
181
+      personData: [],  
182
+      dataSoures: [],
183
+      tableData: [],
184
+      userType: 'all',
185
+      activityName:  this.props.location.query.activityName
186
+    }, this.getTableList)
156
   }
187
   }
157
 
188
 
158
   goback = () => {
189
   goback = () => {

+ 1
- 2
src/pages/statistical/activity/visitPersonNum.jsx View File

178
       tableData: [],
178
       tableData: [],
179
       userType: 'all',
179
       userType: 'all',
180
       activityName: this.props.location.query.activityName
180
       activityName: this.props.location.query.activityName
181
-    })
182
-    this.getTableList()
181
+    },this.getTableList)
183
   }
182
   }
184
 
183
 
185
   goback = () => {
184
   goback = () => {

+ 1
- 1
src/pages/statistical/consultant/index.jsx View File

422
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享访问人数:</p>
422
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享访问人数:</p>
423
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享访问小程序内容的用户数</p>
423
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享访问小程序内容的用户数</p>
424
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享拓客:</p>
424
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享拓客:</p>
425
-                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享内容进行手机授权的用户数</p>
425
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享的内容,绑定为置业顾问私客的用户数</p>
426
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>咨询数:</p>
426
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>咨询数:</p>
427
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>在线微聊,咨询置业顾问的用户数</p>
427
                 <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>在线微聊,咨询置业顾问的用户数</p>
428
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>点赞数:</p>
428
                 <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>点赞数:</p>