zlisen 3 år sedan
förälder
incheckning
d99d8574f9

+ 1
- 1
config/proxy.js Visa fil

@@ -10,7 +10,7 @@ export default {
10 10
     '/api/': {
11 11
       target: 'https://xlk.njyz.tech/',
12 12
       // target: 'http://localhost:8567/',
13
-      // target: 'https://xlj.newlandsh.com/',
13
+      // target: 'https://www.newhousehold.cn',
14 14
       changeOrigin: true,
15 15
       pathRewrite: {
16 16
         '^': '',

+ 3
- 0
src/components/SelectButton/BuildSelect2.jsx Visa fil

@@ -21,6 +21,7 @@ function usePrevious(props) {
21 21
  */
22 22
 const BuildingSelect2 = props => {
23 23
   const [data, setData] = useState([])
24
+  const [loading, setLoading] = useState(true)
24 25
   const [value, setValue] = useState([])
25 26
   const {cityId,disabled=false} = props
26 27
   console.log('props', props.cityId);
@@ -33,6 +34,7 @@ const BuildingSelect2 = props => {
33 34
     request({ ...apis.building.buildingSelect, params: { cityId: props.cityId, pageNum: 1, pageSize: 999 } }).then(data => {
34 35
       setData(data)
35 36
       checkValue(data)
37
+      setLoading(false)
36 38
       // 默认选中第一个
37 39
     })
38 40
   }
@@ -65,6 +67,7 @@ const BuildingSelect2 = props => {
65 67
       value={props.value}
66 68
       style={{ width: '300px' }}
67 69
       placeholder="请选择项目"
70
+      loading={loading}
68 71
       onChange={ onChange}
69 72
       filterOption={(input, option) =>
70 73
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 1
- 1
src/pages/customer/Customer/PrivateCustomer/CustomerDetail.jsx Visa fil

@@ -203,7 +203,7 @@ function CustomerDetail(props) {
203 203
          
204 204
           </div>
205 205
           <div className={styles.rightphone}>
206
-          <p className={styles.infoItem}>{realtyConsultantPerson?.userName}</p>
206
+          <p className={styles.infoItem}>{realtyConsultantPerson?.name||realtyConsultantPerson?.nickname}</p>
207 207
           <p className={styles.infoItem}>号码:{realtyConsultantPerson?.phone} </p>
208 208
       
209 209
           </div>

+ 2
- 2
src/pages/staff/staff/components/BatchAssistConsultant.jsx Visa fil

@@ -3,7 +3,7 @@ import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Paginati
3 3
 import moment from 'moment';
4 4
 import apis from '@/services/apis';
5 5
 import request from '@/utils/request';
6
-import BuildSelect from '@/components/SelectButton/BuildSelect'
6
+import BuildSelect from '@/components/SelectButton/BuildSelect2'
7 7
 
8 8
 /**
9 9
  * 分配置业顾问
@@ -18,7 +18,7 @@ class ModalAttribution extends React.Component {
18 18
     this.state = {
19 19
       dataSource: { records: [] },
20 20
       visibleData: { visible: false, buildingId: '' },
21
-      isShowBuildSelect:false
21
+      isShowBuildSelect:false,
22 22
     }
23 23
   }
24 24