fix

config/routes.js

@@ -56,6 +56,66 @@ export default [
                 name: '项目列表',
                 component: './building/List',
               },
+              {
+                path: '/building/type',
+                name: '项目类型',
+                component: './building/type/index',
+              },
+              {
+                path: '/building/type/edi',
+                name: '项目类型编辑',
+                hideInMenu: true,
+                component: './building/type/edi',
+              },
+              {
+                path: '/building/Developers',
+                name: '品牌开发商',
+                component: './building/Developers',
+              },
+              {
+                path: '/building/Developers/Edit',
+                name: '品牌开发商编辑',
+                hideInMenu: true,
+                component: './building/Developers/Edit',
+              },
+            ],
+          },
+          {
+            path: '/customer',
+            name: '客户管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/customer/customer/list',
+                name: '客户列表',
+                component: './customer/customer/index',
+              },
+
+
+              {
+                path: '/customer/customerlist/list',
+                name: '客户列表old',
+                component: './customer/customerlist/index copy.jsx',
+              },
+              {
+                path: '/customer/customerlist/customerDetail',
+                name: '私客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/customerDetail',
+              },
+              {
+                path: '/customer/drift/list',
+                name: '游客列表',
+                component: './customer/drift/index',
+              },
+              {
+                path: '/customer/customerlist/publicCustomerDetail',
+                name: '公客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/publicCustomerDetail',
+              },
+
+              
             ],
           },
           {

src/components/EditIcon/index.jsx

@@ -0,0 +1,115 @@
+import React, { useMemo } from 'react';
+import spriteImg from '../../assets/sprite.png';
+
+const spriteInfo = [
+    {
+        name: '启用',
+        type: 'start',
+        pos: 0,
+        color: '#ff925c',
+    },
+    {
+        name: '发布',
+        type: 'publish',
+        pos: -126,
+        color: '#ff925c',
+    },
+    {
+        name: '上架',
+        type: 'up',
+        pos: -18,
+        color: '#ff925c',
+    },
+    {
+        name: '编辑',
+        type: 'edit',
+        pos: -144,
+        color: '#ff925c',
+    },
+    {
+        name: '取消',
+        type: 'cancel',
+        pos: -36,
+        color: '#FF4A4A',
+    },
+    {
+        name: '停用',
+        type: 'stop',
+        pos: -162,
+        color: '#FF4A4A',
+    },
+    {
+        name: '结束',
+        type: 'end',
+        pos: -54,
+        color: '#FF4A4A',
+    },
+    {
+        name: '删除',
+        type: 'delete',
+        pos: -180,
+        color: '#FF4A4A',
+    },
+    {
+        name: '查看',
+        type: 'look',
+        pos: -72,
+        color: '#FF4A4A',
+    },
+    {
+        name: '添加',
+        type: 'add',
+        pos: -198,
+        color: '#FF4A4A',
+    },
+    {
+        name: '前置',
+        type: 'top',
+        pos: -90,
+        color: '#FF4A4A',
+    },
+    {
+        name: '下架',
+        type: 'down',
+        pos: -216,
+        color: '#FF4A4A',
+    },
+    {
+        name: '记录',
+        type: 'record',
+        pos: -108,
+        color: '#FF4A4A',
+    },
+    {
+        name: '数据',
+        type: 'data',
+        pos: -234,
+        color: '#FF4A4A',
+    },
+    {
+        name: '下载二维码',
+        type: 'download',
+        pos: -252,
+        color: '#ff925c',
+    },
+]
+
+function noop() { }
+
+const EditIcon = ({ text, type, color, position, onClick }) => {
+    const icon = spriteInfo.filter(x => x.type === type)[0] || {};
+    const color2 = color || icon.color || '#ff925c';
+    const position2 = position || icon.pos;
+
+    const wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center', cursor: 'pointer' }), [type, color]);
+    const iconStyle = useMemo(() => ({ display: 'inline-block', marginLeft: '6px', background: `url(${spriteImg}) 0 ${position2}px / 100% 1500% no-repeat`, width: '18px', height: '18px' }), [type, position])
+
+    return (
+        <span style={wrappedStyle} onClick={onClick || noop} >
+            {text}
+            {type && <span style={iconStyle}></span>}
+        </span>
+    )
+};
+
+export default EditIcon;

src/components/Navigate/index.jsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import Link from 'umi/link';
+
+import styles from './style.less';
+
+const Navigate = ({ children, to, onClick }) => {
+    // to 包含协议 用 a
+    const useA = (to || '').indexOf('://') > -1 ? 'a' : '';
+    // 否则用 Link
+    const useLink = to && to.indexOf('://') === -1 ? Link : '';
+    // 没有 to 则使用 span
+    const element = useA || useLink || 'span';
+
+    const events = onClick ? { onClick } : {};
+    const style = { color: '#1D74D9', cursor: 'pointer' };
+
+    let redirect = {};
+    if (useA) {
+        redirect = { href: to }
+    } else if (useLink) {
+        redirect = { to }
+    }
+
+    const props = {
+        className: 'cust-navi',
+        style,
+        ...redirect,
+        ...events,
+    }
+
+    return React.createElement(element, props, children);
+};
+
+export default Navigate;

src/components/Navigate/style.less

@@ -0,0 +1,11 @@
+
+:global {
+  .cust-navi {
+    color: #1D74D9;
+    cursor: pointer;
+  
+    * {
+      color: #1D74D9 !important;
+    }
+  }
+}

src/components/TableList/index.jsx

@@ -12,12 +12,12 @@ export default React.forwardRef((props, ref) => {
   const [pageTotal, setPageTotal] = useState(0)
   const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10 })
 
-  const { api, params = {}, onPageChange, ...tableProps } = props
+  const { api, params, onPageChange, ...tableProps } = props
 
   // 更新分页
   const updatePage = useCallback(
     (current, pageSize) => {
-      const config = pageSize ? { current, pageSize } : { current }
+      const config = pageSize ? { current, pageSize } : { current, pageSize:pageConfig.pageSize }
       const newPage = {
         ...pageConfig,
         ...config,
@@ -36,7 +36,7 @@ export default React.forwardRef((props, ref) => {
     () => {
       setLoading(true)
       const queryParams = {
-        ...params,
+        ...params || {},
         pageNum: pageConfig.current,
         pageSize: pageConfig.pageSize,
       }

src/components/XForm/FileUpload.jsx

@@ -0,0 +1,84 @@
+import React, { useState, useEffect } from 'react'
+import { Upload, Button, Icon } from 'antd';
+import { uploaderProps } from '../../utils/upload';
+
+/**
+ * value 数据的接收格式 [{ url: xxxxx.mp4 }]
+ * size  参数限制可以上传多少个文件
+ * @param { value, size } props
+ */
+function fileUpload(props) {
+
+  const { value } = props
+  // console.log('fileUploadProps： ', props)
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [defaultFileList, setDefaultFileList] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    setDefaultValue()
+  }, [props.value]);
+
+
+  function getFileList() {
+    console.log('fileUpload: ', value)
+    // value 数据的接收格式 [{ url: xxxxx.mp4 }, { url: xxxxx.jpg }]
+    return (value || []).filter(f => f !== undefined).map((img, inx) => ({ uid: inx, url: img, name: img.substring(img.lastIndexOf('/') + 1, img.length), status: 'done' }))
+  }
+
+  function setDefaultValue() {
+    if (!value) {
+      return;
+    }
+
+    setDefaultFileList(getFileList())
+  }
+
+  function onFileChange({ file, fileList }) {
+    console.log(file, fileList)
+    setDefaultFileList(fileList)
+    if (file.status === 'uploading') {
+      return
+    }
+
+    if (file.status === 'done' || file.status === 'removed') {
+
+      // 因为这个控件本身返回的数据格式 [{ ..., response: '服务器返回的数据' }]
+      // 但是 我这里自己用的时候 传入的数据是 [ 'xxxx.mp4', 'xxxx.jpg' ], 然后通过 getFileList() 转换成了 [{ url: 'xxx.mp4' }] 这样的格式
+
+      // 原因是因为 控件返回的数据 和 fileList 展示已经上传的数据 的格式字段不一样
+
+      const resFileList = fileList.filter(f => f.response !== undefined).map(i => i.response)
+      const tempFileList = fileList.filter(f => f.url !== undefined).map(i => i.url)
+      const resultList = tempFileList.concat(resFileList || [])
+      props.onChange(resultList)
+    }
+  }
+
+  return (
+    <>
+      <Upload
+        { ...uploaderProps }
+        {...props}
+        onChange={onFileChange}
+        fileList={defaultFileList}
+      >
+        {
+          props.size ?
+          (props.size > defaultFileList.length
+          && (
+            <Button>
+                <Icon type="upload" /> {props.label}
+              </Button>
+          )) : (
+            <Button>
+              <Icon type="upload" /> {props.label}
+            </Button>
+          )
+        }
+      </Upload>
+    </>
+  )
+}
+
+export default fileUpload

src/components/XForm/ImageListUpload.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { Upload, Icon, Modal } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+/**
+ * unlimited  属性表示上传图片无限制
+ * 例子： <ImageListUpload unlimited/>
+ */
+class ImageListUpload extends React.Component {
+  state = {
+    previewVisible: false,
+    previewImage: '',
+    loadding: false,
+  };
+
+  getFileList = () => {
+    return (this.props.value || []).map((img, inx) => ({ uid: inx, url: img, status: 'done' }))
+  }
+
+  handleCancel = () => this.setState({ previewVisible: false });
+
+  handlePreview = async file => {
+    this.setState({
+      previewImage: file.url ,
+      previewVisible: true,
+    });
+  };
+
+  handleChange = (e) => {
+    if (e.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
+    }
+
+    const fileList = (this.props.value || []).filter(x => x != e.file.url);
+    this.props.onChange(fileList);
+
+    // console.log('删除图片触发了', e.file)
+    // if (e.file.state === 'removed') {
+    //   const fileList = (this.props.value || []).filter(x => x != e.file.url);
+    //   this.props.onChange(fileList);
+    // }
+
+    // if (e.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
+
+    //   if (e.file.response && e.file.response.url) {
+    //     if (typeof this.props.onChange === 'function') {
+    //       const fileList = this.getFileList()
+    //       this.props.onChange([...fileList || [], e.file.response.url]);
+    //     }
+    //   }
+    // }
+  };
+
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      const fileList = this.props.value || [];
+      this.props.onChange([...fileList, url]);
+    }
+  }
+
+  render() {
+    const { previewVisible, previewImage } = this.state;
+    const fileList = this.getFileList();
+
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"}  />
+      </div>
+    );
+    return (
+      <div className="clearfix">
+        <Upload
+          listType="picture-card"
+          multiple={true}
+          fileList={fileList}
+          onPreview={this.handlePreview}
+          onChange={this.handleChange}
+          { ...uploaderProps }
+          onSuccess={this.handleUploadSucess}
+        >
+          {/* unlimited 表示上传无限制数量 */}
+          {(this.props.unlimited && uploadButton) || ((fileList || images).length >= 8 ? null : uploadButton)}
+        </Upload>
+        <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+          <img alt="example" style={{ width: '100%' }} src={previewImage} />
+        </Modal>
+      </div>
+    );
+  }
+}
+
+export default ImageListUpload;

src/components/XForm/ImageUpload.jsx

@@ -0,0 +1,77 @@
+import React from 'react';
+import { Upload, Icon, message } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
+
+class ImageUpload extends React.Component {
+  state = {
+    loading: false,
+    imageUrl: undefined,
+  };
+
+  handleChange = info => {
+    if (info.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
+    }
+    
+    if (info.file.status === 'removed') {
+      this.props.onChange();
+    }
+
+    // if (info.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
+
+    //   if (info.file.response && info.file.response.url) {
+    //     this.setState({
+    //       imageUrl: info.file.response.thumbUrl,
+    //     });
+
+    //     if (typeof this.props.onChange === 'function') {
+    //       this.props.onChange(info.file.response.url);
+    //     }
+    //   }
+    // }
+  };
+
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(url);
+    }
+  }
+
+  render() {
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+      </div>
+    );
+
+    const value = this.props.value;
+    return (
+      <Upload
+        listType="picture-card"
+        className="avatar-uploader"
+        showUploadList={false}
+        beforeUpload={this.props.beforeUpload}
+        onChange={this.handleChange}
+        {...uploaderProps}
+        disabled={this.props.disabled}
+        onSuccess={this.handleUploadSucess}
+      >
+        {(this.state.imageUrl || value) ? (
+          <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
+        ) : (
+            uploadButton
+          )}
+      </Upload>
+    );
+  }
+}
+
+export default ImageUpload;

