fix

config/proxy.js

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      // target: 'https://xlk.njyz.tech/',
-      target: 'http://localhost:8567/',
+      target: 'https://xlk.njyz.tech/',
+      // target: 'http://localhost:8567/',
       // target: 'https://xlj.newlandsh.com/',
       changeOrigin: true,
       pathRewrite: {

config/routes.js

@@ -97,16 +97,16 @@ export default [
                 hideInMenu: true,
                 component: './customer/customerlist/customerDetail',
               },
-              {
-                path: '/customer/drift/list',
-                name: '游客列表',
-                component: './customer/drift/index',
-              },
+              // {
+              //   path: '/customer/drift/list',
+              //   name: '游客列表',
+              //   component: './customer/drift/index',
+              // },
               {
                 path: '/customer/customerlist/publicCustomerDetail',
                 name: '公客详情',
                 hideInMenu: true,
-                component: './customer/customerlist/publicCustomerDetail',
+                component: './customer/Customer/PublicCustomer/publicCustomerDetail',
               },
               {
                 path: '/customer/recommend/list',
@@ -121,6 +121,25 @@ export default [
               },
             ],
           },
+
+          {
+            path: '/recommend',
+            name: '推荐客户',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/recommend/recommendCustomer/list',
+                name: '推荐记录',
+                component: './recommend/recommendCustomer/index',
+              },
+              {
+                path: '/recommend/recommendCustomer/audit',
+                name: '客户审核',
+                hideInMenu: true,
+                component: './recommend/recommendCustomer/audit',
+              },
+            ],
+          },
           {
             path: '/staff',
             name: '员工管理',

src/pages/customer/Customer/PrivateCustomer/CustomerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination, Button } from 'antd';
+import { Form, Table, Pagination, Button, Descriptions,Card } from 'antd';
 
 import styles from '../style.less';
 import apis from '@/services/apis';
@@ -8,7 +8,6 @@ import moment from 'moment';
 import BuildSelect from '@/components/SelectButton/BuildSelect';
 
 import router from 'umi/router';
-import Prompt from 'umi/prompt';
 
 function CustomerDetail(props) {
   /**
@@ -96,12 +95,12 @@ function CustomerDetail(props) {
       key: 'activity',
       align: 'center',
     },
-    {
-      title: '访问内容',
-      dataIndex: 'activityName',
-      key: 'activityName',
-      align: 'center',
-    },
+    // {
+    //   title: '访问内容',
+    //   dataIndex: 'activityName',
+    //   key: 'activityName',
+    //   align: 'center',
+    // },
     {
       title: '访问时间',
       dataIndex: 'visitTime',
@@ -139,61 +138,77 @@ function CustomerDetail(props) {
         <Button onClick={() => router.go(-1)}>返回</Button>
       </div>
 
+      
+
       <div className={styles.cardBox}>
         <div className={styles.rightBox}>
           <p className={styles.tit}>客户信息</p>
           <div className={styles.flexBox}>
-            <img className={styles.touxiang} src={data.picture && data.picture} />
+            <div>
+              <img className={styles.touxiang} src={data.picture && data.picture} />
+            </div>
             <div className={styles.right}>
-              <p className={styles.rightItem}>用户名称：{data.name}</p>
-              <p className={styles.rightItem}>手机号码：{data.phone}</p>
-              <p className={styles.rightItem}>
-                首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}
-              </p>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{data.phone}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.name}</span></p>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{data.name}</span></p>
+
+        
+
             </div>
             <div className={styles.Centered}>
-              <p>访问时长：{data.duration}秒</p>
-              <p>访问次数：{data.visitTimes}次</p>
-              <p className={styles.rightItem}>客户描述：{data.describe}</p>
-              {/* <p>预约人数：{ data.visiteNum }</p> */}
+
+                
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{data.phone}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.name}</span></p>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{data.name}</span></p>
+
+
             </div>
             <div className={styles.rightCentered}>
