合并

config/routes.js

@@ -93,7 +93,7 @@ export default [
               },
               {
                 path: '/customer/customerlist/customerDetail',
-                name: '客户编辑',
+                name: '私客详情',
                 hideInMenu: true,
                 component: './customer/customerlist/customerDetail',
               },
@@ -130,7 +130,7 @@ export default [
               },
               {
                 path: '/customer/customerlist/publicCustomerDetail',
-                name: '私客详情',
+                name: '公客详情',
                 hideInMenu: true,
                 component: './customer/customerlist/publicCustomerDetail',
               },

src/pages/customer/customerlist/customerDetail.jsx

@@ -15,30 +15,61 @@ function header(props) {
    * @returns
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState([{ visitRecords: [] }])
+  const [data, setData] = useState([{ }])
+  const [tableData, setTableDataData] = useState([{ }])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = 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) {
-    const { id } = props.location.query;
     if (id === '' || id === undefined) {
       return
     }
-
-    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
+    // 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)
     })
   }
 // 分页
-  const changePageNum = pageNumber => {
-    // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+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)
+    })
   }
   const columns = [
     {
@@ -67,28 +98,17 @@ function header(props) {
     {
       title: 'Name',
       dataIndex: 'name',
-      width: 150,
-      render: (_, record) => <span>香颂半岛</span>,
+    render: (_, record) => <span width={500}>{record.buildingName}</span>,
     },
     {
       title: 'Address',
       dataIndex: 'address',
-      render: (_, record) => <span style={{ marginLeft: '55%' }}>22</span>,
+      render: (_, record) => <span style={{ marginLeft: '-50%' }}>{record.intention}</span>,
     },
   ];
-
-for (let i = 0; i < 100; i++) {
-  intentionData.push({
-    key: i,
-    name: `Edward King ${i}`,
-    age: 32,
-    address: `London, Park Lane no. ${i}`,
-  });
-}
   return (
     <>
       <div className={styles.cardBox}>
-     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={styles.rightBox}>
           <p className={styles.tit}>客户信息</p>
           <img className={styles.touxiang} src={ data.picture && data.picture } />
@@ -111,9 +131,9 @@ for (let i = 0; i < 100; i++) {
           </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}>国家：{ dataConsultant && dataConsultant.country }</p>
+            <p className={styles.rightItem}>省份：{ dataConsultant && dataConsultant.provience }</p>
+            <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city }</p>
             <p className={styles.rightItem}>来访渠道：活动分享</p>
             {/* <p className={styles.rightItem}>详细信息：</p> */}
             {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */} 
@@ -126,16 +146,16 @@ for (let i = 0; i < 100; i++) {
       <div className={styles.cardBox}>
         <div className={styles.rightBoxCentre}>
         <p className={styles.tit}>置业顾问信息</p>
-          <img className={styles.touxiang} src={ data.picture && data.picture } />
-          <p className={styles.infoItem}>曹玉文</p>
+          <img className={styles.touxiangphoto} src={ data.consultant && data.consultant.photo }/>
+          <p className={styles.infoItem}>{data.consultant && data.consultant.userName}</p>
           <div className={styles.right}>
           {/* <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.post }</p>
+          <p className={styles.infoItem}>岗位：{ data.consultant && data.consultant.position }</p>
           </div>
           <div className={styles.left}>
-          <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.company } </p>
+          <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.orgName } </p>
           <p className={styles.infoItem}>
             所属项目：
             {
@@ -148,18 +168,19 @@ for (let i = 0; i < 100; i++) {
         <div className={styles.leftBoxCentre}>
           <div className={styles.tit}>
                 <span>项目名称</span>
-                <span style={{ marginLeft: '47%' }}>项目名称</span>
+                <span style={{ marginLeft: '47%' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={styles.infoItem}>
-          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={{ pageSize: 50 }} scroll={{ y: 240 }}/>,
+          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false}/>
           </div>
         </div>
 
       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table showQuickJumper defaultCurrent={1} dataSource={data.visitRecords} columns={columns} current={50} />
+        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
 
     </>

src/pages/customer/customerlist/index.jsx

@@ -168,7 +168,7 @@ function body(props) {
     router.push({
       pathname: '/customer/customerlist/publicCustomerDetail',
       query: {
-        id: record.customerId,
+        id: record.personId,
       },
     });
   }

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -15,30 +15,62 @@ function header(props) {
    * @returns
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState([{ visitRecords: [] }])
+  const [data, setData] = useState([{ }])
+  const [tableData, setTableDataData] = useState([{ }])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = 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) {
-    const { id } = props.location.query;
     if (id === '' || id === undefined) {
       return
     }
 
-    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
+    request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { ...params } }).then(res => {
+      setTableDataData(res.visitRecords)
       setData(res)
       setDataonsultant(res.geoInfo)
+      setIntentionData(res.intentions)
     })
   }
 // 分页
-  const changePageNum = pageNumber => {
-    // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+// 分页
+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)
+    })
   }
   const columns = [
     {
@@ -67,33 +99,24 @@ function header(props) {
     {
       title: 'Name',
       dataIndex: 'name',
-      width: 150,
-      render: (_, record) => <span>香颂半岛</span>,
+    render: (_, record) => <span width={500}>{record.buildingName}</span>,
     },
     {
       title: 'Address',
       dataIndex: 'address',
-      render: (_, record) => <span style={{ marginLeft: '55%' }}>22</span>,
+      render: (_, record) => <span style={{ marginLeft: '-50%' }}>{record.intention}</span>,
     },
   ];
 
-for (let i = 0; i < 1; i++ ) {
-  intentionData.push({
-    key: i,
-    name: `Edward King ${i}`,
-    age: 32,
-    address: `London, Park Lane no. ${i}`,
-  });
-}
   return (
     <>
       <div className={publicStyle.cardBox}>
      {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={publicStyle.rightBox}>
           <p className={publicStyle.tit}>客户信息</p>
-          <img className={publicStyle.touxiang} src={ data.picture && data.picture } />
+          <img className={publicStyle.touxiang} src={ data.avatarurl && data.avatarurl } />
           <div className={publicStyle.right}>
-            <p className={publicStyle.rightItem}>用户名称：{ data.name }</p>
+            <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>
@@ -105,11 +128,11 @@ for (let i = 0; i < 1; i++ ) {
           </div>
           {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
           <div className={publicStyle.rightInfo}>
-            <p className={publicStyle.rightItem}>国家：{ dataConsultant && dataConsultant.country }</p>
-            <p className={publicStyle.rightItem}>省份：{ dataConsultant && dataConsultant.provience }</p>
-            <p className={publicStyle.rightItem}>城市：{dataConsultant && dataConsultant.city }</p>
+            <p className={publicStyle.rightItem}>国家：{ data && data.country }</p>
+            <p className={publicStyle.rightItem}>省份：{ data && data.province }</p>
+            <p className={publicStyle.rightItem}>城市：{ data && data.city }</p>
             {/* <p className={styles.rightItem}>详细信息：</p> */}
-            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */} 
+            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
             {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
           </div>
         </div>
@@ -117,17 +140,17 @@ for (let i = 0; i < 1; i++ ) {
         <div className={publicStyle.leftBoxCentre}>
           <div className={publicStyle.tit}>
                 <span>项目名称</span>
-                <span style={{ marginLeft: '47%' }}>项目名称</span>
+                <span style={{ marginLeft: '47%' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={publicStyle.infoItem}>
-          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={{ pageSize: 50 }} scroll={{ y: 240 }}/>,
+          <Table columnWidth={10} showHeader={false} 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>
-        <Table dataSource={data.visitRecords} columns={columns} rowKey="customerDetail" onChange={changePageNum} showQuickJumper/>
+        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
       </div>
     </>
   )

src/pages/customer/customerlist/style.less

@@ -147,6 +147,12 @@
     border-radius: 6px;
     margin: 30px 0 20px 0;
   }
+  .touxiangphoto{
+    width: 60px;
+    width: 60px;
+    border-radius: 6px;
+    margin: 30px 0 0px 0;
+  }
   .infoItem{
     color:#666;
     font-size: 19px;

src/services/apis.js

@@ -268,6 +268,11 @@ export default {
       url: `${prefix}/customer/recommend/get/:id`,
       action: 'admin.customer.recommend.get.id.get',
     },
+    cecommendPublic: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/public/get/:id`,
+      action: 'admin.customer.recommend.public.get.id.get',
+    },
     customerRecommendRecommenderExport: { // 导出数据（推荐客户）
       method: 'GET',
       url: `${prefix}/customer/recommend/recommender/export`,