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

config/routes.js

@@ -611,13 +611,19 @@ export default [
               },
               {
                 path: '/statistical/consultant/table',
-                name: '拓客统计',
+                name: '客户总计',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
+              {
+                path: '/statistical/consultant/newPersons',
+                name: '新增客户',
                 hideInMenu: true,
                 component: './statistical/consultant/table',
               },
               {
                 path: '/statistical/consultant/sharetable',
-                name: '分享统计',
+                name: '分享次数',
                 hideInMenu: true,
                 component: './statistical/consultant/sharetable',
               },
@@ -633,12 +639,36 @@ export default [
                 hideInMenu: true,
                 component: './statistical/consultant/visitNum',
               },
+              {
+                path: '/statistical/consultant/sharePersons',
+                name: '分享拓客',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
               {
                 path: '/statistical/consultant/homePagePersons',
                 name: '主页访问人数',
                 hideInMenu: true,
                 component: './statistical/consultant/homePagePersons',
               },
+              {
+                path: '/statistical/consultant/homepageNum',
+                name: '主页访问次数',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
+              {
+                path: '/statistical/consultant/chatPersons',
+                name: '咨询数',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
+              {
+                path: '/statistical/consultant/favorNum',
+                name: '点赞数',
+                hideInMenu: true,
+                component: './statistical/consultant/table',
+              },
             ],
           },
           {

src/layouts/SecurityLayout.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { connect } from 'dva';
 import { Redirect } from 'umi';
 import PageLoading from '@/components/PageLoading';
+import Swiper from '../pages/swiper/index';
 
 class SecurityLayout extends React.Component {
   state = {
@@ -33,7 +34,10 @@ class SecurityLayout extends React.Component {
       return <Redirect to="/user/login"></Redirect>;
     }
 
-    return children;
+    return <>
+      {children}
+      <Swiper />
+    </>;
   }
 }
 

src/pages/Monitor.jsx

@@ -3,7 +3,7 @@ import { Card, Typography, Alert, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import EchartsTest from '../components/EchartsTest';
 import IndexEcharts from './indexEcharts/index';
-import Swiper from './swiper/index';
+// import Swiper from './swiper/index';
 import router from 'umi/router';
 import request from '../utils/request';
 import apis from '../services/apis';
@@ -69,7 +69,7 @@ const Monitor = props => {
           </div>
         }
       </div>
-      <Swiper />
+      {/* <Swiper /> */}
       <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} checkData={checkData}></IndexEcharts>
     </>
   )

src/pages/building/list/add/index.jsx

@@ -5,7 +5,7 @@ import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
-
+import Prompt from 'umi/prompt';
 
 import ImageUpload from '../../../../components/XForm/ImageUpload'
 import Wangedit from '../../../../components/Wangedit/Wangedit'
@@ -77,6 +77,10 @@ function AddBuilding(props) {
         { (tab === 'poster' && <Poster building={buildingData} />)}
         { (tab === 'share' && <Share building={buildingData} />)}
       </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/building/list")
+                            ? true
+                            : localStorage.removeItem("pageParams")} />
     </>
     // <Tabs defaultActiveKey="1" onChange={tabsCallback}>
     //   <TabPane tab="基本信息" key="1">

src/pages/building/list/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import Prompt from 'umi/prompt';
 import AuthButton from '@/components/AuthButton';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 
@@ -179,7 +180,11 @@ function body(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 9 })
+    if(localStorage.getItem("pageParams")){
+      getList(JSON.parse(localStorage.getItem("pageParams")))
+    }else{
+      getList({ pageNum: 1, pageSize: 9 })
+    } 
   }, [])
 
   function getList(params) {
@@ -212,6 +217,7 @@ function body(props) {
 
           values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
         }
+        localStorage.setItem("pageParams",JSON.stringify({ pageNum: 1, pageSize: 9, ...values }));
         getList({ pageNum: 1, pageSize: 9, ...values })
       }
     });
@@ -225,6 +231,7 @@ function body(props) {
 
   // 分页
   function onChange(pageNumber) {
+    localStorage.setItem("pageParams",JSON.stringify({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() }));
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() })
   }
