Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/proxy.js

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

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

@@ -132,8 +132,8 @@ function CustomerDetail(props) {
       render: (_, record) => <span>{record.intention}</span>,
     },
   ];
- const  {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taUser={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
- const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
+  const {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taUser={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
+  const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
 
   return (
     <>
@@ -230,10 +230,10 @@ function CustomerDetail(props) {
             bordered={false}
             columnWidth={10}
             columns={intention}
-            dataSource={personIntentions}
+            // dataSource={personIntentions}
             pagination={false}
             key='personId'
-            scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
+            // scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
             width={500}
           />
           {/* </div> */}

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

@@ -6,7 +6,7 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import withActions from '@/components/ActionList';
 import AuthButton from '@/components/AuthButton';
-import Styles from '../style.less';
+
 import ChangeStatus from './components/ChangeStatus';
 import Attribution from './components/Attribution';
 import IntegralRecord from './components/IntegralRecord';

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Table, Modal, notification } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
 
 /**
  * 分配置业顾问

src/pages/customer/Customer/PublicCustomer/AssistConsultant/BatchAssistConsultant.jsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
 import moment from 'moment';
-import request from '../../../../utils/request';
-import apis from '../../../../services/apis';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import Styles from '../style.less';
-import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import BuildSelect from '@/components/SelectButton/BuildSelect'
 
 
 const { Option } = Select;

src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Table, Modal, notification,Button } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
 
 /**
  * 分配置业顾问

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

@@ -6,7 +6,7 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import withActions from '@/components/ActionList';
 import AuthButton from '@/components/AuthButton';
-import Styles from '../style.less';
+
 import IntegralRecord from './components/IntegralRecord';
 import Recommend from './components/Recommend';
 import AssistConsultant from './components/assistConsultant';

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

@@ -26,7 +26,7 @@ function header(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getById();
-    toLoadIntention();
+    // toLoadIntention();
   }, []);
 
   function toLoadIntention() {
@@ -134,8 +134,8 @@ function header(props) {
     },
   ];
 
-  const  {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
- const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
+  const {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
+  const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
   return (
     <>
       <div style={{ textAlign: 'right', marginBottom: '16px' }}>
@@ -204,10 +204,10 @@ function header(props) {
              bordered={false}
              columnWidth={10}
              columns={intention}
-             dataSource={personIntentions}
+            //  dataSource={personIntentions}
              pagination={false}
              key='personId'
-             scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
+            //  scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
     
             />
           </div>

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

@@ -24,8 +24,7 @@
   align-items: center;
   position: relative;
   line-height: 1.5;
-  font-size: 0.106rem;
-  margin-bottom: 0.08rem;
+  margin-bottom: 8px;
 
 }
 .cardItem{
@@ -33,11 +32,9 @@
   display: flex;
   align-items: center; 
   line-height: 1.5;
-  font-size: 0.106rem;
-  margin-bottom: 0.08rem; 
+  margin-bottom: 8px; 
 }
 .ediText {
-  font-size: 0.106rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -45,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width:  0.54rem;
+  width:  54px;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify
@@ -136,7 +133,7 @@
     position: relative;
   }
   .tit{
-    font-size:0.15rem;
+    font-size: 1.5em;
     font-weight:600;
     color:#222;
     margin: 10px 0 0 0;
@@ -149,13 +146,11 @@
   }
   .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{
@@ -180,7 +175,6 @@
     left:50%;
     margin: 0 0 15px 0;
     color:#666;
-    font-size: 0.1rem;
   }
 
   .rightCentered{
@@ -189,7 +183,6 @@
     left:55%;
     margin: 0 0 15px 0;
     color:#666;
-    font-size: 0.1rem;
   }
   
 }

src/pages/customer/Customer/style.less

@@ -120,7 +120,7 @@
   position: relative;
 }
 .tit{
-  font-size:0.15rem;
+  font-size: 1.5em;
   font-weight:600;
   color:#222;
   margin: 10px 0 0 0;
@@ -142,24 +142,19 @@
 }
 .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;
+  min-width: 130px;
+  margin-left: 10px;
+  padding-top: 30px;
 }
 .rightphone{
 
@@ -175,37 +170,25 @@
 }
 .rightInfo{
   width: 28%;
-  min-width: 1.3rem;
-  margin-right: 0.1rem;
-  padding-top: 0.3rem;
-  // position: absolute;
-  // top:108px;
-  // left:80%;
+  min-width: 130px;
+  margin-right: 10px;
+  padding-top: 30px;
 }
 
 .Centered{
   width: 28%;
-  // position: absolute;
-  // top:108px;
-  // left:30%;
-  min-width: 1.3rem;
+  min-width: 130px;
   margin: 0 0 15px 0;
   color:#666;
-  font-size: 0.1rem;
-  padding-top: 0.3rem;
+  padding-top: 30px;
 }
 
 .rightCentered{
-  // position: absolute;
-  // top:108px;
-  // left:55%;
   flex: 1;
-  // width: 25%;
-  min-width: 1.3rem;
+  min-width: 130px;
   margin: 0 0 15px 0;
-  padding-top: 0.3rem;
+  padding-top: 30px;
   color:#666;
-  font-size: 0.1rem;
 }
 
 
@@ -260,7 +243,7 @@
     position: relative;
   }
   .tit{
-    // font-size:0.15rem;
+    font-size: 1.5em;
     font-weight:600;
     color:#222;
     margin: 10px 0 0 0;
@@ -282,21 +265,19 @@
   }
   .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;
+    min-width: 130px;
+    margin-left: 10px;
+    padding-top: 30px;
     // position: absolute;
     // top:108px;
     // left:170px;
@@ -315,12 +296,9 @@
   }
   .rightInfo{
     width: 25%;
-    min-width: 1.3rem;
-    margin-right: 0.1rem;
-    padding-top: 0.3rem;
-    // position: absolute;
-    // top:108px;
-    // left:80%;
+    min-width: 130px;
+    margin-right: 10px;
+    padding-top: 30px;
   }
 
   .Centered{
@@ -328,23 +306,18 @@
     // position: absolute;
     // top:108px;
     // left:30%;
-    min-width: 1.3rem;
+    min-width: 130px;
     margin: 0 0 15px 0;
     color:#666;
-    // font-size: 0.1rem;
-    padding-top: 0.3rem;
+    padding-top: 30px;
   }
 
   .rightCentered{
-    // position: absolute;
-    // top:108px;
-    // left:55%;
     width: 25%;
-    min-width: 1.3rem;
+    min-width: 130px;
     margin: 0 0 15px 0;
-    padding-top: 0.3rem;
+    padding-top: 30px;
     color:#666;
-    // font-size: 0.1rem;
   }
   
 }