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

src/pages/channel/newCustomer/index.jsx

@@ -53,12 +53,28 @@ const qrcodelist = props => {
     const toVisitNum = (record) => {
         router.push({
             pathname: '/channel/newCustomer/visitNum',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                visitNum: record.visitNum,
+              },
         });
     }
 
     const toPersonNum = (record) => {
         router.push({
             pathname: '/channel/newCustomer/personNum',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                visitPersons: record.visitPersons,
+              },
         });
     }
 

src/pages/channel/newCustomer/personNum.jsx

@@ -16,9 +16,8 @@ const data = [
 ]
 
 const dataRecord = props => {
-    //   const [data, setData] = useState({})
-    //   const activityId = props.id
-    //   const activityType = props.type
+      const [data, setData] = useState({})
+      const { targetId, targetType, channelId, targetName, buildingId, visitPersons } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -26,14 +25,12 @@ const dataRecord = props => {
     }, [])
 
     const getList = params => {
-        // console.log(params)
-        // request({ ...apis.activityDataStatis.activityAddRegist, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-        //   console.log(data)
-        //   props.getData()
-        //   setData(data)
-        // }).catch(e => {
-        //   console.log(e)
-        // })
+        console.log(params)
+        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId} }).then(data => {
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
     }
 
     const columns = [
@@ -97,16 +94,16 @@ const dataRecord = props => {
     return <>
         <div>
             <div>
-                <span>内容{}</span>
+                <span>内容{targetName}</span>
                 <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
                     返回
                </Button>
             </div>
             <div style={{ marginTop: '20px'  }}>
-                <span>访问人数{}</span>
+                <span>访问人数:{visitPersons}</span>
                 <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
             </div>
-            <Table style={{ marginTop: '30px' }} dataSource={data} columns={columns} pagination={false} rowKey="activityList" />
+            <Table style={{ marginTop: '30px' }} dataSource={data.records || []} columns={columns} pagination={false} rowKey="activityList" />
             {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div> */}

src/pages/channel/newCustomer/visitNum.jsx

@@ -16,9 +16,8 @@ const data = [
 ]
 
 const dataRecord = props => {
-    //   const [data, setData] = useState({})
-    //   const activityId = props.id
-    //   const activityType = props.type
+    const [data, setData] = useState({})
+    const { targetId, targetType, channelId, targetName, buildingId, visitNum } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -26,14 +25,13 @@ const dataRecord = props => {
     }, [])
 
     const getList = params => {
-        // console.log(params)
-        // request({ ...apis.activityDataStatis.activityAddRegist, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-        //   console.log(data)
-        //   props.getData()
-        //   setData(data)
-        // }).catch(e => {
-        //   console.log(e)
-        // })
+        console.log(params)
+        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
+          console.log(data)
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
     }
 
     const columns = [
@@ -62,9 +60,9 @@ const dataRecord = props => {
             align: 'center',
         },
         {
-            title: '访问次数',
-            dataIndex: 'personFrom',
-            key: 'personFrom',
+            title: '访问时间',
+            dataIndex: 'visitDate',
+            key: 'visitDate',
             align: 'center',
         },
 
@@ -97,16 +95,16 @@ const dataRecord = props => {
     return <>
         <div>
             <div>
-                <span>内容{}</span>
+                <span>内容:{targetName}</span>
                 <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
                     返回
                </Button>
             </div>
             <div style={{ marginTop: '20px'  }}>
-                <span>访问人数{}</span>
+                <span>访问人数:{visitNum}</span>
                 <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
             </div>
-            <Table style={{ marginTop: '30px' }} dataSource={data} columns={columns} pagination={false} rowKey="activityList" />
+            <Table style={{ marginTop: '30px' }} dataSource={data.records || []} columns={columns} pagination={false} rowKey="activityList" />
             {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div> */}

src/services/apis.js

@@ -893,6 +893,16 @@ export default {
       method: 'GET',
       action: 'admin.channel.introductionList.newuserList.get',
     },
+    visitNumList: {
+      url: `${prefix}/channel/introduction/visitNumList`,
+      method: 'GET',
+      action: 'admin.channel.introductionList.visitNumList.get',
+    },
+    personNumList: {
+      url: `${prefix}/channel/introduction/personNumList`,
+      method: 'GET',
+      action: 'admin.channel.introductionList.personNumList.get',
+    }
   },
   role: {
     getRoleList: {