新需求

config/routes.js

@@ -210,10 +210,22 @@ export default [
               },
               {
                 path: '/channel/newCustomer/dataRecord',
-                name: '引进注册用户',
+                name: '注册用户',
                 hideInMenu: true,
                 component: './channel/newCustomer/dataRecord',
               },
+              {
+                path: '/channel/newCustomer/visitNum',
+                name: '访问次数',
+                hideInMenu: true,
+                component: './channel/newCustomer/visitNum',
+              },
+              {
+                path: '/channel/newCustomer/personNum',
+                name: '访问人数',
+                hideInMenu: true,
+                component: './channel/newCustomer/personNum',
+              },
             ],
           },
           {

src/pages/channel/newCustomer/dataRecord.jsx

@@ -6,19 +6,9 @@ import request from '../../../utils/request';
 import AuthButton from '../../../components/AuthButton';
 
 
-const data = [
-    {
-        nickName: '2342',
-        phone: '2342',
-        gender: '2342',
-        province: '2342',
-    },
-]
-
 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, newCustomers } = props.location.query
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 })
@@ -26,14 +16,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)
-        // })
+        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
+            console.log(data,"dddddddddddd")
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
     }
 
     const columns = [
@@ -62,9 +50,9 @@ const dataRecord = props => {
             align: 'center',
         },
         {
-            title: '访问次数',
-            dataIndex: 'personFrom',
-            key: 'personFrom',
+            title: '注册时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
         },
 
@@ -97,16 +85,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>注册用户:{newCustomers}</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/index.jsx

@@ -36,9 +36,29 @@ const qrcodelist = props => {
       }, [])
 
 
-    const toNewuser = () => {
+    const toNewuser = (record) => {
         router.push({
             pathname: '/channel/newCustomer/dataRecord',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                newCustomers: record.newCustomers,
+              },
+        });
+    }
+
+    const toVisitNum = (record) => {
+        router.push({
+            pathname: '/channel/newCustomer/visitNum',
+        });
+    }
+
+    const toPersonNum = (record) => {
+        router.push({
+            pathname: '/channel/newCustomer/personNum',
         });
     }
 
@@ -82,7 +102,7 @@ const qrcodelist = props => {
             dataIndex: 'visitPersons',
             key: 'visitPersons',
             align: 'center',
-            render: (text, record) => <Navigate onClick={() => toNewuser(record)}>{text}</Navigate>,
+            render: (text, record) => <Navigate onClick={() => toPersonNum(record)}>{text}</Navigate>,
 
         },
         {
@@ -90,7 +110,7 @@ const qrcodelist = props => {
             dataIndex: 'visitNum',
             key: 'visitNum',
             align: 'center',
-            render: (text, record) => <Navigate onClick={() => toNewuser(record)}>{text}</Navigate>,
+            render: (text, record) => <Navigate onClick={() => toVisitNum(record)}>{text}</Navigate>,
         },
     ];
 

src/pages/channel/newCustomer/personNum.jsx

@@ -0,0 +1,117 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '../../../components/AuthButton';
+
+
+const data = [
+    {
+        nickName: '2342',
+        phone: '2342',
+        gender: '2342',
+        province: '2342',
+    },
+]
+
+const dataRecord = props => {
+    //   const [data, setData] = useState({})
+    //   const activityId = props.id
+    //   const activityType = props.type
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    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)
+        // })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+            align: 'center',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+            align: 'center',
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'personFrom',
+            key: 'personFrom',
+            align: 'center',
+        },
+
+    ]
+
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+
+
+
+    const exportActivityStats = () => {
+
+        // request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+        //   if (!data) {
+        //     return
+        //   }
+        //   const url = window.URL.createObjectURL(new Blob([data]))
+        //   const link = document.createElement('a')
+        //   link.style.display = 'none'
+        //   link.href = url
+        //   link.setAttribute('download', '访问统计.xlsx')
+        //   document.body.append(link)
+        //   link.click()
+        // }).catch()
+    }
+
+    return <>
+        <div>
+            <div>
+                <span>内容{}</span>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div style={{ marginTop: '20px'  }}>
+                <span>访问人数{}</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" />
+            {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div> */}
+        </div>
+    </>
+}
+
+export default dataRecord

src/pages/channel/newCustomer/visitNum.jsx

@@ -0,0 +1,117 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '../../../components/AuthButton';
+
+
+const data = [
+    {
+        nickName: '2342',
+        phone: '2342',
+        gender: '2342',
+        province: '2342',
+    },
+]
+
+const dataRecord = props => {
+    //   const [data, setData] = useState({})
+    //   const activityId = props.id
+    //   const activityType = props.type
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    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)
+        // })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+            align: 'center',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+            align: 'center',
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'personFrom',
+            key: 'personFrom',
+            align: 'center',
+        },
+
+    ]
+
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+
+
+
+    const exportActivityStats = () => {
+
+        // request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+        //   if (!data) {
+        //     return
+        //   }
+        //   const url = window.URL.createObjectURL(new Blob([data]))
+        //   const link = document.createElement('a')
+        //   link.style.display = 'none'
+        //   link.href = url
+        //   link.setAttribute('download', '访问统计.xlsx')
+        //   document.body.append(link)
+        //   link.click()
+        // }).catch()
+    }
+
+    return <>
+        <div>
+            <div>
+                <span>内容{}</span>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div style={{ marginTop: '20px'  }}>
+                <span>访问人数{}</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" />
+            {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div> */}
+        </div>
+    </>
+}
+
+export default dataRecord

src/services/apis.js

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