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

src/pages/channel/newCustomer/dataRecord.jsx

@@ -8,7 +8,7 @@ import AuthButton from '../../../components/AuthButton';
 
 const dataRecord = props => {
     const [data, setData] = useState({})
-    const { targetId, targetType, channelId, targetName, buildingId, newCustomers } = props.location.query
+    const { targetId, targetType, channelId, targetName, buildingId, newCustomers, startDate, endDate } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -16,7 +16,7 @@ const dataRecord = props => {
     }, [])
 
     const getList = params => {
-        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
+        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
             console.log(data,"dddddddddddd")
           setData(data)
         }).catch(e => {
@@ -71,7 +71,7 @@ const dataRecord = props => {
     const exportExcel = () => {
         // const fieldsValue = getFieldsValue()
         // console.log('fieldsValue', fieldsValue)
-        request({ ...apis.channelList.newuserListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } })
+        request({ ...apis.channelList.newuserListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
           .then(data => {
             if (!data) {
               return

src/pages/channel/newCustomer/personNum.jsx

@@ -17,7 +17,7 @@ const data = [
 
 const dataRecord = props => {
       const [data, setData] = useState({})
-      const { targetId, targetType, channelId, targetName, buildingId, visitPersons } = props.location.query
+      const { targetId, targetType, channelId, targetName, buildingId, visitPersons, startDate, endDate } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -26,7 +26,7 @@ const dataRecord = props => {
 
     const getList = params => {
         console.log(params)
-        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId} }).then(data => {
+        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} }).then(data => {
           setData(data)
         }).catch(e => {
           console.log(e)
@@ -80,7 +80,7 @@ const dataRecord = props => {
     const exportExcel = () => {
         // const fieldsValue = getFieldsValue()
         // console.log('fieldsValue', fieldsValue)
-        request({ ...apis.channelList.personNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId} })
+        request({ ...apis.channelList.personNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} })
           .then(data => {
             if (!data) {
               return

src/pages/channel/newCustomer/visitNum.jsx

@@ -17,7 +17,7 @@ const data = [
 
 const dataRecord = props => {
     const [data, setData] = useState({})
-    const { targetId, targetType, channelId, targetName, buildingId, visitNum } = props.location.query
+    const { targetId, targetType, channelId, targetName, buildingId, visitNum, startDate, endDate } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -26,7 +26,7 @@ const dataRecord = props => {
 
     const getList = params => {
         console.log(params)
-        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
+        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
           console.log(data)
           setData(data)
         }).catch(e => {
@@ -81,7 +81,7 @@ const dataRecord = props => {
     const exportExcel = () => {
         // const fieldsValue = getFieldsValue()
         // console.log('fieldsValue', fieldsValue)
-        request({ ...apis.channelList.visitNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } })
+        request({ ...apis.channelList.visitNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
           .then(data => {
             if (!data) {
               return