src/components/XForm/README.md

@@ -0,0 +1,31 @@
+# XForm
+Antd Form 扩展
+
+## 使用说明
+
+```jsx
+import XForm, { FieldTypes } from '/path/to/XForm';
+
+const tplJSON = [
+  {},
+  {}
+]
+
+```
+
+通过 `json` 对象来实现自动构造 form 表单
+
+计划支持的属性
+
+[] label      显示的文字
+
+[] name       form name, 用于表单提交
+
+[] type       组件类型, 参见 FieldTypes
+
+[] rules      校验规则
+
+[] element    函数, 用于生成组件. (props) => <></> . 其中 props 包含 ...
+
+[] value      绑定的数据
+

src/components/XForm/WrapperForm.jsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form, Button } from 'antd';
+import WrapperItem from './WrapperItem';
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+class WrapperForm extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {}
+  }
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (err) {
+        if (typeof this.props.onError === 'function') {
+          typeof this.props.onError(err)
+        } else {
+          window.console.error(err)
+        }
+      } else {
+        if (typeof this.props.onSubmit === 'function') {
+          typeof this.props.onSubmit(values)
+        }
+      }
+    });
+  }
+
+  handleCancel = e => {
+    e.preventDefault();
+
+    if (typeof this.props.onCancel === 'function') {
+      typeof this.props.onCancel()
+    }
+  }
+
+  renderDefaultAction = (submitBtn, cancelBtn) => {
+    let FieldSubmit = null
+    let FieldCancel = null
+    if (submitBtn !== false) {
+      FieldSubmit = <Button htmlType="submit" type="primary">提交</Button>
+    }
+    if (cancelBtn !== false) {
+      FieldCancel = <Button htmlType="button" onClick={this.handleCancel} style={{ marginLeft: '48px' }}>取消</Button>
+    }
+
+    return FieldSubmit || FieldCancel ? <WrapperItem action render={<>{FieldSubmit}{FieldCancel}</>} /> : null
+  }
+
+  render () {
+    const {fields, form, children, submitBtn, cancelBtn, ...formProps} = this.props;
+    console.log('fields:', fields)
+    const FeildItems = (fields || []).filter(x => x).map((props, inx) => (<WrapperItem key={inx} {...props} form={form} />))
+    
+    return (
+      <Form {...formItemLayout} {...formProps} onSubmit={this.handleSubmit}>
+        {FeildItems}
+        {this.renderDefaultAction(submitBtn, cancelBtn)}
+        {children}
+      </Form>
+    );
+  }
+}
+
+WrapperForm.propTypes = {
+  fields: PropTypes.array.isRequired
+}
+
+export default WrapperForm;

src/components/XForm/WrapperItem.jsx

@@ -0,0 +1,151 @@
+import React from 'react';
+import {
+  Form,
+  Input,
+  InputNumber,
+  Checkbox,
+  Radio,
+  DatePicker,
+  TimePicker,
+  Select,
+  Switch,
+} from 'antd';
+import ImageUploader from './ImageUpload';
+
+const {Item} = Form
+const { Option } = Select;
+const { MonthPicker, RangePicker } = DatePicker
+
+const FieldTypes = {
+  Text: 'Text',
+  Password: 'Password',
+  Number: 'Number',
+  Switch: 'Switch',
+  TimePicker: 'TimePicker',
+  DatePicker: 'DatePicker',
+  RangePicker: 'RangePicker',
+  MonthPicker: 'MonthPicker',
+  Select: 'Select',
+  ImageUploader: 'ImageUploader',
+}
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 8,
+    },
+  },
+};
+
+const WrapperItem = props => {
+  const {
+    form,
+    label,
+    name,
+    type,
+    placeholder,
+    render,
+    rules,
+    value,
+    dict,
+    action,
+    props: fieldProps,
+    hidden = false,
+    help,
+    ...restProps
+  } = props;
+
+  const { getFieldDecorator } = form || {};
+
+  let config = {
+    rules,
+    initialValue: value,
+  }
+
+  if (type === FieldTypes.Switch) {
+    config = {
+      ...config,
+      valuePropName: 'checked',
+    };
+  }
+
+  if (type === FieldTypes.ImageUploader) {
+    config = {
+      ...config,
+      getValueFromEvent: x => x,
+    };
+  }
+
+  // 没有类型与组件, 生成隐藏字段
+  if (!type && !render) {
+    getFieldDecorator(name, config);
+    return null;
+  }
+
+  const SelectOpts = (dict || []).map((item, index) => (<Option value={item.value}>{item.label}</Option>))
+
+  let Field = <></>;
+  if (render) {
+    Field = typeof render === 'function' ? render(props) : render
+  } else {
+    switch (type) {
+      case FieldTypes.Text:
+        Field = <Input placeholder={placeholder} style={{ width: '100%' }} {...fieldProps}/>;
+        break;
+      case FieldTypes.Password:
+        Field = <Input.Password placeholder={placeholder} style={{ width: '100%' }} {...fieldProps}/>;
+        break;
+      case FieldTypes.Number:
+        Field = <InputNumber placeholder={placeholder} style={{ width: '100%' }} {...fieldProps}/>;
+        break;
+      case FieldTypes.Switch:
+        Field = <Switch {...fieldProps} />;
+        break;
+      case FieldTypes.TimePicker:
+        Field = <TimePicker {...fieldProps} style={{ width: '100%' }}/>;
+        break;
+      case FieldTypes.DatePicker:
+        Field = <DatePicker {...fieldProps} style={{ width: '100%' }}/>;
+        break;
+      case FieldTypes.RangePicker:
+        Field = <RangePicker {...fieldProps} style={{ width: '100%' }}/>;
+        break;
+      case FieldTypes.MonthPicker:
+        Field = <MonthPicker {...fieldProps} style={{ width: '100%' }}/>;
+        break;
+      case FieldTypes.Select:
+        Field = <Select placeholder={placeholder} style={{ width: '100%' }} {...fieldProps}>{SelectOpts}</Select>
+        break;
+      case FieldTypes.ImageUploader:
+        const beforeUpload = { beforeUpload: props.beforeUpload }
+        Field = <ImageUploader {...fieldProps} { ...beforeUpload}/>
+        break;
+      default:
+        throw new Error(`暂时不支持的组件类型: ${type}`)
+    }
+  }
+
+  const visible = typeof hidden === 'function' ? !hidden() : !hidden;
+
+  if (!label && !name && !action && !help) return visible ? Field : null;
+
+  const itemProps = action ? { ...restProps, ...tailFormItemLayout } : restProps
+  const labelNode = typeof label === 'function' ? label() : label;
+  const helpNode = typeof help === 'function' ? help() : help;
+
+  const newItemProps = { ...itemProps, help: helpNode }
+
+  return visible && (
+    <Item label={labelNode} { ...newItemProps }>
+      {action ? Field : getFieldDecorator(name, config)(Field)}
+    </Item>
+  )
+};
+
+export default WrapperItem;
+export { FieldTypes };

