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

src/pages/carouselFigure/customImg/list.jsx

@@ -54,7 +54,7 @@ function header(props) {
       <Table dataSource={data}>
         <Column title="图片" dataIndex="imgUrl" key="imgUrl" 
         render={(text, record) => (
-        <img src={record.imgUrl} height="120px" width="150px" />
+        <img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }}/>
         )}/>
         <Column title="类型" dataIndex="imgType" key="imgType" 
         render={(text, record) => (

src/pages/customer/customerlist/index.jsx

@@ -58,20 +58,20 @@ function body(props) {
   // 推荐客户
   const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
 
-  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '',buildingId:'' })
+  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '', buildingId: '' })
 
   const [loadingStatus, setLoadingStatus] = useState(false)
 
   // 选中的公客信息
   const [personInfo, setPersonInfo] = useState([])
 
-  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [] ,buildingId:''})
+  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [], buildingId: '' })
 
   const [currentSelectedRows, setSelectedRows] = useState([])
 
-  const [selectedRowKeys,setSelectedRowKeys] = useState([])
+  const [selectedRowKeys, setSelectedRowKeys] = useState([])
 
-//  const [ radio, setRadio] = useState(true)
+  //  const [ radio, setRadio] = useState(true)
 
   // const [page, setPage] = useState(1)
 
@@ -93,7 +93,7 @@ function body(props) {
       localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType }))
       getList({ pageNumber: 1, pageSize: 10, customerType })
     }
-  }, []) 
+  }, [])
 
   function getList(params) {
     // 网路请求
@@ -179,9 +179,9 @@ function body(props) {
 
   // 私客/公客切换
   function radioButtonHandleSizeChange(e) {
-    
+
     displayNone()
-    
+
     props.form.resetFields();
     const { value } = e.target
     setCustomerType(value)
@@ -233,7 +233,7 @@ function body(props) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
   }
 
   function showRecord(record) {
@@ -241,7 +241,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
   }
 
   function showStatus(record) {
@@ -249,7 +249,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
-    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
   }
 
   // 推荐客户
@@ -262,13 +262,13 @@ function body(props) {
   }
 
   //分配置业顾问
-  function assistConsultant(personId,buildingId) {
+  function assistConsultant(personId, buildingId) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: true, customerId: personId ,buildingId:buildingId})
-    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
+    setAssistVisibleData({ visible: true, customerId: personId, buildingId: buildingId })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
   }
 
   function batchAssistConsultant() {
@@ -281,22 +281,22 @@ function body(props) {
     const compareSet = new Set();
     personInfo.filter(record => {
       compareSet.add(record.buildingName)
-    } )
+    })
 
-    if(compareSet.size != 1){
+    if (compareSet.size != 1) {
       return message.info("请选择项目");
     }
 
     // const newSelectedRows = personInfo.filter()  
-    
+
     // console.log(newSelectedRows,'newSelectedRows')
 
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
-    setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId})
+    setAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId })
   }
 
   function toCustomerDateil(record) {
@@ -325,7 +325,7 @@ function body(props) {
         download(response)
         setLoadingStatus(false)
       }).catch(error => {
-        message.err("连接超时");
+        message.err('连接超时');
         setLoadingStatus(false)
       })
   }
@@ -347,13 +347,10 @@ function body(props) {
   function closeAttribution() {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     if (customerType === 'private') {
-
-      getList(JSON.parse(localStorage.getItem("priPageParams")))
+      getList(JSON.parse(localStorage.getItem('priPageParams')))
     } else {
-
-      getList(JSON.parse(localStorage.getItem("pubPageParams")))
+      getList(JSON.parse(localStorage.getItem('pubPageParams')))
     }
-
   }
   // 回调关闭所有弹框
   function closeAll() {
@@ -361,7 +358,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
+    setAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
     setBatchAssistVisibleData({ visible: false, customerId: '' })
     if (customerType === 'private') {
 
@@ -379,11 +376,11 @@ function body(props) {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
       setSelectedRowKeys(selectedRowKeys)
       const newSelectedRows = personInfo.filter(x => !selectedRows.some(y => x.customerId === y.customerId))     // 去重
-                                .concat(selectedRows)                                                                 // 新增选择
-                                .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
+        .concat(selectedRows)                                                                 // 新增选择
+        .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
 
       // setSelectedRows(newSelectedRows)
-      console.log(newSelectedRows,"33333333333333333333")
+      console.log(newSelectedRows, "33333333333333333333")
       setPersonInfo(newSelectedRows)
     },
   };
@@ -396,7 +393,7 @@ function body(props) {
       align: 'center',
       width: '15%',
       // render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
-      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture } size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture} size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -462,7 +459,7 @@ function body(props) {
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
           <AuthButton name="admin.customer.assign" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId,record.buildingId)}>分配置业顾问</Button>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
           </AuthButton>
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
@@ -586,7 +583,7 @@ function body(props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-      {customerType === 'public' && <Form.Item>
+        {customerType === 'public' && <Form.Item>
           {getFieldDecorator('belongStatus')(
             <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
               <Option value={1}>是</Option>