-              <p>需求类型：{data.demandType}</p>
-              <p>价格区间：{data.priceRange}</p>
-              <p>物业类型：{data.realtyManageType}</p>
-              {/* <p>预约人数：{ data.visiteNum }</p> */}
-            </div>
-            {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
-            <div className={styles.rightInfo}>
-              <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
-              <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
-              <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
-              <p className={styles.rightItem}>
-                来源渠道：{data.personFrom ? data.personFrom : '其他'}
-              </p>
-              {/* <p className={styles.rightItem}>详细信息：</p> */}
-              {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
-              {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{data.name}</span></p>
+
+         
+      
             </div>
+      
           </div>
         </div>
       </div>
       <br></br>
+
       <div className={styles.cardBox}>
         <div className={styles.rightBoxCentre}>
           <p className={styles.tit}>置业顾问信息</p>
           <div>
             <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
-            <p>{data.consultant && data.consultant.userName}</p>
+         
           </div>
           <div className={styles.rightphone}>
-            {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
-          <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
-            <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
-            <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.position}</p>
+          <p className={styles.infoItem}>{data.consultant && data.consultant.userName}</p>
+          <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
+      
           </div>
           <div className={styles.left}>
-            <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+          <p className={styles.infoItem}>部门：{data.consultant && data.consultant.orgName} </p>
+          <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.orgName} </p>
+          <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+           
             <p className={styles.infoItem}>
               所属项目：
               {data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)}
@@ -231,15 +246,6 @@ function CustomerDetail(props) {
         />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
-      <Prompt
-        message={location =>
-          location.pathname.startsWith('/customer/customerlist')
-            ? true
-            : (localStorage.removeItem('priPageParams'),
-              localStorage.removeItem('pubPageParams'),
-              localStorage.removeItem('state'))
-        }
-      />
     </>
   );
 }

src/pages/customer/Customer/PrivateCustomer/CustomerDetailold.jsx