src/components/XForm/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import { Form } from 'antd';
+import WrapperForm from './WrapperForm';
+import { FieldTypes } from './WrapperItem';
+
+const createForm = option => Form.create(option)(WrapperForm);
+
+export default Form.create()(WrapperForm);
+export { FieldTypes, createForm };

src/components/XForm/style.css

@@ -0,0 +1,13 @@
+:global .avatar-uploader > .ant-upload {
+  width: 128px;
+  height: 128px;
+}
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/components/XForm/style.less

@@ -0,0 +1,20 @@
+:global {
+  .avatar-uploader {
+    & > .ant-upload {
+      width: 128px;
+      height: 128px;
+    }
+  }
+}
+
+
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/components/XForm/style.wxss

@@ -0,0 +1,13 @@
+:global .avatar-uploader > .ant-upload {
+  width: 128px;
+  height: 128px;
+}
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/pages/building/Developers/Edit.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, Card, Form,  notification } from 'antd';
+import router from 'umi/router';
+// import Styles from './style.less';
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+const formItemLayout = {
+    labelCol: {
+      xs: { span: 24 },
+      sm: { span: 8 },
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 16 },
+    },
+  };
+  const tailFormItemLayout = {
+    wrapperCol: {
+      xs: {
+        span: 24,
+        offset: 0,
+      },
+      sm: {
+        span: 16,
+        offset: 8,
+      },
+    },
+  };
+
+function Edit(props) {
+  const { getFieldDecorator } = props.form;
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  let data = {};
+  const { id } = props.location.query;
+
+  useEffect(() => {
+    if (id) {
+      getById(id);
+    }
+  }, [id]);
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // 提交数据
+        submitData(values);
+      }
+    });
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
+      data = res;
+      props.form.setFieldsValue(res);
+    });
+  }
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  function submitData(dataSources) {
+    if (id !== '') {
+      // 修改
+      updateType(dataSources);
+      return;
+    }
+
+    dataSources.status = 1;
+    dataSources.createDate = new Date();
+    request({ ...apis.buildingType.add, data: { ...dataSources } })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        router.go(-1);
+      })
+      .catch(err => {});
+  }
+
+  // 修改
+  function updateType(row) {
+    // const { url, method } = apis.buildingType.update
+    // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+
+    // request({ url: tempUrl, method, data: { ...row } }).then(() => {
+    //   router.go(-1)
+    // })
+    request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        router.go(-1);
+      })
+      .catch(err => {});
+  }
+
+  return (
+    <Card>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form.Item label="开发商名称">
+          {getFieldDecorator('name', {
+            rules: [
+              {
+                required: true,
+                message: '请输入开发商名称!',
+              },
+            ],
+          })(<Input style={{width:200}}/>)}
+        </Form.Item>
+        <Form.Item label="开发商索引">
+          {getFieldDecorator('ind', {
+            rules: [{ required: true, message: '请输入开发商索引' }],
+          })(<Input style={{width:200}}/>)}
+        </Form.Item>
+        <Form.Item label="品牌宣传图">
+          {getFieldDecorator('img', {
+            rules: [{ required: true, message: '请上传品牌宣传图' }],
+        })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item label="开发商简介">
+          {getFieldDecorator('buildingTypeName', {
+            rules: [{ required: true, message: '请输入开发商简介' }],
+          })(<Input.TextArea style={{width:400}} placeholder="120字内的简介"/>)}
+        </Form.Item>
+       
+        <Form.Item  {...tailFormItemLayout} style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Button type="primary" htmlType="submit" style={{ margin: '0' }}>
+            确定
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => router.go(-1)}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+
+const WrappedBuidingTypeForm = Form.create({ name: 'Edit' })(Edit);
+
+export default WrappedBuidingTypeForm;

src/pages/building/Developers/index.jsx

@@ -0,0 +1,56 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react'
+import {Button} from 'antd'
+import apis from '@/services/apis'
+import AuthButton from '@/components/AuthButton';
+// import QueryTable from '@/components/QueryTable'
+import TableList from '@/components/TableList'
+import getTableColumns from './tableColumns'
+import { router } from 'umi';
+
+export default (props) => {
+  const ref = useRef()
+  const [page, setPage] = useState({current: 1, pageSize: 10})
+  const toEdit = useCallback((row) => {
+    //
+    router.push({
+      pathname: '/building/Developers/Edit',
+      query: {
+        id: row?.id || undefined,
+      },
+    });
+  }, [])
+
+  const onDelete = useCallback((row) => {
+
+  }, [])
+
+
+  const tableColumns = useMemo(() => {
+    return getTableColumns({
+      page,
+      onEdit:(e)=>toEdit(e),
+      onDelete,
+    })
+  }, [page])
+
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toEdit()} >
+          新增
+        </Button>
+      </AuthButton>
+    );
+  };
+
+  return (
+    <>
+      <TableList
+        rowKey="buildingId"
+        api={apis.building.getList}
+        columns={tableColumns}
+        actionRender={actionRender}
+      />
+    </>
+  )
+}

src/pages/building/Developers/tableColumns.js

@@ -0,0 +1,69 @@
+import { router } from 'umi'
+import { Button, Badge } from 'antd'
+import moment from 'moment'
+import OperButton from '@/components/OperButton'
+import AuthButton from '@/components/AuthButton'
+import withActions from '@/components/ActionList'
+
+export default ({page, onEdit, onDelete}) => [
+  {
+    title: '开发商索引字母',
+    key: '#',
+    align: 'center',
+    render: (t, r, index) => (page.current - 1) * page.pageSize + index + 1,
+  },
+  {
+    title: '开发商名称',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '品牌宣传图',
+    dataIndex: 'image',
+    key: 'image',
+    align: 'center',
+    render: (_, row) => {
+      if (row.image) {
+        return <img src={row.image} width={128} height={72} style={{borderRadius: '4px'}} alt="" />
+      }
+      return null
+    }
+  },
+  {
+    title: '简介',
+    dataIndex: 'buildingName',
+    key: 'buildingName',
+    align: 'center',
+    // render: (t, row) => (
+    //   <AuthButton name="admin.building.update" noRight={t}>
+    //     <Button
+    //       type="link"
+    //       onClick={() => router.push({
+    //         pathname: '/building/list/add',
+    //         query: {
+    //           id: row.buildingId,
+    //         },
+    //       })}
+    //     >{t}</Button>
+    //   </AuthButton>
+    // )
+  },
+  {
+    title: '操作',
+    key: 'options',
+    align: 'center',
+    render: withActions((_, row) => [
+      <AuthButton name="admin.building.public" noRight={null}>
+        <OperButton onClick={() => onEdit(row)}>编辑</OperButton>
+      </AuthButton>,
+      <AuthButton name="admin.building.delete" noRight={null}>
+        <OperButton.Confirm
+          title="确认删除?"
+          content="删除之后不可恢复"
+          onClick={() => onDelete(row)}
+        >删除</OperButton.Confirm>
+      </AuthButton>
+    ], {noMargin: true})
+  },
+]

src/pages/building/type/edi.jsx

@@ -0,0 +1,112 @@
+import React, {  useEffect } from 'react';
+import { Input, Button, Form, Card, notification } from 'antd';
+import router from 'umi/router';
+import Styles from './style.less';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+function body(props) {
+  const { getFieldDecorator } = props.form;
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  let data = {};
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id);
+    }, []);
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // 提交数据
+        submitData(values);
+      }
+    });
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
+      data = res;
+      props.form.setFieldsValue(res);
+    });
+  }
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  function submitData(dataSources) {
+    if (id !== '') {
+      // 修改
+      updateType(dataSources);
+      return;
+    }
+
+    dataSources.status = 1;
+    dataSources.createDate = new Date();
+    request({ ...apis.buildingType.add, data: { ...dataSources } })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        router.go(-1);
+      })
+      .catch(err => {});
+  }
+
+  // 修改
+  function updateType(row) {
+    // const { url, method } = apis.buildingType.update
+    // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+
+    // request({ url: tempUrl, method, data: { ...row } }).then(() => {
+    //   router.go(-1)
+    // })
+    request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        router.go(-1);
+      })
+      .catch(err => {});
+  }
+
+  return (
+    <Card>
+      <Form onSubmit={handleSubmit} style={{ width: '500px', margin: 'auto' }}>
+        <Form.Item style={{ display: 'none' }}>
+          {getFieldDecorator('buildingTypeId')(<Input placeholder="buildingTtypeId" />)}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingTypeName', {
+            rules: [{ required: true, message: '请输入名称' }],
+          })(<Input placeholder="名称" />)}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Button
+            type="primary"
+            htmlType="submit"
+            className={Styles.addButton}
+            style={{ margin: '0' }}
+          >
+            确定
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => router.go(-1)}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+
+const WrappedBuidingTypeForm = Form.create({ name: 'body' })(body);
+
+export default WrappedBuidingTypeForm;

