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

src/components/SelectButton/BuildSelect.jsx

@@ -23,7 +23,7 @@ const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
   const [ value, setValue ] = useState('')
   const preProps = usePrevious(props)
-  
+
   if ((!preProps || !preProps.value) && props.value && !value) {
     setValue(props.value)
   }

src/components/SelectButton/CitySelect.jsx

@@ -30,7 +30,16 @@ const CitySelect = (props) => {
   }
 
   return (
-      <Select showSearch value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
+      <Select 
+      showSearch 
+      value={props.value} 
+      style={{ width: '180px' }} 
+      placeholder="请选择城市" 
+      onChange={props.onChange} 
+      filterOption={(input, option) =>
+        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
+      >
           {data.map(city => (
             <Option key={city.id} value={city.id}>{city.name}</Option>
           ))}

src/pages/customer/customerlist/index.jsx

@@ -200,7 +200,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
+      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '未报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
     },
     {
       title: '操作',