@@ -0,0 +1,246 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination, Button } from 'antd';
+
+import styles from '../style.less';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+
+import router from 'umi/router';
+import Prompt from 'umi/prompt';
+
+function CustomerDetail(props) {
+  /**
+   * @param {*} props
+   * @returns
+   */
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{}]);
+  const [tableData, setTableDataData] = useState([{}]);
+  const [dataConsultant, setDataonsultant] = useState({});
+  const [intentionData, setIntentionData] = useState([]);
+  const [buildingIdValue, setBuildingIdData] = useState();
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById();
+    toLoadIntention();
+  }, []);
+
+  function toLoadIntention() {
+    const arr = [];
+    // 意向值
+    for (let i = 0; i < intentionData.length; i++) {
+      const a = [].concat(
+        intentionData.concat([
+          {
+            key: i,
+            name: `Edward King ${i}`,
+            age: 32,
+            address: `London, Park Lane no. ${i}`,
+          },
+        ]),
+      );
+      arr.push(a);
+    }
+    setIntentionData(arr);
+  }
+
+  // 查询
+  const { id } = props.location.query;
+  function getById(params) {
+    if (id === '' || id === undefined) {
+      return;
+    }
+    // eslint-disable-next-line max-len
+    request({
+      ...apis.customer.CustomerRecommendGet,
+      urlData: { id },
+      params: { ...params, pageNumber: 1, pageSize: 10 },
+    }).then(res => {
+      setData(res);
+      if (res.visitRecords) {
+        setTableDataData(res.visitRecords);
+      }
+      setDataonsultant(res.geoInfo);
+      setIntentionData(res.intentions);
+    });
+  }
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return;
+    }
+    // eslint-disable-next-line max-len
+    request({
+      ...apis.customer.CustomerRecommendGet,
+      urlData: { id },
+      params: { pageNumber: number, pageSize: 10 },
+    }).then(res => {
+      setData(res);
+      setTableDataData(res.visitRecords);
+      setDataonsultant(res.geoInfo);
+    });
+  }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId);
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'activity',
+      key: 'activity',
+      align: 'center',
+    },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'visitDuration',
+      key: 'visitDuration',
+      align: 'center',
+      render: (_, record) => (
+        <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>
+      ),
+    },
+  ];
+  // 意向
+  const intention = [
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>项目名称</span>,
+      dataIndex: 'name',
+      width: '64%',
+      render: (_, record) => <span>{record.buildingName}</span>,
+    },
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>意向值</span>,
+      dataIndex: 'address',
+      render: (_, record) => <span>{record.intention}</span>,
+    },
+  ];
+  return (
+    <>
+      <div style={{ textAlign: 'right', marginBottom: '16px' }}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+
+      <div className={styles.cardBox}>
+        <div className={styles.rightBox}>
+          <p className={styles.tit}>客户信息</p>
+          <div className={styles.flexBox}>
+            <img className={styles.touxiang} src={data.picture && data.picture} />
+            <div className={styles.right}>
+              <p className={styles.rightItem}>用户名称：{data.name}</p>
+              <p className={styles.rightItem}>手机号码：{data.phone}</p>
+              <p className={styles.rightItem}>
+                首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}
+              </p>
+            </div>
+            <div className={styles.Centered}>
+              <p>访问时长：{data.duration}秒</p>
+              <p>访问次数：{data.visitTimes}次</p>
+              <p className={styles.rightItem}>客户描述：{data.describe}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            <div className={styles.rightCentered}>
+              <p>需求类型：{data.demandType}</p>
+              <p>价格区间：{data.priceRange}</p>
+              <p>物业类型：{data.realtyManageType}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+            {/* <div className={styles.rightInfo}>
+              <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
+              <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
+              <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
+              <p className={styles.rightItem}>
+                来源渠道：{data.personFrom ? data.personFrom : '其他'}
+              </p>
+    
+            </div> */}
+          </div>
+        </div>
+      </div>
+      <br></br>
+      <div className={styles.cardBox}>
+        <div className={styles.rightBoxCentre}>
+          <p className={styles.tit}>置业顾问信息</p>
+          <div>
+            <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
+            <p>{data.consultant && data.consultant.userName}</p>
+          </div>
+          <div className={styles.rightphone}>
+            {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
+          <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
+            <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
+            <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.position}</p>
+          </div>
+          <div className={styles.left}>
+            <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+            <p className={styles.infoItem}>
+              所属项目：
+              {data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)}
+            </p>
+          </div>
+        </div>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div className={styles.leftBoxCentre}>
+          {/* <div className={styles.tit}>
+                <span>项目名称</span>
+                <span style={{ marginLeft: '50%' }}>意向值</span>
+          </div> */}
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          {/* <div className={styles.infoItem}> */}
+          <Table
+            bordered={false}
+            columnWidth={10}
+            columns={intention}
+            dataSource={intentionData}
+            pagination={false}
+            scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false}
+            width={500}
+          />
+          {/* </div> */}
+        </div>
+      </div>
+      <div className={styles.recordBox}>
+        <p className={styles.tableName}>访问记录</p>
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table
+          dataSource={tableData.records}
+          columns={columns}
+          style={{ marginTop: '15px' }}
+          pagination={{ pageSize: 10, total: tableData.total, onChange }}
+        />
+        {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
+      </div>
+      <Prompt
+        message={location =>
+          location.pathname.startsWith('/customer/customerlist')
+            ? true
+            : (localStorage.removeItem('priPageParams'),
+              localStorage.removeItem('pubPageParams'),
+              localStorage.removeItem('state'))
+        }
+      />
+    </>
+  );
+}
+const WrappedHeader = Form.create({ name: 'header' })(CustomerDetail);
+
+export default WrappedHeader;

src/pages/customer/Customer/PrivateCustomer/index.jsx