@@ -258,11 +265,16 @@ function body(props) {
    */
   function handleReset() {
     props.form.resetFields();
+    localStorage.setItem("pageParams",JSON.stringify({ pageNum: 1, pageSize: 9 }));
     getList({ pageNum: 1, pageSize: 9 })
   }
 
   function onSuccess() {
-    getList({ pageNum: 1, pageSize: 9 })
+    if(localStorage.getItem("pageParams")){
+      getList(JSON.parse(localStorage.getItem("pageParams")))
+    }else{
+      getList({ pageNum: 1, pageSize: 9 })
+    } 
   }
 
 
@@ -348,8 +360,12 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
+        <Pagination showQuickJumper current={dataSource.current} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
       </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/building/list")
+                            ? true
+                            : localStorage.removeItem("pageParams")} />
     </>
   );
 }

src/pages/statistical/consultant/homePagePersons.jsx

@@ -22,6 +22,7 @@ function record(props) {
 
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [loading, updataLoading] = useState(true)
 
 
     useEffect(() => {
@@ -32,6 +33,7 @@ function record(props) {
     const getList = (params) => {
         request({ ...apis.stats.homePagePersons, params: { ...params }, }).then((data) => {
             setData(data)
+            updataLoading(false)
         })
     }
 
@@ -51,6 +53,17 @@ function record(props) {
             },
         });
     }
+    const toHomepageNum = (personId) => {
+
+        router.push({
+            pathname: '/statistical/consultant/homepageNum',
+            query: {
+                ...props.location.query,
+                type: 'homePageNums',
+                personId,
+            },
+        });
+    }
     // 表格数据
     const columns = [
 
@@ -66,7 +79,7 @@ function record(props) {
             dataIndex: 'name',
             key: 'name',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name}</span>,
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name || record.nickname}</span>,
         },
         {
             title: '电话',
@@ -86,7 +99,7 @@ function record(props) {
             dataIndex: 'visitTimes',
             key: 'visitTimes',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.visitTimes}</span>,
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toHomepageNum(record.personId)} >{record.visitTimes}</span>,
         },
         {
             title: '最后访问时间',
@@ -107,6 +120,7 @@ function record(props) {
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
+                loading={loading}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/statistical/consultant/index.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
+import AuthButton from '../../../components/AuthButton';
 
 /**
   @param {*} props
@@ -21,13 +22,15 @@ function record(props) {
         startDate: moment().subtract(radioVal, 'day').format('YYYYMMDD'),
         endDate: moment().format('YYYYMMDD'),
         buildingId: '',
-        asc: '',
-        desc: '',
+        // asc: '',
+        // desc: '',
     })
 
     // 获取初始化数据
     const [data, setData] = useState({})
     const [totalRow, setTotalRow] = useState({})
+    const [loading, updataLoading] = useState(true)
+    const [btnloading, updataBtnloading] = useState(false)
 
     useEffect(() => {
         getList(formData);
@@ -38,6 +41,9 @@ function record(props) {
         request({ ...apis.stats.consultantKPI, params: { ...params }, }).then((data) => {
             setData(data.paged)
             setTotalRow(data.total)
+            updataLoading(false)
+        }).catch(err => {
+            updataLoading(false)
         })
     }
 
@@ -91,7 +97,7 @@ function record(props) {
 
     const clickCon = (val, record, type) => {
         if (val == 0) {
-            return <><span onClick={() => toDetail(record, type)}>{val}</span></>
+            return <><span>{val}</span></>
         }
         return <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toDetail(record, type)} >{val}</span></>
     }
@@ -102,17 +108,17 @@ function record(props) {
             router.push({
                 pathname: '/statistical/consultant/table',
                 query: {
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
         } else if (type === 'newPersons') {
             router.push({
-                pathname: '/statistical/consultant/table',
+                pathname: '/statistical/consultant/newPersons',
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
@@ -122,7 +128,7 @@ function record(props) {
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
@@ -132,7 +138,7 @@ function record(props) {
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
@@ -142,17 +148,17 @@ function record(props) {
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
         } else if (type === 'sharePersons') {
             router.push({
-                pathname: '/statistical/consultant/table',
+                pathname: '/statistical/consultant/sharePersons',
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                     type: 'sharePersons',
                 },
@@ -163,46 +169,55 @@ function record(props) {
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                 },
             });
         } else if (type === 'homePageNums') {
             router.push({
-                pathname: '/statistical/consultant/table',
+                pathname: '/statistical/consultant/homepageNum',
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                     type: 'homePageNums',
                 },
             });
         } else if (type === 'chatPersons') {
             router.push({
-                pathname: '/statistical/consultant/table',
+                pathname: '/statistical/consultant/chatPersons',
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                     type: 'chatPersons',
                 },
             });
         } else if (type === 'favorNum') {
             router.push({
-                pathname: '/statistical/consultant/table',
+                pathname: '/statistical/consultant/favorNum',
                 query: {
                     startDate: formData.startDate,
                     endDate: formData.endDate,
-                    buildingId: formData.buildingId,
+                    buildingId: record.buildingId,
                     userId: record.userId,
                     type: 'favorNum',
                 },
             });
         }
-
     }
+    //排序
+    const handleChange = (pagination, filters, sorter) => {
+        if (sorter.order == 'ascend') {
+            getList({ ...formData, asc: sorter.columnKey, })
+        } else if (sorter.order == 'descend') {
+            getList({ ...formData, desc: sorter.columnKey, })
+        } else {
+            getList(formData);
+        }
+    };
 
     // 表格数据
     const columns = [
@@ -232,7 +247,7 @@ function record(props) {
             dataIndex: 'totalPersons',
             key: 'totalPersons',
             align: 'center',
-            sorter: (a, b) => a.totalPersons - b.totalPersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'totalPersons'),
             // render: (txt, record, index) => index ? clickCon(txt, record, 'totalPersons') : <strong>{txt}</strong>,
         },
@@ -241,7 +256,7 @@ function record(props) {
             dataIndex: 'newPersons',
             key: 'newPersons',
             align: 'center',
-            sorter: (a, b) => a.newPersons - b.newPersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'newPersons'),
         },
         {
@@ -249,7 +264,7 @@ function record(props) {
             dataIndex: 'shareNum',
             key: 'shareNum',
             align: 'center',
-            sorter: (a, b) => a.shareNum - b.shareNum,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'shareNum'),
         },
         {
@@ -257,7 +272,7 @@ function record(props) {
             dataIndex: 'visitPersons',
             key: 'visitPersons',
             align: 'center',
-            sorter: (a, b) => a.visitPersons - b.visitPersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'visitPersons'),
         },
         {
@@ -265,7 +280,7 @@ function record(props) {
             dataIndex: 'visitNum',
             key: 'visitNum',
             align: 'center',
-            sorter: (a, b) => a.visitNum - b.visitNum,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'visitNum'),
         },
 
@@ -274,7 +289,7 @@ function record(props) {
             dataIndex: 'sharePersons',
             key: 'sharePersons',
             align: 'center',
-            sorter: (a, b) => a.sharePersons - b.sharePersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'sharePersons'),
         },
         {
@@ -282,7 +297,7 @@ function record(props) {
             dataIndex: 'homePagePersons',
             key: 'homePagePersons',
             align: 'center',
-            sorter: (a, b) => a.homePagePersons - b.homePagePersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'homePagePersons'),
         },
         {
@@ -290,7 +305,7 @@ function record(props) {
             dataIndex: 'homePageNums',
             key: 'homePageNums',
             align: 'center',
-            sorter: (a, b) => a.homePageNums - b.homePageNums,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'homePageNums'),
         },
         {
@@ -298,7 +313,7 @@ function record(props) {
             dataIndex: 'chatPersons',
             key: 'chatPersons',
             align: 'center',
-            sorter: (a, b) => a.chatPersons - b.chatPersons,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'chatPersons'),
         },
         {
@@ -306,7 +321,7 @@ function record(props) {
             dataIndex: 'favorNum',
             key: 'favorNum',
             align: 'center',
-            sorter: (a, b) => a.favorNum - b.favorNum,
+            sorter: true,
             render: (txt, record, index) => clickCon(txt, record, 'favorNum'),
         },
     ];
@@ -325,11 +340,13 @@ function record(props) {
     }
     // 导出
     function exportRecord() {
+        updataBtnloading(true)
         request({ ...apis.stats.exportConsultantKPI, responseType: 'blob', params: { startDate: formData.startDate, endDate: formData.endDate, buildingId: formData.buildingId } })
             .then(response => {
                 download(response)
+                updataBtnloading(false)
             }).catch(error => {
-
+                updataBtnloading(false)
             })
     }
     // 默认日期
@@ -360,14 +377,18 @@ function record(props) {
                     </Form.Item>
                 </div>
             </Form>
-            <Button type="primary" onClick={exportRecord} style={{ float: 'right', margin: '20px 23px 20px 0', zIndex: 1 }}>
-                导出
-          </Button>
+            <AuthButton name="admin.statistical.consultant.export" noRight={null}>
+                <Button type="primary" onClick={exportRecord} loading={btnloading} style={{ float: 'right', margin: '20px 23px 20px 0', zIndex: 1 }}>
+                    导出
+                </Button>
+            </AuthButton>
             <Table rowKey={record => (record.userId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
+                onChange={handleChange}
+                loading={loading}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/statistical/consultant/sharetable.jsx

@@ -43,11 +43,24 @@ const typeList = [
         value: 'mian'
     },
 ]
-
-
-function getType(type) {
-    return typeList.filter(t => t.value === type)[0].label
-}
+const showTypeList = [
+    {
+        label: '直播活动',
+        value: 'livePost',
+    },
+    {
+        label: '直播活动',
+        value: 'liveApp',
+    },
+    {
+        label: '房源列表',
+        value: 'housePost',
+    },
+    {
+        label: '房源列表',
+        value: 'houseApp',
+    },
+]
 
 /**
   @param {*} props
@@ -65,6 +78,7 @@ function record(props) {
 
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [loading, updataLoading] = useState(true)
 
     useEffect(() => {
         getList(formData);
@@ -74,6 +88,7 @@ function record(props) {
     const getList = (params) => {
         request({ ...apis.stats.shareNum, params: { ...params }, }).then((data) => {
             setData(data)
+            updataLoading(false)
         })
     }
 
@@ -101,23 +116,26 @@ function record(props) {
         });
     }
 
+    function getType(type) {
+        return typeList.concat(showTypeList).filter(t => t.value == type)[0].label
+    }
 
     // 表格数据
     const columns = [
 
         {
             title: '分享标题',
-            dataIndex: 'intention',
-            key: 'intention',
+            dataIndex: 'targetType',
+            key: 'targetType',
             align: 'center',
-            render: (_, record) => <><span>{() => getType(record.targetType)}{record.targetName}</span></>
+            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
         },
         {
             title: '分享时间',
-            dataIndex: 'userName',
-            key: 'userName',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
-            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];
@@ -152,11 +170,12 @@ function record(props) {
                     </Form.Item>
                 </div>
             </Form>
-            <Table rowKey={record => (record.userId + record.buildingId || '')}
+            <Table rowKey={record => (record.personId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
+                loading={loading}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/statistical/consultant/table.jsx

@@ -22,7 +22,7 @@ function record(props) {
 
     // 获取初始化数据
     const [data, setData] = useState({})
-
+    const [loading, updataLoading] = useState(true)
 
     useEffect(() => {
         getList(formData);
@@ -35,21 +35,31 @@ function record(props) {
         if (typeTag == 'sharePersons') {
             request({ ...apis.stats.sharePersons, params: { ...params }, }).then((data) => {
                 setData(data)
+                updataLoading(false)
             })
         }
         else if (typeTag == 'homePageNums') {
             request({ ...apis.stats.homePageNums, params: { ...params }, }).then((data) => {
                 setData(data)
+                updataLoading(false)
             })
         }
         else if (typeTag == 'chatPersons') {
             request({ ...apis.stats.chatPersons, params: { ...params }, }).then((data) => {
                 setData(data)
+                updataLoading(false)
+            })
+        }
+        else if (typeTag == 'favorNum') {
+            request({ ...apis.stats.favorNum, params: { ...params }, }).then((data) => {
+                setData(data)
+                updataLoading(false)
             })
         }
         else {
             request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
                 setData(data)
+                updataLoading(false)
             })
         }
 
@@ -57,11 +67,11 @@ function record(props) {
 
     // 更新页码
     const changePageNum = (pageNumber) => {
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                getList({ ...props.location.query, pageNum: pageNumber });
-            }
-        });
+        // props.form.validateFields((err, values) => {
+        // if (!err) {
+        getList({ ...props.location.query, pageNum: pageNumber });
+        //     }
+        // });
     }
     const toPersonDetail = (personId) => {
         router.push({
@@ -85,7 +95,7 @@ function record(props) {
             dataIndex: 'name',
             key: 'name',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name}</span>,
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name || record.nickname}</span>,
         },
         {
             title: '电话',
@@ -133,17 +143,19 @@ function record(props) {
                 ]
     const columns = basicColunms.concat(lastColum)
 
-
+    let row = 0
 
     return (
 
         <>
             <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
-            <Table rowKey={record => (record.phone + record.buildingId || '')}
+            <Table rowKey={record => data.current * data.size + (row++)}
+                // <Table rowKey={record => (record.personId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
+                loading={loading}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/statistical/consultant/visitNum.jsx

@@ -5,6 +5,46 @@ import moment from 'moment';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
+const typeList = [
+    {
+        label: '报名活动',
+        value: 'dynamic_share'
+    },
+    {
+        label: '助力活动',
+        value: 'help_share'
+    },
+    {
+        label: '拼团活动',
+        value: 'group_share'
+    },
+    {
+        label: 'H5活动',
+        value: 'h5_share'
+    },
+    {
+        label: '直播活动',
+        value: 'live_share'
+    },
+    {
+        label: '房源列表',
+        value: 'house_share'
+    },
+    {
+        label: '项目',
+        value: 'building_share'
+    },
+    {
+        label: '资讯',
+        value: 'news_share'
+    },
+    {
+        label: '首页',
+        value: 'share'
+    },
+]
+
+
 /**
   @param {*} props
   @returns
@@ -21,6 +61,7 @@ function record(props) {
 
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [loading, updataLoading] = useState(true)
 
     useEffect(() => {
         getList(formData);
@@ -28,8 +69,10 @@ function record(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+        request({ ...apis.stats.visitNum, params: { ...params }, }).then((data) => {
             setData(data)
+            updataLoading(false)
+
         })
     }
 
@@ -44,35 +87,40 @@ function record(props) {
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log('提交数据: ', values)
+                getList({ ...formData, ...values });
 
             }
         });
-        // getList(formData);
     }
     // 更新页码
     const changePageNum = (pageNumber) => {
         props.form.validateFields((err, values) => {
             if (!err) {
-                getList({ ...formData, pageNum: pageNumber });
+                getList({ ...formData, pageNum: pageNumber, ...values });
             }
         });
     }
 
+    function getType(type) {
+        return typeList.filter(t => t.value === type)[0].label
+    }
 
     // 表格数据
     const columns = [
 
         {
             title: '分享标题',
-            dataIndex: 'intention',
-            key: 'intention',
+            dataIndex: 'targetType',
+            key: 'targetType',
             align: 'center',
+            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
         },
         {
             title: '姓名',
             dataIndex: 'name',
             key: 'name',
             align: 'center',
+            render: (_, record) => <><span>{record.name || record.nickname}</span></>
         },
         {
             title: '电话',
@@ -89,15 +137,18 @@ function record(props) {
         },
         {
             title: '访问时间',
-            dataIndex: 'userName',
-            key: 'userName',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
-            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];
 
     const { getFieldDecorator } = props.form
+    
+    let row = 0
+
     return (
 
         <>
@@ -105,22 +156,16 @@ function record(props) {
             <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Form.Item>
-                        {getFieldDecorator('eventType')(
+                        {getFieldDecorator('targetType')(
                             <Select placeholder="分享类型" style={{ width: 150 }}>
-                                <Option value="activity_share">报名活动</Option>
-                                <Option value="help_share">助力活动</Option>
-                                <Option value="group_share">拼团活动</Option>
-                                <Option value="h5_share">H5活动</Option>
-                                <Option value="live_share">直播活动</Option>
-                                <Option value="house_share">房源列表</Option>
-                                <Option value="building_share">项目</Option>
-                                <Option value="news_share">资讯</Option>
-                                <Option value="index_share">首页</Option>
+                                {typeList.map((item, index) => (
+                                    <Option key={index} value={item.value}>{item.label}</Option>
+                                ))}
                             </Select>
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('activityName')(
+                        {getFieldDecorator('targetName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="分享标题"
@@ -141,14 +186,14 @@ function record(props) {
                     </Form.Item>
                 </div>
             </Form>
-            <Table rowKey={record => (record.userId + record.buildingId || '')}
+            <Table rowKey={record => data.current * data.size + (row++)}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+                <Pagination showQuickJumper defaultCurrent={1} loading={loading} total={data.total} onChange={changePageNum} current={data.current} />
             </div>
         </>
     )

src/pages/statistical/consultant/visitPersons.jsx

@@ -23,6 +23,7 @@ function record(props) {
 
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [loading, updataLoading] = useState(true)
 
 
     useEffect(() => {
@@ -31,8 +32,9 @@ function record(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.stats.totalPersons, params: { ...params }, }).then((data) => {
+        request({ ...apis.stats.visitPerson, params: { ...params }, }).then((data) => {
             setData(data)
+            updataLoading(false)
         })
     }
 
@@ -40,18 +42,28 @@ function record(props) {
     const changePageNum = (pageNumber) => {
         props.form.validateFields((err, values) => {
             if (!err) {
-                getList({ ...props.location.query, pageNum: pageNumber });
+                getList({ ...props.location.query, pageNum: pageNumber, pageSize: 10, });
             }
         });
     }
-    const toPersonDetail = (personId) => {
+    const tovisitNum = (name, personId) => {
         router.push({
-            pathname: '/customer/customerlist/publicCustomerDetail',
+            pathname: '/statistical/consultant/visitNum',
             query: {
-                id: personId,
+                ...props.location.query,
+                userName: name,
+                personId,
             },
         });
     }
+    // const toPersonDetail = (personId) => {
+    //     router.push({
+    //         pathname: '/customer/customerlist/publicCustomerDetail',
+    //         query: {
+    //             id: personId,
+    //         },
+    //     });
+    // }
     // 表格数据
     const columns = [
         {
@@ -59,6 +71,7 @@ function record(props) {
             dataIndex: 'name',
             key: 'name',
             align: 'center',
+            render: (_, record) => <span >{record.name || record.nickname}</span>,
         },
         {
             title: '电话',
@@ -75,17 +88,17 @@ function record(props) {
         },
         {
             title: '访问次数',
-            dataIndex: 'visitNum',
-            key: 'visitNum',
+            dataIndex: 'visitTimes',
+            key: 'visitTimes',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.visitNum}</span>,
+            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => tovisitNum(record.name || record.nickname, record.personId)} >{record.visitTimes}</span>,
         },
         {
             title: '最后访问时间',
-            dataIndex: 'reportDate',
-            key: 'reportDate',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
-            render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+            render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
         },
 
     ];
@@ -94,11 +107,12 @@ function record(props) {
 
         <>
             <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
-            <Table rowKey={record => (record.phone + record.buildingId || '')}
+            <Table rowKey={record => (record.personId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
                 dataSource={data.records}
                 columns={columns}
                 pagination={false}
+                loading={loading}
             />
             < div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/services/apis.js

@@ -1692,6 +1692,21 @@ export default {
       url: `${prefix}/stats/consultant/customer`,
       action: 'admin.contract.list.get',
     },
+    shareNum: { // 分享次数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/share/targets`,
+      action: 'admin.contract.list.get',
+    },
+    visitPerson: { // 分享访问人数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/share/persons`,
+      action: 'admin.contract.list.get',
+    },
+    visitNum: { // 分享访问次数
+      method: 'GET',
+      url: `${prefix}/stats/consultant/share/times`,
+      action: 'admin.contract.list.get',
+    },
     sharePersons: { // 分享拓客
       method: 'GET',
       url: `${prefix}/stats/consultant/share/customer`,
@@ -1712,12 +1727,13 @@ export default {
       url: `${prefix}/stats/consultant/chat/persons`,
       action: 'admin.contract.list.get',
     },
-    shareNum: { // 分享次数
+    favorNum: { // 点赞数
       method: 'GET',
-      url: `${prefix}/stats/consultant/share/targets`,
+      url: `${prefix}/stats/consultant/favor`,
       action: 'admin.contract.list.get',
     },
 
+
     buildingExport: {
       method: 'GET',
       url: `${prefix}/stats/buildingExport`,