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

src/pages/activity/ActivityList.jsx

@@ -223,11 +223,12 @@ const header = props => {
   }
 
   // 提交事件
-  const handleSubmit = (e, props) => {
+  const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
+        values.time = `${moment(values.time).format('YYYY-MM-DDT00:00:00.000')}Z`
         getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
@@ -246,7 +247,7 @@ const header = props => {
     <>
       {/* style={{ display: 'none' }} */}
       <div id="qrcode"></div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
             <SelectCity />,

src/pages/customer/customerlist/components/attribution.jsx

@@ -51,7 +51,7 @@ class ModalAttribution extends React.Component {
 
   getList(params) {
     console.log('params: ', params)
-    if (params.buildingId === '') {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
     }
     // 网路请求

src/pages/customer/recommendCustomer/components/attribution.jsx

@@ -49,7 +49,7 @@ class ModalAttribution extends React.Component {
   }
 
   getList(params) {
-    if (params.buildingId === '') {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
     }
 
@@ -104,8 +104,8 @@ class ModalAttribution extends React.Component {
       // },
       {
         title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'userName',
+        key: 'userName',
       },
       {
         title: '电话',
@@ -119,8 +119,8 @@ class ModalAttribution extends React.Component {
       },
       {
         title: '岗位',
-        dataIndex: 'post',
-        key: 'post',
+        dataIndex: 'position',
+        key: 'position',
       },
       {
         title: '操作',

src/pages/indexEcharts/userBehavior.jsx

@@ -40,8 +40,8 @@ const header = props => {
     request({
       ...apis.indexEcharts.bizEvent.dict,
     }).then((data) => {
-      setEventTypes(data.records)
-
+      const eventType = ['agent', 'main']
+      setEventTypes(data.records.filter(item => !eventType.includes(item.typeId)))
     })
   }
   const [eventList, setEventList] = useState([])

src/pages/indexEcharts/userSource.jsx

@@ -96,7 +96,11 @@ class Header extends React.Component {
   }
 
   datalist = () => {
-    this.setState({ endDate: daterange[1], startDate: daterange[0] })
+    console.log()
+    this.setState({ 
+      endDate: daterange[1] === '' ? new Date() : daterange[1],
+      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
+    })
   }
 
   onSuccess = e => {