@@ -153,13 +153,13 @@ const PrivateCustomer = () => {
         align: 'center',
         width: '20%',
         render: withActions((_, record) => [
-          <Button className={Styles.text} type="link" onClick={() => toCustomerDateil(record)}>
+          <Button  type="link" onClick={() => toCustomerDateil(record)}>
             查看详情
           </Button>,
           // <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button
-              className={Styles.text}
+            
               type="link"
               onClick={() => handShowModel(record, actionList.changeStatus)}
             >
@@ -169,7 +169,7 @@ const PrivateCustomer = () => {
 
           <AuthButton name="admin.customer.recommend.belong" noRight={null}>
             <Button
-              className={Styles.text}
+            
               type="link"
               onClick={() => handShowModel(record, actionList.attribution)}
             >
@@ -177,25 +177,6 @@ const PrivateCustomer = () => {
             </Button>
           </AuthButton>,
 
-          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
-            <Button
-              className={Styles.text}
-              type="link"
-              onClick={() => handShowModel(record, actionList.integralRecord)}
-            >
-              积分记录
-            </Button>
-          </AuthButton>,
-
-          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
-            <Button
-              className={Styles.text}
-              type="link"
-              onClick={() => handShowModel(record, actionList.recommend)}
-            >
-              推荐客户
-            </Button>
-          </AuthButton>,
         ]),
       },
     ];

src/pages/customer/Customer/PublicCustomer/index.jsx

@@ -67,11 +67,11 @@ const PublicCustomer = () => {
     // setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId })
   }
 
-  function toCustomerDateil(record) {
+  function publicCustomerDetail(record) {
     router.push({
-      pathname: '/customer/customerlist/privateCustomerDetail',
+      pathname: '/customer/customerlist/publicCustomerDetail',
       query: {
-        id: record.customerId,
+        id: record.personId,
       },
     });
   }
@@ -168,29 +168,13 @@ const PublicCustomer = () => {
         align: 'center',
        
         render: withActions((_, record) => [
-          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
-            <Button
-              className={Styles.text}
-              type="link"
-              onClick={() => handShowModel(record, actionList.integralRecord)}
-            >
-              积分记录
-            </Button>
-          </AuthButton>,
-
-          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
-            <Button
-              className={Styles.text}
-              type="link"
-              onClick={() => handShowModel(record, actionList.recommend)}
-            >
-              推荐客户
-            </Button>
-          </AuthButton>,
+          <Button  type="link" onClick={() => publicCustomerDetail(record)}>
+            查看详情
+          </Button>,
 
           <AuthButton name="admin.customer.assign" noRight={null}>
             <Button
-              className={Styles.text}
+        
               type="link"
               onClick={() => handShowModel(record, actionList.assistConsultant)}
             >

src/pages/customer/Customer/PublicCustomer/publicCustomerDetail.jsx

@@ -0,0 +1,242 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination, Button } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import publicStyle from './publicStyle.less';
+import styles from '../style.less';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+
+import router from 'umi/router';
+import Prompt from 'umi/prompt';
+
+function header(props) {
+  /**
+   * @param {*} props
+   * @returns
+   */
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{}]);
+  const [tableData, setTableDataData] = useState([{}]);
+  const [dataConsultant, setDataonsultant] = useState({});
+  const [intentionData, setIntentionData] = useState([]);
+  const [buildingIdValue, setBuildingIdData] = useState();
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById();
+    toLoadIntention();
+  }, []);
+
+  function toLoadIntention() {
+    if (intentionData) {
+      return;
+    }
+    const arr = [];
+    // 意向值
+    for (let i = 0; i < intentionData.length; i++) {
+      const a = [].concat(
+        intentionData.concat([
+          {
+            key: i,
+            name: `Edward King ${i}`,
+            age: 32,
+            address: `London, Park Lane no. ${i}`,
+          },
+        ]),
+      );
+      arr.push(a);
+    }
+    setIntentionData(arr);
+  }
+
+  // 查询
+  const { id } = props.location.query;
+  function getById(params) {
+    if (id === '' || id === undefined) {
+      return;
+    }
+
+    request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { ...params } }).then(
+      res => {
+        setTableDataData(res.visitRecords);
+        setData(res);
+        setDataonsultant(res.geoInfo);
+        setIntentionData(res.intentions);
+      },
+    );
+  }
+  // 分页
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return;
+    }
+    request({
+      ...apis.customer.cecommendPublic,
+      urlData: { id },
+      params: { pageNumber: number, pageSize: 10 },
+    }).then(res => {
+      setData(res);
+      setTableDataData(res.visitRecords);
+      setDataonsultant(res.geoInfo);
+    });
+  }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId);
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'activity',
+      key: 'activity',
+      align: 'center',
+    },
+    // {
+    //   title: '访问内容',
+    //   dataIndex: 'activityName',
+    //   key: 'activityName',
+    //   align: 'center',
+    // },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'visitDuration',
+      key: 'visitDuration',
+      align: 'center',
+      render: (_, record) => (
+        <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>
+      ),
+    },
+  ];
+  // 意向
+  const intention = [
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>项目名称</span>,
+      dataIndex: 'name',
+      width: '64%',
+      render: (_, record) => <span>{record.buildingName}</span>,
+    },
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>意向值</span>,
+      dataIndex: 'address',
+      render: (_, record) => <span>{record.intention}</span>,
+    },
+  ];
+  return (
+    <>
+      <div style={{ textAlign: 'right', marginBottom: '16px' }}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+
+      <div className={publicStyle.cardBox}>
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.rightBox}>
+        <div >
+          <p className={styles.tit}>客户信息</p>
+          <div className={styles.flexBox}>
+            <div>
+              <img className={styles.touxiang} src={data.picture && data.picture} />
+            </div>
+            <div className={styles.right}>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{data.phone}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.name}</span></p>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{data.name}</span></p>
+
+        
+
+            </div>
+            <div className={styles.Centered}>
+
+                
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{data.phone}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.name}</span></p>
+
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{data.name}</span></p>
+
+
+            </div>
+            <div className={styles.rightCentered}>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{data.name}</span></p>
+      
+              </div>
+         
+      
+           
+        </div>
+      </div>
+        </div>
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.leftBoxCentre}>
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          <div className={publicStyle.infoItem}>
+            <Table
+              columnWidth={10}
+              columns={intention}
+              dataSource={intentionData}
+              pagination={false}
+              scroll={intentionData.length >= 3 ? { y: 240 } : false}
+            />
+          </div>
+        </div>
+      </div>
+      <div className={publicStyle.recordBox}>
+        <p className={publicStyle.tableName}>访问记录</p>
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table
+          dataSource={tableData.records}
+          columns={columns}
+          style={{ marginTop: '15px' }}
+          pagination={{ pageSize: 10, total: tableData.total, onChange }}
+        />
+      </div>
+    </>
+  );
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader;
+
+// <p className={publicStyle.tit}>客户信息</p>
+//           <img className={publicStyle.touxiang} src={data.avatarurl && data.avatarurl} />
+//           <div className={publicStyle.right}>
+//             <p className={publicStyle.rightItem}>用户名称：{data.name === null ? data.nickname : data.name}</p>
+//             <p className={publicStyle.rightItem}>手机号码：{data.phone}</p>
+//             <p className={publicStyle.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+//           </div>
+//           <div className={publicStyle.Centered}>
+//             <p>访问时长：{data.duration}秒</p>
+//             <p>访问次数：{data.visitTimes}次</p>
+//             <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
+//           </div>
+// <div className={publicStyle.rightInfo}>
+//             <p className={publicStyle.rightItem}>国家：{data && data.country}</p>
+//             <p className={publicStyle.rightItem}>省份：{data && data.province}</p>
+//             <p className={publicStyle.rightItem}>城市：{data && data.city}</p>
+
+//           </div>