src/pages/building/type/index.jsx

@@ -0,0 +1,152 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Tag, notification, Modal } from 'antd';
+
+import router from 'umi/router';
+import moment from 'moment';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+import TableList from '@/components/TableList';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+export default function BuildType() {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{ records: [] }]);
+  const [page, setPage] = useState({ current: 1, pageSize: 10 });
+
+  const columns = [
+    {
+      title: '编号',
+      dataIndex: 'index',
+      key: 'index',
+      align: 'center',
+      render: (text, record, index) => <span>{index + 1}</span>,
+    },
+    {
+      title: '类型名称',
+      dataIndex: 'buildingTypeName',
+      key: 'buildingTypeName',
+      align: 'center',
+      render: (_, record) => (
+        <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>
+          {record.buildingTypeName}
+        </Tag>
+      ),
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD')}</span>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'row',
+      key: 'row',
+      align: 'center',
+      render: withActions((_, record) => [
+        <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={() => deleteType(record)} />
+        </AuthButton>,
+        <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={() => toEdi(record.buildingTypeId)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, []);
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  function getList(params) {
+    request({ ...apis.buildingType.getList, params: { ...params } })
+      .then(res => {
+        setData(res);
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        // openNotificationWithIcon('error', err)
+      });
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line no-console
+    console.log('Page: ', pageNumber);
+    getList({ pageNum: pageNumber, pageSize: 10 });
+  }
+
+  function deleteType(row) {
+    row.status = -1;
+    const modal = Modal.confirm();
+    modal.update({
+      content: '确认删除？',
+      okText: '确认',
+      cancelText: '关闭',
+      onOk: () => {
+        request({
+          ...apis.buildingType.update,
+          urlData: { id: row.buildingTypeId },
+          data: { ...row },
+        })
+          .then(() => {
+            getList({ pageNum: data.current, pageSize: 10 });
+          })
+          .then(() => {
+            openNotificationWithIcon('success', '操作成功');
+          })
+          .catch(err => {
+            // openNotificationWithIcon('error', err.message)
+          });
+
+        modal.destroy();
+      },
+      onCancel: () => {
+        modal.destroy();
+      },
+    });
+  }
+
+  // 跳转修改页
+  function toEdi(currentId) {
+    router.push({
+      pathname: '/building/type/edi',
+      query: {
+        id: currentId || '',
+      },
+    });
+  }
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+        <Button type="danger" onClick={() => toEdi()} style={{ marginBottom: '20px' }}>
+          新增类型
+        </Button>
+      </AuthButton>
+    );
+  };
+
+  return (
+    <>
+      <TableList
+        // ref={ref}
+        rowKey="buildingType"
+        api={apis.buildingType.getList}
+        // searchFields={searchFields}
+        actionRender={actionRender}
+        columns={columns}
+      />
+    </>
+  );
+}

src/pages/building/type/style.css

@@ -0,0 +1,48 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+
+  color: #666;
+  display: flex;
+  align-items: center;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}

src/pages/building/type/style.less

@@ -0,0 +1,49 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #FF4A4A;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center;  
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}

src/pages/building/type/style.wxss

@@ -0,0 +1,47 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size:  0.106rem;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size:  0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}

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

@@ -0,0 +1,165 @@
+import React, { useState, useEffect, useMemo, useRef } from 'react';
+import { Avatar } from 'antd';
+
+import QueryTable from '@/components/QueryTable';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Navigate from '@/components/Navigate';
+import getTableColumns from './tableColumns'
+
+function PrivateCustomer(props) {
+    const ref = useRef()
+    const [page, setPage] = useState({current: 1, pageSize: 10})
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '10%',
+      render: (_, record) => (
+        <Avatar
+          shape="square"
+          style={{ color: 'blue', cursor: 'pointer' }}
+          onClick={() => toCustomerDateil(record)}
+          src={record.picture}
+          size={64}
+          icon="user"
+        />
+      ),
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <Navigate onClick={() => toCustomerDateil(record)}>{record.name}</Navigate>
+        </>
+      ),
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>
+        </>
+      ),
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'consultantName',
+      key: 'consultantName',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <span>{record.consultantName}</span>
+          <br />
+          <span>{record.consultTel}</span>
+        </>
+      ),
+    },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (text, records) => {
+        if (records.status === 1) {
+          return '报备';
+        }
+        if (records.status === 2) {
+          return '到访';
+        }
+        if (records.status === 3) {
+          return '认购';
+        }
+        if (records.status === 4) {
+          return '签约';
+        }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '20%',
+      //   render: withActions((text, record) => [
+      //     <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
+      //     <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+      //       <Button className={Styles.text} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+      //     </AuthButton>,
+
+      //     <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+      //       <Button className={Styles.text} type="link" onClick={() => showGM(record)}>调整归属</Button>
+      //     </AuthButton>,
+
+      //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+      //       <Button className={ Styles.text } type="link" onClick={() => showRecord(record)}>积分记录</Button>
+      //     </AuthButton>,
+
+      //     <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+      //       <Button className={ Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+      //     </AuthButton>
+      //   ]),
+    },
+  ];
+
+  const tableColumns = useMemo(() => {
+    return getTableColumns()
+  }, [page])
+
+
+//   const tableColumns = useMemo(()=>columns, []);
+
+  return (
+    <>
+      <QueryTable
+          ref={ref}
+        rowKey="customerId"
+        api={apis.customer.customerRecommend}
+        // searchFields={{}}
+        params={{ customerType: 'private' }}
+        columns={tableColumns}
+        //   actionRender={actionRender}
+        //   onPageChange={(pg) => setPage(pg)}
+      />
+    </>
+  );
+}
+
+export default PrivateCustomer;

src/pages/customer/Customer/PrivateCustomer/tableColumns.js

@@ -0,0 +1,136 @@
+import { router } from 'umi'
+import { Button, Avatar } from 'antd'
+import moment from 'moment'
+import OperButton from '@/components/OperButton'
+import AuthButton from '@/components/AuthButton'
+import withActions from '@/components/ActionList'
+import Navigate from '@/components/Navigate';
+
+export default () => [
+  {
+    title: '头像',
+    dataIndex: 'picture',
+    key: 'picture',
+    align: 'center',
+    width: '10%',
+    render: (_, record) => (
+      <Avatar
+        shape="square"
+        style={{ color: 'blue', cursor: 'pointer' }}
+        onClick={() => toCustomerDateil(record)}
+        src={record.picture}
+        size={64}
+        icon="user"
+      />
+    ),
+  },
+  {
+    title: '姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+    width: '10%',
+    // eslint-disable-next-line no-nested-ternary
+    render: (_, record) => (
+      <>
+        <Navigate onClick={() => toCustomerDateil(record)}>{record.name}</Navigate>
+      </>
+    ),
+  },
+  {
+    title: '电话',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+    width: '10%',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    width: '10%',
+    // eslint-disable-next-line no-nested-ternary
+    render: (_, record) => (
+      <>
+        <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>
+      </>
+    ),
+  },
+  {
+    title: '置业顾问',
+    dataIndex: 'consultantName',
+    key: 'consultantName',
+    align: 'center',
+    width: '10%',
+    // eslint-disable-next-line no-nested-ternary
+    render: (_, record) => (
+      <>
+        <span>{record.consultantName}</span>
+        <br />
+        <span>{record.consultTel}</span>
+      </>
+    ),
+  },
+  {
+    title: '归属项目',
+    dataIndex: 'buildingName',
+    key: 'buildingName',
+    align: 'center',
+    width: '10%',
+  },
+  {
+    title: '推广人员',
+    dataIndex: 'sharePersonName',
+    key: 'sharePersonName',
+    align: 'center',
+    width: '10%',
+  },
+  {
+    title: '客户状态',
+    dataIndex: 'reportRecommendStatus',
+    key: 'reportRecommendStatus',
+    align: 'center',
+    width: '10%',
+    // eslint-disable-next-line no-nested-ternary
+    render: (text, records) => {
+      if (records.status === 1) {
+        return '报备';
+      }
+      if (records.status === 2) {
+        return '到访';
+      }
+      if (records.status === 3) {
+        return '认购';
+      }
+      if (records.status === 4) {
+        return '签约';
+      }
+    },
+  },
+  {
+    title: '操作',
+    dataIndex: 'customerId',
+    key: 'customerId',
+    align: 'center',
+    width: '20%',
+    //   render: withActions((text, record) => [
+    //     <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
+    //     <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+    //       <Button className={Styles.text} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+    //     </AuthButton>,
+
+    //     <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+    //       <Button className={Styles.text} type="link" onClick={() => showGM(record)}>调整归属</Button>
+    //     </AuthButton>,
+
+    //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+    //       <Button className={ Styles.text } type="link" onClick={() => showRecord(record)}>积分记录</Button>
+    //     </AuthButton>,
+
+    //     <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+    //       <Button className={ Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+    //     </AuthButton>
+    //   ]),
+  },
+];

src/pages/customer/Customer/index.jsx

@@ -0,0 +1,29 @@
+import React, { useState, useEffect } from 'react';
+import { Radio } from 'antd';
+import PrivateCustomer from './PrivateCustomer';
+
+function Customer(props) {
+  const [customerType, setCustomerType] = useState('private');
+
+  return (
+    <>
+      <div style={{ margin: '20px 0' }}>
+        <Radio.Group
+          value={customerType}
+          onChange={e => {
+            setCustomerType(e.target.value);
+          }}
+          buttonStyle="solid"
+        >
+          <Radio.Button value="private">私客</Radio.Button>
+          <Radio.Button value="public">公客</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        <PrivateCustomer></PrivateCustomer>
+      </div>
+    </>
+  );
+}
+
+export default Customer;

