合并

src/pages/building/list/add/components/base.jsx

@@ -114,7 +114,7 @@ function AddBuilding(props) {
             {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" >
-            {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}m²/元
+            {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
           </Form.Item>
           <Form.Item label="开盘时间"  >
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}

src/pages/customer/customerlist/index.jsx

@@ -28,6 +28,8 @@ function body(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const [columns, setColumns] = useState(privateColumns)
 
   // 默认私客
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -107,6 +109,7 @@ function body(props) {
 
     const { value } = e.target
     setCustomerType(value)
+    //setColumns(value === 'private' ? privateColumns : publicColumns)
     getList({ pageNumber: 1, pageSize: 10, customerType: value })
   }
 
@@ -168,7 +171,34 @@ function body(props) {
     link.click()
   }
 
-  const columns = [
+  const publicColumns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '15%',
+      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '15%',
+    },
+  ]
+
+  const privateColumns = [
     {
       title: '头像',
       dataIndex: 'picture',
@@ -324,8 +354,11 @@ function body(props) {
           </Radio.Group>
         </AuthButton>
       </div>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
-
+      {customerType === 'private' ? 
+        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+      }
+      
       {/* 调整归属 */}
       <Attribution visibleData={gVisibleData} />
 

src/pages/customer/recommendCustomer/audit.jsx

@@ -91,7 +91,7 @@ function body(props) {
 
   return (
     <>
-      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e, props)} style={{ width: '800px', margin: 'auto' }}>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
         <Form.Item label="客户ID" style={{ display: 'none' }}>
           {getFieldDecorator('customerId')(
             <Input
@@ -180,7 +180,7 @@ function body(props) {
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
           <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            搜索
+            确定
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => router.go(-1)}>

src/pages/customer/recommendCustomer/index.jsx

@@ -169,7 +169,7 @@ function body(props) {
         <>
           {
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
-              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+              {record.verifyStatus === null ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           }
         </>