src/pages/customer/Customer/PublicCustomer/publicStyle.less

@@ -0,0 +1,209 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.displayS {
+  display: none;
+}
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:90%;
+    min-width:28.5%;
+    height:315px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:865px;
+    min-width:342px;
+    // height:290px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    // height:315px;
+    min-width: 70%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .rightBoxCentre{
+    width:865px;
+    // height:315px;
+    min-width: 60%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .leftBoxCentre{
+    width:100%;
+    // height:315px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:0.15rem;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .infoItem{
+    color:#666;
+    font-size: 0.1rem;
+    margin: 0 0 10px 0;
+    
+  }
+  .rightItem{
+    color:#666;
+    font-size: 0.1rem;
+    margin: 0 0 15px 0;
+  }
+  .right{
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .left{
+    position: absolute;
+    top:108px;
+    left:60%;
+  }
+  .rightInfo{
+    position: absolute;
+    top:108px;
+    left:80%;
+  }
+
+  .Centered{
+    position: absolute;
+    top:108px;
+    left:50%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 0.1rem;
+  }
+
+  .rightCentered{
+    position: absolute;
+    top:108px;
+    left:55%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 0.1rem;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

src/pages/customer/Customer/style.less

@@ -72,6 +72,142 @@
   display: none;
 }
 
+.leftBox{
+  width:1000px;
+  min-width:350px;
+  height:1000px;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  display: inline-block;
+  margin-right: 30px;
+  padding: 30px;
+  overflow: hidden;
+}
+
+.rightBox{
+  width:-webkit-fill-available;
+  min-width: 300px;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  display: inline-block;
+  padding: 30px;
+  overflow: hidden;
+  position: relative;
+}
+.rightBoxCentre{
+  width:865px;
+  height:345px;
+  min-width: 60%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  display: inline-block;
+  padding: 30px;
+  overflow: hidden;
+  position: relative;
+}
+.leftBoxCentre{
+  width:100%;
+  height:345px;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  display: inline-block;
+  padding: 30px;
+  overflow: hidden;
+  position: relative;
+}
+.tit{
+  font-size:0.15rem;
+  font-weight:600;
+  color:#222;
+  margin: 10px 0 0 0;
+}
+.flexBox{
+  display: flex;
+  align-items: end;
+}
+.touxiang{
+  width: 120px;
+  width: 120px;
+  border-radius: 6px;
+  margin: 30px 0 20px 0;
+}
+.touxiangphoto{
+  width: 80px;
+  height: 80px;
+  margin: 38px 0 0px 0;
+}
+.infoItem{
+  color:#666;
+  font-size: 0.1rem;
+  margin: 0 0 30px 0;
+  
+}
+.rightItem{
+  color:#666;
+  font-size: 0.1rem;
+  margin: 0 0 15px 0;
+  display: flex;
+}
+.right{
+  width: 25%;
+  min-width: 1.3rem;
+  margin-left: 0.1rem;
+  padding-top: 0.3rem;
+  // position: absolute;
+  // top:108px;
+  // left:170px;
+}
+.rightphone{
+
+  position: absolute;
+  top:108px;
+  left:170px;
+}
+.left{
+  position: absolute;
+  top:108px;
+  left:60%;
+
+}
+.rightInfo{
+  width: 28%;
+  min-width: 1.3rem;
+  margin-right: 0.1rem;
+  padding-top: 0.3rem;
+  // position: absolute;
+  // top:108px;
+  // left:80%;
+}
+
+.Centered{
+  width: 28%;
+  // position: absolute;
+  // top:108px;
+  // left:30%;
+  min-width: 1.3rem;
+  margin: 0 0 15px 0;
+  color:#666;
+  font-size: 0.1rem;
+  padding-top: 0.3rem;
+}
+
+.rightCentered{
+  // position: absolute;
+  // top:108px;
+  // left:55%;
+  flex: 1;
+  // width: 25%;
+  min-width: 1.3rem;
+  margin: 0 0 15px 0;
+  padding-top: 0.3rem;
+  color:#666;
+  font-size: 0.1rem;
+}
+
 
 // 客户详情样式
 .cardBox{
@@ -88,22 +224,10 @@
     padding: 30px;
     overflow: hidden;
   }
-  .rightBox{
-    width:865px;
-    min-width:342px;
-    height:290px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
-    border-radius:8px;
-    display: inline-block;
-    margin-right: 30px;
-    padding: 30px;
-    overflow: hidden;
-  }
+
   .rightBox{
     width:-webkit-fill-available;
-    height:315px;
-    min-width: 100%;
+    min-width: 300px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
     border-radius:8px;
@@ -166,6 +290,7 @@
     color:#666;
     font-size: 0.1rem;
     margin: 0 0 15px 0;
+    display: flex;
   }
   .right{
     width: 25%;