src/pages/customer/customerlist/components/BatchAssistConsultant.jsx

@@ -0,0 +1,170 @@
+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 Styles from '../style.less';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    console.log(props, 'props')
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: [], buildingName: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5,buildingId: this.props.visibleData.buildingId})
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  changBuilding(buildingId){
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+    this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
+  }
+
+  getUserList(params){
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      message.err(err)
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    console.log('params: ', params)
+    request({ ...apis.customer.buildingConsultant , params: { ...params }}).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
+
+    // this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId
+      ,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId
+      , customerIds: this.state.visibleData.customerId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      debugger
+      if(res!= null && res.failNum > 0 ){
+        this.openNotificationWithIcon('success', '共'+res.totalNum+'条数据,失败操作'+res.failNum+'条')
+      }else{
+        this.openNotificationWithIcon('success', '操作成功')
+      }
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+  
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+    ]
+    return (
+      <>
+        <Modal
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
+            {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/components/assistConsultant.jsx

@@ -0,0 +1,160 @@
+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 Styles from '../style.less';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', buildingName: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId,buildingId:this.props.visibleData.buildingId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  changBuilding(buildingId){
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+    this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
+  }
+
+  getUserList(params){
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, customerId: this.props.visibleData.customerId, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
+  }
+
+  // 提交
+  submitGm(record) {
+    debugger
+    // 网路请求
+    request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId }, 
+      data: { userId: record.userId,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+    ]
+    return (
+      <>
+        <Modal
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            {this.props.visibleData.buildingId == null && <BuildSelect  onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+            <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/components/attribution.jsx

@@ -0,0 +1,146 @@
+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 Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 调整归属
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '', buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  getList(params) {
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      console.log('res',res);
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.userId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant != record.userId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="选择置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table rowKey="attribution" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, pageSize: this.state.dataSource.size, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/components/changeStatus.jsx

@@ -0,0 +1,81 @@
+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 Styles from '../style.less';
+
+class ChangeStatus extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      value: '',
+      visibleData: { visible: false, customerId: '' },
+    }
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.setState({ visibleData: { ...this.props.visibleData } })
+      this.setState({ value: this.props.visibleData.status })
+    }
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  onChange = e => {
+    this.setState({
+      value: e.target.value,
+    });
+  };
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  submitButton = e => {
+    // 网路请求
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, status: this.state.value } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    return (
+      <>
+          <Modal
+            title="变更状态"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Radio.Group onChange={this.onChange} value={this.state.value}>
+              <Radio value={1}>客户报备</Radio>
+              <Radio value={2}>客户到访</Radio>
+              <Radio value={3}>客户认购</Radio>
+              <Radio value={4}>客户签约</Radio>
+            </Radio.Group>
+
+            <Button type="danger" onClick={this.submitButton}>确定</Button>
+          </Modal>
+      </>
+    )
+  }
+}
+
+export default ChangeStatus

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -0,0 +1,160 @@
+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 Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 积分记录
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalIntegralRecord extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { result: { records: [] }, totalPoints: 0 },
+       visibleData: { visible: false, customerId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  getList(params) {
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    // 网路请求
+    // 网路请求
+    request({ ...apis.customer.taPointsRecords, urlData: { id: customerId }, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  // 积分类型
+  showChangeType(str) {
+    switch (str) {
+      case 'goods':
+        return '兑换商品'
+      case 'checkin':
+        return '签到'
+      case 'share-poster':
+        return '分享'
+      case 'signup-agent':
+        return '授权手机号'
+      case 'activity_checkin':
+        return '活动签到'
+      case 'document_verify':
+          return '资料审核'  
+      case 'recommend-customer':
+        return '推荐客户'
+        case 'group':
+        return '拼团'
+        case 'recommend-customer':
+        return '推荐客户'
+      default:
+        return '未知类型'
+    }
+  }
+
+  // 判断是否是 - 开头
+  subPoints(points) {
+    const subStr = points.toString().substring(0, 1)
+    if (subStr === '-') {
+      return true
+    }
+    return false
+  }
+
+// eslint-disable-next-line class-methods-use-this
+  render() {
+    const columns = [
+      {
+        title: '序号',
+        dataIndex: 'index',
+        key: 'index',
+        render: (text, record, index) => <span>{index + 1}</span>,
+        // render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
+      },
+      {
+        title: '积分类型',
+        dataIndex: 'changeType',
+        key: 'changeType',
+        render: (_, record) => <span>{this.showChangeType(record.changeType) }</span>,
+      },
+      {
+        title: '积分变化',
+        dataIndex: 'pointsAmount',
+        key: 'pointsAmount',
+        // render: (pointsAmount, record) => { <span style={this.subPoints(pointsAmount) && {color: 'red'}}>{ pointsAmount }</span> },
+      },
+      {
+        title: '发生时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        render: (createDate, records) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title={ '当前可用积分：' + (this.state.dataSource.totalPoints  || 0 )}
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={e => this.handleCancel(e)}
+          >
+            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalIntegralRecord

src/pages/customer/customerlist/components/recommend.jsx

@@ -0,0 +1,146 @@
+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 Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 推荐客户
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalRecommendRecord extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: [],
+       visibleData: { visible: false, customerId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    // console.log('this.props.visibleData', this.props.visibleData)
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  getList(params) {
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    console.log('customerId', customerId)
+    // 网路请求
+    // 网路请求
+    request({ ...apis.customer.recommendClient, urlData: { id: customerId }, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '头像',
+        // eslint-disable-next-line jsx-a11y/alt-text
+        render: (text, records) => <img src={records.picture} width={50} height={50} />,
+      },
+      {
+        title: '用户名',
+        dataIndex: 'name',
+        key: 'name',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '性别',
+        dataIndex: 'sex',
+        key: 'sex',
+        render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
+      },
+      {
+        title: '意向项目',
+        dataIndex: 'intention',
+        key: 'intention',
+      },
+      {
+        title: '推荐时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
+      },
+      {
+        title: '状态',
+        // eslint-disable-next-line consistent-return
+        render: (text, records) => {
+          if (records.verifyStatus === 0) { return '未审核' }
+          if (records.verifyStatus === 1) {
+            if (records.reportRecommendStatus === 1) { return '报备' }
+            if (records.reportRecommendStatus === 2) { return '推荐' }
+           }
+          if (records.verifyStatus === 2) { return '审核不通过' }
+        },
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="推荐客户"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            {console.log('this.state.dataSource11111111111', this.state.dataSource.total)}
+            <Table dataSource={this.state.dataSource.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.total, pageSize: this.state.dataSource.size, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalRecommendRecord

src/pages/customer/customerlist/customerDetail.jsx

@@ -0,0 +1,217 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination, Button } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from './style.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+import router from 'umi/router';
+import Prompt from 'umi/prompt';
+
+function header(props) {
+  /**
+   * @param {*} props
+   * @returns
+   */
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{}])
+  const [tableData, setTableDataData] = useState([{}])
+  const [dataConsultant, setDataonsultant] = useState({})
+  const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+    toLoadIntention()
+  }, [])
+
+  function toLoadIntention() {
+    const arr = []
+    // 意向值
+    for (let i = 0; i < intentionData.length; i++) {
+      const a = [].concat(
+        intentionData.concat([{
+          key: i,
+          name: `Edward King ${i}`,
+          age: 32,
+          address: `London, Park Lane no. ${i}`,
+        }]),
+      )
+      arr.push(a)
+    }
+    setIntentionData(arr)
+  }
+
+  // 查询
+  const { id } = props.location.query;
+  function getById(params) {
+    if (id === '' || id === undefined) {
+      return
+    }
+    // eslint-disable-next-line max-len
+    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params, pageNumber: 1, pageSize: 10 } }).then(res => {
+      setData(res)
+      if (res.visitRecords) {
+        setTableDataData(res.visitRecords)
+      }
+      setDataonsultant(res.geoInfo)
+      setIntentionData(res.intentions)
+    })
+  }
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return
+    }
+    // eslint-disable-next-line max-len
+    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { pageNumber: number, pageSize: 10 } }).then(res => {
+      setData(res)
+      setTableDataData(res.visitRecords)
+      setDataonsultant(res.geoInfo)
+    })
+  }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'activity',
+      key: 'activity',
+      align: 'center',
+    },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'visitDuration',
+      key: 'visitDuration',
+      align: 'center',
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>,
+    },
+  ]
+  // 意向
+  const intention = [
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>项目名称</span>,
+      dataIndex: 'name',
+      width: '64%',
+      render: (_, record) => <span>{record.buildingName}</span>,
+    },
+    {
+      title: <span styles={{ color: '#222', fontSize: '24px' }}>意向值</span>,
+      dataIndex: 'address',
+      render: (_, record) => <span >{record.intention}</span>,
+    },
+  ];
+  return (
+    <>
+      <div style={{ textAlign: 'right', marginBottom:'16px'}}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+
+      <div className={styles.cardBox}>
+        <div className={styles.rightBox}>
+          <p className={styles.tit}>客户信息</p>
+          <div className={styles.flexBox}>
+            <img className={styles.touxiang} src={data.picture && data.picture} />
+            <div className={styles.right}>
+              <p className={styles.rightItem}>用户名称：{data.name}</p>
+              <p className={styles.rightItem}>手机号码：{data.phone}</p>
+              <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+            </div>
+            <div className={styles.Centered}>
+              <p>访问时长：{data.duration}秒</p>
+              <p>访问次数：{data.visitTimes}次</p>
+              <p className={styles.rightItem}>客户描述：{data.describe}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            <div className={styles.rightCentered}>
+              <p >需求类型：{data.demandType}</p>
+              <p >价格区间：{data.priceRange}</p>
+              <p >物业类型：{data.realtyManageType}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+            <div className={styles.rightInfo}>
+              <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
+              <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
+              <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
+              <p className={styles.rightItem}>来源渠道：{data.personFrom ? data.personFrom : "其他"}</p>
+              {/* <p className={styles.rightItem}>详细信息：</p> */}
+              {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
+              {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+            </div>
+          </div>
+        </div>
+      </div>
+      <br></br>
+      <div className={styles.cardBox}>
+        <div className={styles.rightBoxCentre}>
+          <p className={styles.tit}>置业顾问信息</p>
+          <div>
+            <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
+            <p >{data.consultant && data.consultant.userName}</p>
+          </div>
+          <div className={styles.rightphone}>
+            {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
+          <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
+            <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
+            <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.position}</p>
+          </div>
+          <div className={styles.left}>
+            <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+            <p className={styles.infoItem}>
+              所属项目：
+            {
+                data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+              }
+            </p>
+          </div>
+        </div>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div className={styles.leftBoxCentre}>
+          {/* <div className={styles.tit}>
+                <span>项目名称</span>
+                <span style={{ marginLeft: '50%' }}>意向值</span>
+          </div> */}
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          {/* <div className={styles.infoItem}> */}
+          <Table bordered={false} columnWidth={10} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false} width={500} />
+          {/* </div> */}
+        </div>
+
+      </div>
+      <div className={styles.recordBox}>
+        <p className={styles.tableName}>访问记录</p>
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
+      </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/customer/customerlist")
+          ? true
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/customer/customerlist/index copy.jsx

@@ -0,0 +1,786 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import router from 'umi/router';
+import withActions from '@/components/ActionList';
+import Attribution from './components/attribution'
+import AssistConsultant from './components/assistConsultant'
+import BatchAssistConsultant from './components/BatchAssistConsultant'
+import IntegralRecord from './components/integralRecord'
+import ModalRecommendRecord from './components/recommend'
+import ChangeStatus from './components/changeStatus'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import Prompt from 'umi/prompt';
+import EditIcon from '@/components/EditIcon';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataPub, setDataPub] = useState({ records: [] })
+  // 默认私客
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [customerType, setCustomerType] = useState('private')
+
+  // 调整归属 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+  // 调整归属 ============= end
+
+  // 积分记录 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
+  // 积分记录 ============= end
+
+  // 变更状态 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
+  // 变更状态 ============= end
+
+  // 推荐客户
+  const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
+
+  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 [currentSelectedRows, setSelectedRows] = useState([])
+
+  const [selectedRowKeys, setSelectedRowKeys] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // localStorage.setItem("state", JSON.stringify({ value }))
+    if (localStorage.getItem("state")) {
+      console.log(localStorage.getItem("state"), 'state')
+      if (JSON.parse(localStorage.getItem("state")) == 'private') {
+        const localStorageValue = JSON.parse(localStorage.getItem('priPageParams'))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("priPageParams")) })
+      } else {
+        setCustomerType('public')
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("pubPageParams")) })
+      }
+
+    } else {
+      localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType }))
+      getList({ pageNumber: 1, pageSize: 10, customerType })
+    }
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    if (params.startCreateDate) {
+      params.startCreateDate = moment(params.startCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (params.endCreateDate) {
+      params.endCreateDate = moment(params.endCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
+      if (params.customerType === 'private') {
+        setDataSource(res)
+      } else {
+        setDataPub(res)
+      }
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  function displayNone() {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    displayNone()
+
+    setPersonInfo([])
+    setSelectedRowKeys([])
+
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        if (values.startCreateDate) {
+          values.startCreateDate = moment(values.startCreateDate).format('YYYY-MM-DD HH:mm:ss');
+        }
+        if (values.endCreateDate) {
+          values.endCreateDate = moment(values.endCreateDate).format('YYYY-MM-DD HH:mm:ss');
+        }
+        if (customerType === 'private') {
+          localStorage.setItem("priPageParams", JSON.stringify({ customerType: 'private', ...values }))
+          getList(JSON.parse(localStorage.getItem("priPageParams")))
+        } else {
+          localStorage.setItem("pubPageParams", JSON.stringify({ customerType: 'public', ...values }))
+          getList(JSON.parse(localStorage.getItem("pubPageParams")))
+        }
+        // getList({ pageNum: 1, pageSize: 10, customerType, ...values })
+
+
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  const localStorageDate = (date) => date ? moment(date) : ''
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        localStorage.setItem("state", JSON.stringify(customerType))
+        if (customerType === 'private') {
+          localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: pageNum, pageSize: 10, customerType: 'private', ...props.form.getFieldsValue() }))
+          getList(JSON.parse(localStorage.getItem("priPageParams")))
+        } else {
+          localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: pageNum, pageSize: 10, customerType: 'public', ...props.form.getFieldsValue() }))
+          getList(JSON.parse(localStorage.getItem("pubPageParams")))
+        }
+
+
+      }
+    });
+  }
+
+  // 私客/公客切换
+  function radioButtonHandleSizeChange(e) {
+
+    displayNone()
+
+    props.form.resetFields();
+    const { value } = e.target
+    setCustomerType(value)
+    localStorage.setItem("state", JSON.stringify(value))
+    if (value === 'private') {
+      if (localStorage.getItem("priPageParams")) {
+        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList(JSON.parse(localStorage.getItem("priPageParams")))
+      } else {
+        localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
+        getList({ pageNumber: 1, pageSize: 10, customerType: value })
+      }
+
+    } else {
+
+      if (localStorage.getItem("pubPageParams")) {
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+
+        getList({ pageNumber: 1, pageSize: 10, customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
+      } else {
+        localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
+        getList({ pageNumber: 1, pageSize: 10, customerType: 'public' })
+      }
+    }
+
+    //setColumns(value === 'private' ? privateColumns : publicColumns)
+
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    if (customerType === 'private') {
+      localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'private' }));
+      getList(JSON.parse(localStorage.getItem("priPageParams")))
+    } else {
+      localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
+      getList(JSON.parse(localStorage.getItem("pubPageParams")))
+    }
+
+  }
+
+
+  // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
+  // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
+
+  function showGM(record) {
+    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant, buildingId: record.buildingId })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+  }
+
+  function showRecord(record) {
+    setRecordVisibleData({ visible: true, customerId: record.personId })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+  }
+
+  function showStatus(record) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
+    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+  }
+
+  // 推荐客户
+  function showRecommend(personId) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: true, customerId: personId })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
+  }
+
+  //分配置业顾问
+  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: '' })
+  }
+
+  function batchAssistConsultant() {
+    console.log(personInfo, 'personInfo')
+    console.log(personInfo.length)
+    if (personInfo.length <= 0) {
+      return message.info('请至少选择一条数据');
+    }
+
+    const compareSet = new Set();
+    personInfo.filter(record => {
+      compareSet.add(record.buildingName)
+    })
+
+    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 })
+  }
+
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/customerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+  // 私客详情
+  function publicCustomerDetail(record) {
+    router.push({
+      pathname: '/customer/customerlist/publicCustomerDetail',
+      query: {
+        id: record.personId,
+      },
+    });
+  }
+
+  function exportCustomer() {
+    setLoadingStatus(true)
+    const fieldsValue = getFieldsValue()
+    if (fieldsValue.startCreateDate) {
+      fieldsValue.startCreateDate = moment(fieldsValue.startCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (fieldsValue.endCreateDate) {
+      fieldsValue.endCreateDate = moment(fieldsValue.endCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, customerType } })
+      .then(response => {
+        download(response)
+        setLoadingStatus(false)
+      }).catch(error => {
+        message.err('连接超时');
+        setLoadingStatus(false)
+      })
+  }
+
+  function download(data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '客户列表.xlsx')
+    document.body.append(link)
+    link.click()
+  }
+
+  // 关闭调整归属的窗口
+  function closeAttribution() {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    if (customerType === 'private') {
+      getList(JSON.parse(localStorage.getItem('priPageParams')))
+    } else {
+      getList(JSON.parse(localStorage.getItem('pubPageParams')))
+    }
+  }
+  // 回调关闭所有弹框
+  function closeAll() {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
+    if (customerType === 'private') {
+
+      getList(JSON.parse(localStorage.getItem("priPageParams")))
+    } else {
+
+      getList(JSON.parse(localStorage.getItem("pubPageParams")))
+    }
+    // getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
+  }
+
+  const rowSelection = {
+    selectedRowKeys,
+    onChange: (selectedRowKeys, selectedRows) => {
+      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))                             // 去掉未选的数据
+
+      // setSelectedRows(newSelectedRows)
+      console.log(newSelectedRows, "33333333333333333333")
+      setPersonInfo(newSelectedRows)
+    },
+  };
+
+  const publicColumns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '10%',
+      // 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" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><Navigate onClick={() => publicCustomerDetail(record)}>{record.name || record.nickname}</Navigate></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '是否归属项目',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      width: '10%',
+      render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
+    },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '20%',
+      render: withActions((text, record) => [
+        <EditIcon color="#FF4A4A" text="查看详情" onClick={() => publicCustomerDetail(record)} />,
+        <AuthButton name="admin.customer.recommend" noRight={null}>
+          <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>
+        </AuthButton>,
+        <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+          <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+        </AuthButton>
+      ]),
+      // render: (_, record) => (
+      //   <>
+      //     {/* <AuthButton name="admin.customer.public.detail" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
+      //     </AuthButton>
+      //     &nbsp;&nbsp; */}
+      //     <AuthButton name="admin.customer.recommend" noRight={null}>
+      //       <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>
+      //     </AuthButton>
+      //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+      //       <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+      //     </AuthButton>
+      //   </>
+      // ),
+    },
+  ]
+
+  const privateColumns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '10%',
+      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toCustomerDateil(record)} 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) => <><Navigate onClick={() => toCustomerDateil(record)}>{customerType === 'private' ? record.name : record.nickname}</Navigate></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'consultantName',
+      key: 'consultantName',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <span>{record.consultantName}</span>
+          <br />
+          <span>{record.consultTel}</span>
+        </>
+      ),
+    },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认购' }
+        if (records.status === 4) { return '签约' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '20%',
+      render: withActions((text, record) => [
+        <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
+        <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+        </AuthButton>
+      ]),
+      // render: (_, record) => (
+      //   <>
+      //     <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+      //     </AuthButton>
+
+      //     {/* <AuthButton name="admin.customer.recommend.get" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
+      //     </AuthButton>
+      //       &nbsp;&nbsp; */}
+      //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+      //     </AuthButton>
+
+      //   </>
+      // ),
+    },
+  ]
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        {customerType === 'public' && <Form.Item>
+          {getFieldDecorator('belongStatus')(
+            <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
+              <Option value={1}>是</Option>
+              <Option value={0}>否</Option>
+            </Select>,
+          )}
+        </Form.Item>}
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        {customerType === 'private' && <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value={1}>报备</Option>
+              <Option value={2}>到访</Option>
+              <Option value={3}>认筹</Option>
+              <Option value={4}>签约</Option>
+            </Select>,
+          )}
+        </Form.Item>}
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+        {customerType === 'private' && <Form.Item>
+          {getFieldDecorator('consultName')(
+            <Input placeholder="置业顾问" />,
+          )}
+        </Form.Item>}
+        {customerType === 'private' && <Form.Item>
+          {getFieldDecorator('consultTel')(
+            <Input placeholder="置业顾问电话" />,
+          )}
+        </Form.Item>}
+        <Form.Item >
+          {getFieldDecorator('startCreateDate')(
+            <DatePicker placeholder="注册开始时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
+        </Form.Item>
+        <Form.Item >
+          {getFieldDecorator('endCreateDate')(
+            <DatePicker placeholder="注册结束时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('sharePersonName')(
+            <Input placeholder="推广人" />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.customer.recommend.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+              </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      {
+        customerType === 'private' ?
+          <AuthButton name="admin.customer.import" noRight={null}>
+            <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+              导出
+          </Button>
+          </AuthButton> :
+          <>
+            <AuthButton name="admin.customer.import" noRight={null}>
+              <Button type="primary" onClick={() => batchAssistConsultant()} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>
+                批量分配置业顾问
+          </Button>
+            </AuthButton>
+            <AuthButton name="admin.customer.import" noRight={null}>
+              <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+                导出
+          </Button>
+            </AuthButton>
+          </>
+      }
+
+
+      <div style={{ margin: '20px 0' }}>
+        <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+          <Radio.Button value="private">私客</Radio.Button>
+          <Radio.Button value="public">公客</Radio.Button>
+        </Radio.Group>
+      </div>
+      {customerType === 'private' ?
+        <Table
+          // onRow={record => {
+          //   return {
+          //     onClick: () => toCustomerDateil(record),
+          //   };
+          // }}
+          dataSource={dataSource.records} columns={privateColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.customerId} /> :
+        <Table rowSelection={rowSelection}
+          // onRow={record => {
+          //   return {
+          //     onClick: () => publicCustomerDetail(record),
+          //   };
+          // }}
+          dataSource={dataPub.records} columns={publicColumns} pagination={{ current: dataPub.current, total: dataPub.total, pageSize: dataPub.size, onChange }} rowKey={r => r.customerId} ></Table>
+      }
+
+      {/* 调整归属 */}
+      <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()} />
+
+      {/* 积分记录 */}
+      <IntegralRecord visibleData={recordVisibleData} onCancel={() => closeAll()} />
+
+      {/* 变更状态 */}
+      <ChangeStatus visibleData={statusVisibleData} onCancel={() => closeAll()} />
+
+      {/* 推荐客户 */}
+      <ModalRecommendRecord visibleData={recommendVisibleData} onCancel={() => closeAll()} />
+
+      {/* 分配置业顾问 */}
+      <AssistConsultant visibleData={assistVisibleData} onCancel={() => closeAll()} />
+
+      {/* 批量分配置业顾问 */}
+      <BatchAssistConsultant visibleData={batchAssistVisibleData} onCancel={() => closeAll()} />
+
+      <Prompt message={location =>
+        location.pathname.startsWith("/customer/customerlist")
+          ? true
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
+    </>
+  );
+}
+
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/customer/customerlist/index.jsx

@@ -0,0 +1,35 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import router from 'umi/router';
+import withActions from '@/components/ActionList';
+import Attribution from './components/attribution'
+import AssistConsultant from './components/assistConsultant'
+import BatchAssistConsultant from './components/BatchAssistConsultant'
+import IntegralRecord from './components/integralRecord'
+import ModalRecommendRecord from './components/recommend'
+import ChangeStatus from './components/changeStatus'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import Prompt from 'umi/prompt';
+import EditIcon from '@/components/EditIcon';
+
+
+const { Option } = Select;
+
+function customerlist(props) {
+
+
+  return (
+    <>1234
+    </>
+  );
+}
+
+
+export default customerlist

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -0,0 +1,183 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination, Button } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import publicStyle from './publicStyle.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+import router from 'umi/router';
+import Prompt from 'umi/prompt';
+
+function header(props) {
+  /**
+   * @param {*} props
+   * @returns
+   */
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{}])
+  const [tableData, setTableDataData] = useState([{}])
+  const [dataConsultant, setDataonsultant] = useState({})
+  const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+    toLoadIntention()
+  }, [])
+
+  function toLoadIntention() {
+    if (intentionData) {
+      return
+    }
+    const arr = []
+    // 意向值
+    for (let i = 0; i < intentionData.length; i++) {
+      const a = [].concat(
+        intentionData.concat([{
+          key: i,
+          name: `Edward King ${i}`,
+          age: 32,
+          address: `London, Park Lane no. ${i}`,
+        }]),
+      )
+      arr.push(a)
+    }
+    setIntentionData(arr)
+  }
+
+  // 查询
+  const { id } = props.location.query;
+  function getById(params) {
+    if (id === '' || id === undefined) {
+      return
+    }
+
+    request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { ...params } }).then(res => {
+      setTableDataData(res.visitRecords)
+      setData(res)
+      setDataonsultant(res.geoInfo)
+      setIntentionData(res.intentions)
+    })
+  }
+  // 分页
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return
+    }
+    request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { pageNumber: number, pageSize: 10 } }).then(res => {
+      setData(res)
+      setTableDataData(res.visitRecords)
+      setDataonsultant(res.geoInfo)
+    })
+  }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'activity',
+      key: 'activity',
+      align: 'center',
+    },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'visitDuration',
+      key: 'visitDuration',
+      align: 'center',
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>,
+    },
+  ]
+  // 意向
+  const intention = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      width: 200,
+      render: (_, record) => <span>{record.buildingName}</span>,
+    },
+    {
+      title: 'Address',
+      dataIndex: 'address',
+      render: (_, record) => <span style={{ marginLeft: '50%' }}>{record.intention}</span>,
+    },
+  ];
+
+  return (
+    <>
+      <div style={{ textAlign: 'right', marginBottom: '16px' }}>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+      <div className={publicStyle.cardBox}>
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.rightBox}>
+          <p className={publicStyle.tit}>客户信息</p>
+          <img className={publicStyle.touxiang} src={data.avatarurl && data.avatarurl} />
+          <div className={publicStyle.right}>
+            <p className={publicStyle.rightItem}>用户名称：{data.name === null ? data.nickname : data.name}</p>
+            <p className={publicStyle.rightItem}>手机号码：{data.phone}</p>
+            <p className={publicStyle.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+          </div>
+          <div className={publicStyle.Centered}>
+            <p>访问时长：{data.duration}秒</p>
+            <p>访问次数：{data.visitTimes}次</p>
+            <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
+            {/* <p>预约人数：{ data.visiteNum }</p> */}
+          </div>
+          {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+          <div className={publicStyle.rightInfo}>
+            <p className={publicStyle.rightItem}>国家：{data && data.country}</p>
+            <p className={publicStyle.rightItem}>省份：{data && data.province}</p>
+            <p className={publicStyle.rightItem}>城市：{data && data.city}</p>
+            {/* <p className={styles.rightItem}>详细信息：</p> */}
+            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
+            {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+          </div>
+        </div>
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.leftBoxCentre}>
+          <div className={publicStyle.tit}>
+            <span>项目名称</span>
+            <span style={{ float: 'right' }}>意向值</span>
+          </div>
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          <div className={publicStyle.infoItem}>
+            <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData.length >= 3 ? { y: 240 } : false} />
+          </div>
+        </div>
+      </div>
+      <div className={publicStyle.recordBox}>
+        <p className={publicStyle.tableName}>访问记录</p>
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+      </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/customer/customerlist")
+          ? true
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/customer/customerlist/publicStyle.less

@@ -0,0 +1,209 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.displayS {
+  display: none;
+}
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:90%;
+    min-width:28.5%;
+    height:315px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:865px;
+    min-width:342px;
+    height:290px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    height:315px;
+    min-width: 70%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .rightBoxCentre{
+    width:865px;
+    height:315px;
+    min-width: 60%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .leftBoxCentre{
+    width:100%;
+    height:315px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:0.15rem;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .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{
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .left{
+    position: absolute;
+    top:108px;
+    left:60%;
+  }
+  .rightInfo{
+    position: absolute;
+    top:108px;
+    left:80%;
+  }
+
+  .Centered{
+    position: absolute;
+    top:108px;
+    left:50%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 0.1rem;
+  }
+
+  .rightCentered{
+    position: absolute;
+    top:108px;
+    left:55%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 0.1rem;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

src/pages/customer/customerlist/style.css

@@ -0,0 +1,69 @@
+.SubmitButton {
+  background: #ef273a;
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: #ef273a;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size:  0.106rem;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size:  0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.pitchButton {
+  border-color: #ff7e48;
+  background-color: #ff7e48;
+  color: #ffffff;
+}
+.noButton {
+  border-color: #ff7e48;
+  color: #ff7e48;
+}
+.displayS {
+  display: none;
+}

src/pages/customer/customerlist/style.less

@@ -0,0 +1,239 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.displayS {
+  display: none;
+}
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:1000px;
+    min-width:350px;
+    height:1000px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:865px;
+    min-width:342px;
+    height:290px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    height:315px;
+    min-width: 100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .rightBoxCentre{
+    width:865px;
+    height:345px;
+    min-width: 60%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .leftBoxCentre{
+    width:100%;
+    height:345px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:0.15rem;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .flexBox{
+    display: flex;
+    align-items: end;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .touxiangphoto{
+    width: 80px;
+    height: 80px;
+    margin: 38px 0 0px 0;
+  }
+  .infoItem{
+    color:#666;
+    font-size: 0.1rem;
+    margin: 0 0 30px 0;
+    
+  }
+  .rightItem{
+    color:#666;
+    font-size: 0.1rem;
+    margin: 0 0 15px 0;
+  }
+  .right{
+    width: 25%;
+    min-width: 1.3rem;
+    margin-left: 0.1rem;
+    padding-top: 0.3rem;
+    // position: absolute;
+    // top:108px;
+    // left:170px;
+  }
+  .rightphone{
+  
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .left{
+    position: absolute;
+    top:108px;
+    left:60%;
+  
+  }
+  .rightInfo{
+    width: 25%;
+    min-width: 1.3rem;
+    margin-right: 0.1rem;
+    padding-top: 0.3rem;
+    // position: absolute;
+    // top:108px;
+    // left:80%;
+  }
+
+  .Centered{
+    width: 25%;
+    // position: absolute;
+    // top:108px;
+    // left:30%;
+    min-width: 1.3rem;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 0.1rem;
+    padding-top: 0.3rem;
+  }
+
+  .rightCentered{
+    // position: absolute;
+    // top:108px;
+    // left:55%;
+    width: 25%;
+    min-width: 1.3rem;
+    margin: 0 0 15px 0;
+    padding-top: 0.3rem;
+    color:#666;
+    font-size: 0.1rem;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

src/pages/customer/customerlist/style.wxss

@@ -0,0 +1,69 @@
+.SubmitButton {
+  background: #ef273a;
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: #ef273a;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size:  0.106rem;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size:  0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.pitchButton {
+  border-color: #ff7e48;
+  background-color: #ff7e48;
+  color: #ffffff;
+}
+.noButton {
+  border-color: #ff7e48;
+  color: #ff7e48;
+}
+.displayS {
+  display: none;
+}

src/pages/customer/drift/index.jsx

@@ -0,0 +1,115 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Avatar, Alert, Select, Button } from 'antd';
+
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less'
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+
+function costomerDrift(props) {
+  const { getFieldDecorator } = props.form
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSources, setDataSources] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+   getList({ pageNumber: '1', pageSize: '10' })
+  }, [])
+
+  function getList(params) {
+    request({ ...apis.customer.drift, params: { ...params } }).then(res => {
+      setDataSources(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line no-console
+    console.log('Page: ', pageNum);
+    getList({ pageNumber: pageNum, pageSize: 10 })
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: '1', pageSize: '10' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'avatarurl',
+      key: 'avatarurl',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
+    },
+    {
+      title: '用户来源',
+      dataIndex: 'sceneAlias',
+      key: 'sceneAlias',
+      render: (_, record) => <><span>{ record.sceneAlias ? record.sceneAlias : '其他'}</span></>,
+    },
+  ];
+  
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+            {/* <AuthButton name="admin.customer.recommend.search" noRight={null}> */}
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+            {/* </AuthButton> */}
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table style={{marginTop:'10px'}} dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    </>
+    // eslint-disable-next-line max-len
+    
+  )
+}
+
+const WrappedBody = Form.create()(costomerDrift);
+export default WrappedBody

src/pages/customer/drift/style.less

@@ -0,0 +1,58 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+

src/pages/customer/visiting/index.jsx

@@ -0,0 +1,173 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+
+const columns = [
+  {
+    title: '头像',
+    dataIndex: 'picture',
+    key: 'picture',
+    align: 'center',
+    width: '15%',
+    render: (_, record) => <Avatar shape="square"  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%',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '置业顾问',
+    dataIndex: 'asdf',
+    key: 'asdf',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '置业顾问电话',
+    dataIndex: 'tel',
+    key: 'tel',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '到访时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+    width: '15%',
+  },
+]
+
+const data = [
+
+]
+
+function onChangetime(dates, dateStrings) {
+ 
+  // setEndDate(dateStrings[1])
+  // setStartDate(dateStrings[0])
+  
+}
+
+function exportReport() {
+  // request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+  //   .then(response => {
+  //     download(response)
+  //   })
+}
+
+
+
+
+
+
+
+function body (props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
+  const { RangePicker } = DatePicker;
+
+  function handleReset() {
+    props.form.resetFields();
+    // getList({ pageNumber: 1, pageSize: 10, customerType })
+  }
+
+  function handleSubmit(e) {
+ 
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 5, ...values })
+      }
+    });
+    // getList({ pageNumber: pageNum, pageSize: 9 })
+  }
+
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+       <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+       
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+        
+         <Form.Item label="到访时间">
+          { getFieldDecorator('time')(
+            <RangePicker
+            style={{ width: '400px' }}
+            // placeholder="到访时间"
+            // ranges={{
+            //   Today: [moment(), moment()],
+            //   'This Month': [moment().startOf('month'), moment().endOf('month')],
+            // }}
+            // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+            showTime
+            onChange={onChangetime}
+          />
+          )}
+        </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+
+      <Table dataSource={data} columns={columns} pagination={{ total: data.total, onChange }} />
+      {/* pagination={{ total: dataSource.total, onChange }} */}
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/customer/visiting/style.less

@@ -0,0 +1,151 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.displayS {
+  display: none;
+}
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:342px;
+    min-width:342px;
+    height:511px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    height:511px;
+    min-width: 800px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .infoItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 10px 0;
+    
+  }
+  .rightItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 15px 0;
+  }
+  .right{
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .rightInfo{
+    position: absolute;
+    top:50px;
+    left:50%;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

src/utils/mixStr copy.js

@@ -0,0 +1,31 @@
+
+const fill2Len = (str, len) => {
+  if (!str) {
+    return '*'.repeat(len)
+  }
+
+  const orginLen = str.length
+  if (len <= orginLen) {
+    return str.substr(0, len)
+  }
+
+  return str.repeat(Math.floor(len / orginLen)) + str.substr(0, len % orginLen)
+}
+
+const mixChars = window.navigator.userAgent // + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
+
+const strXOR = (str, mix) => {
+  if (!str) return str
+
+  const strLen = str.length
+  const mixStr = fill2Len(mix, strLen)
+
+  const result = []
+  for (let i = 0; i < strLen; i ++) {
+    result.push(String.fromCharCode(str.charCodeAt(i) ^ mixStr.charCodeAt(i)))
+  }
+
+  return result.join('')
+}
+
+export default str => strXOR(str, mixChars)

src/utils/upload.js

@@ -0,0 +1,39 @@
+import { fetch, apis } from './request';
+// import mixStr from './mixStr';
+
+// const getToken = () => mixStr(window.localStorage.getItem('test-foobar'))
+
+const uploadImage = fetch(apis.image.upload)
+
+const uploaderProps = {
+  name: 'file',
+  // action: apis.image.uploadForAnt.url,
+  accept: '.png, .jpg, .jpeg, .gif',
+  // headers: {
+  //   Authorization: `Bearer ${getToken()}`
+  // },
+  customRequest({
+    // action,
+    file,
+    // headers,
+    onError,
+    // onProgress,
+    onSuccess,
+    // withCredentials,
+  }) {
+    const data = new FormData()
+    data.append('file', file)
+
+    uploadImage({ data }).then((img) => {
+      onSuccess(img, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
+}
+
+export { uploaderProps }