fix

package.json

     "omit.js": "^1.0.2",
     "package.json": "^2.0.1",
     "path-to-regexp": "2.4.0",
+    "pinyin": "^2.10.2",
     "qs": "^6.9.0",
     "react": "^16.8.6",
     "react-copy-to-clipboard": "^5.0.1",

src/components/Poster/Form.jsx

           rules: [{ required: true, message: '请楼盘海报图' }],
       })(<ImageUpload onChange={handleImageChange} />)}
       </Form.Item>
-      <Form.Item label="海报标题">
+      {/* <Form.Item label="海报标题">
       {getFieldDecorator('posterTitle')(<Input />)}
       </Form.Item>
       <Form.Item label="海报描述">
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
         <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
-      </Form.Item>
+       {/* </Form.Item> */}
     </Form>
   )
 }

src/pages/activity/SignupActivity/detail.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Tabs, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
 
 import apis from '@/services/apis';
 import moment from 'moment';
 import Share from '@/components/Share';
 import Poster from '@/components/Poster';
 
-const { TabPane } = Tabs
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
 
 const formItemLayout = {
-  labelCol: { span: 4 },
-  wrapperCol: { span: 18 },
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
 };
 
 const cancelPage = () => {
   const { getFieldDecorator } = props.form;
   return (
     <>
-      <Form {...formItemLayout} onSubmit={handleSubmit} style={{maxWidth: '1000px'}}>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
           {getFieldDecorator('buildingId', {
             initialValue: detailData.buildingId,
             ],
           })(<BuildSelect disabled />)}
         </Form.Item>
-        <Form.Item label="活动封面图">
+        <Form.Item label="活动封面图1">
           <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
         </Form.Item>
         {/* <Form.Item label="活动封面图2">
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
         </Form.Item>
-        <Form.Item label="副标题">
+        {/* <Form.Item label="副标题">
           <span>{detailData.halfTitle}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动时间">
           <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
             detailData.endDate,
         <Form.Item label="活动人数">
           <span>{detailData.personNum}</span>
         </Form.Item>
-        <Form.Item label="阅读量">
+        {/* <Form.Item label="阅读量">
           <span>{detailData.pvNum}</span>
         </Form.Item>
         <Form.Item label="转发量">
         </Form.Item>
         <Form.Item label="最大报名人数">
           <span>{detailData.maxEnlistByPerson}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情">
           <div
             style={{ maxHeight: '500px', overflowY: 'auto' }}
             </span>
           )}
         </AuthButton>
-        {/* <AuthButton name="admin.dymic.qrcode" noRight={null}>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
             <span
               style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
               {<Button>下载二维码</Button>}
             </span>
           )}
-        </AuthButton> */}
+        </AuthButton>
         <Button onClick={() => cancelPage()}>取消</Button>
       </div>
     </>
  * @returns
  */
 const Edit = props => {
+  const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
   const [detailData, setDetailData] = useState(false);
 
   }, []);
 
   const target = { id: dynamicId, type: 'activity' };
-
   return (
     <Card>
-      <Tabs defaultActiveKey="1">
-        <TabPane tab="基础信息" key="1">
-          <Basic dynamicId={dynamicId} detailData={detailData} />
-        </TabPane>
-        {/* <TabPane tab="海报图片" key="2">
-          <Poster target={target} />
-        </TabPane>
-        <TabPane tab="分享设置" key="3">
-          <Share target={target} />
-        </TabPane> */}
-      </Tabs>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          {/* <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button> */}
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
+
+        {tab === 'poster' && <Poster target={target} />}
+        {tab === 'share' && <Share target={target} />}
+      </div>
+      {/* <div style={{ textAlign: 'center' }}>
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              onClick={getSignList.bind(this, detailData.dynamicId)}
+            >
+              <Button>报名记录</Button>
+            </span>
+          )}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              onClick={newQrcode.bind(this, detailData)}
+            >
+              {<Button>下载二维码</Button>}
+            </span>
+          )}
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>取消</Button>
+      </div> */}
     </Card>
   );
 };

src/pages/activity/SignupActivity/registrationRecord.jsx

 
       <div style={{ textAlign: 'right', margin: '6px 0 10px 0' }}>
         {' '}
-        <Button
+        {/* <Button
           name="admin.activityDynamicEnlist.export.get"
           noRight={null}
           type="primary"
           onClick={exportHelp}
         >
           导出
-        </Button>
+        </Button> */}
       </div>
       <Table
         dataSource={data.list.data}

src/pages/activity/groupRoomActivity/detail.jsx

         <Form.Item label="活动封面图1">
           <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
         </Form.Item>
-        <Form.Item label="活动封面图2">
+        {/* <Form.Item label="活动封面图2">
           <img src={getImgURL(detailData.bannerListImg)} height="125px" width="375px" />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情主图">
           <img src={getImgURL(detailData.imgUrl)} height="300px" width="375px" />
         </Form.Item>
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
         </Form.Item>
-        <Form.Item label="副标题">
+        {/* <Form.Item label="副标题">
           <span>{detailData.halfTitle}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动时间">
           <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
             detailData.endDate,
         <Form.Item label="活动人数">
           <span>{detailData.personNum}</span>
         </Form.Item>
-        <Form.Item label="阅读量">
+        <Form.Item label="团房价">
+          <span>{detailData.groupBuyPrice}</span>
+        </Form.Item>
+        {/* <Form.Item label="阅读量">
           <span>{detailData.pvNum}</span>
         </Form.Item>
         <Form.Item label="转发量">
         </Form.Item>
         <Form.Item label="最大报名人数">
           <span>{detailData.maxEnlistByPerson}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情">
           <div
             style={{ maxHeight: '500px', overflowY: 'auto' }}

src/pages/activity/groupRoomActivity/registrationRecord.jsx

           导出
         </Button>
       </div>
-      <Table
+      {/* <Table
         dataSource={data.list.data}
         columns={columns}
         pagination={{ total: data.total, onChange: changePageNum }}
         loading={loading}
         rowKey="activity"
-      />
+      /> */}
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div> */}

src/pages/activity/lookHouseActivity/detail.jsx

         <Form.Item label="活动封面图1">
           <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
         </Form.Item>
-        <Form.Item label="活动封面图2">
+        {/* <Form.Item label="活动封面图2">
           <img src={getImgURL(detailData.bannerListImg)} height="125px" width="375px" />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情主图">
           <img src={getImgURL(detailData.imgUrl)} height="300px" width="375px" />
         </Form.Item>
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
         </Form.Item>
-        <Form.Item label="副标题">
+        {/* <Form.Item label="副标题">
           <span>{detailData.halfTitle}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动时间">
           <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
             detailData.endDate,
         <Form.Item label="活动人数">
           <span>{detailData.personNum}</span>
         </Form.Item>
-        <Form.Item label="阅读量">
+        {/* <Form.Item label="阅读量">
           <span>{detailData.pvNum}</span>
         </Form.Item>
         <Form.Item label="转发量">
         </Form.Item>
         <Form.Item label="最大报名人数">
           <span>{detailData.maxEnlistByPerson}</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情">
           <div
             style={{ maxHeight: '500px', overflowY: 'auto' }}

src/pages/activity/lookHouseActivity/registrationRecord.jsx

 
       <div style={{ textAlign: 'right', margin: '6px 0 10px 0' }}>
         {' '}
-        <Button
+        {/* <Button
           name="admin.activityDynamicEnlist.export.get"
           noRight={null}
           type="primary"
           onClick={exportHelp}
         >
           导出
-        </Button>
+        </Button> */}
       </div>
       <Table
         dataSource={data.list.data}

src/pages/building/Developers/Edit.jsx

 import React, { useState, useEffect } from 'react';
-import { Input, Button, Card, Form,  notification,message } from 'antd';
+import { Input, Button, Card, Form, notification, message } 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';
 import { fetch } from '@/utils/request';
-
-
-  const formItemLayout = {
-    labelCol: {
-      xs: { span: 24 },
-      sm: { span: 8 },
+import pinyin from 'pinyin';
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
     },
-    wrapperCol: {
-      xs: { span: 24 },
-      sm: { span: 16 },
-    },
-  };
-  const tailFormItemLayout = {
-    wrapperCol: {
-      xs: {
-        span: 24,
-        offset: 0,
-      },
-      sm: {
-        span: 16,
-        offset: 8,
-      },
+    sm: {
+      span: 16,
+      offset: 8,
     },
-  };
+  },
+};
 
 function Edit(props) {
-  const { getFieldDecorator } = props.form;
+  const { getFieldDecorator, getFieldValue, setFieldsValue } = props.form;
   const { form, history } = props;
   const updateBrandData = fetch(apis.brand.alterBrand);
-  const saveBrandData=fetch(apis.brand.addBrand);
+  const saveBrandData = fetch(apis.brand.addBrand);
   const goBack = () => router.goBack(-1);
-  const {validateFields}=form;
-
+  const { validateFields } = form;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   let data = {};
   const { brandId } = props.location.query;
 
-
-  useEffect(()=>{
+  useEffect(() => {
+    console.log(
+      pinyin('地点', {
+        style: pinyin.STYLE_FIRST_LETTER,
+        heteronym: true,
+      })[0][0],'1111111111111111'
+    );
     if (brandId) {
-      getById({brandId})
+      getById({ brandId });
     }
-  },[brandId])
+  }, [brandId]);
 
-
-//增+改
+  //增+改
   function handleSubmit(e) {
     e.preventDefault();
     validateFields((err, values) => {
           data: {
             ...values,
           },
-          urlData: { id: brandId }
-        }).then(() => {
-          // setLoading(false);
-          message.success('数据更新成功');
-          goBack()
-        }).catch((err) => {
-          // setLoading(false);//loading消失
-          message.error(err.message || err);
+          urlData: { id: brandId },
         })
+          .then(() => {
+            // setLoading(false);
+            message.success('数据更新成功');
+            goBack();
+          })
+          .catch(err => {
+            // setLoading(false);//loading消失
+            message.error(err.message || err);
+          });
       } else {
-        saveBrandData({ data: values }).then(() => {
-          // setLoading(false);
-          message.success('数据保存成功');
-          goBack()
-        }).catch((err) => {
-          // setLoading(false);//loading消失
-          message.error(err.message || err);
-        })
+        saveBrandData({ data: values })
+          .then(() => {
+            // setLoading(false);
+            message.success('数据保存成功');
+            goBack();
+          })
+          .catch(err => {
+            // setLoading(false);//loading消失
+            message.error(err.message || err);
+          });
       }
     });
-
-
-
   }
   // 获取详情信息
   function getById(res) {
     });
   };
 
-
-//修改
+  //修改
   // function submitData(dataSources) {
   //   if (id !== '') {
   //     // 修改
   return (
     <Card>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
-      <Form.Item label="开发商名称">
+        <Form.Item label="开发商名称">
           {getFieldDecorator('brandName', {
             rules: [
               {
                 message: '请输入开发商名称!',
               },
             ],
-          })(<Input style={{width:200}}/>)}
+          })(
+            <Input
+              onChange={e =>{
+              //   console.log(e,'333333333')
+              // const item =  
+              //   console.log(item,'333333333')
+              if(!e.target.value) return
+                setFieldsValue({
+                  indexLetter: pinyin(e.target.value, {
+                    style: pinyin.STYLE_FIRST_LETTER,
+                    heteronym: true,
+                  })[0][0]
+                })
+              }
+                
+              }
+              style={{ width: 200 }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="开发商索引">
           {getFieldDecorator('indexLetter', {
+            // value={}
             rules: [{ required: true, message: '请输入开发商索引' }],
-          })(<Input style={{width:200}}/>)}
+          })(<Input style={{ width: 200 }}  disabled/>)}
         </Form.Item>
         <Form.Item label="品牌logo">
           {getFieldDecorator('brandLogo', {
             rules: [{ required: true, message: '请上传品牌logo' }],
-        })(<ImageUploader />)}
+          })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item label="品牌宣传图" help="建议尺寸：750*750，比例1:1" >
-          {getFieldDecorator('brandImg', { 
+        <Form.Item label="品牌宣传图" help="建议尺寸：750*750，比例1:1">
+          {getFieldDecorator('brandImg', {
             rules: [{ required: true, message: '请上传品牌宣传图' }],
-        })(<ImageUploader />)}
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="开发商简介">
           {getFieldDecorator('brandRemark', {
             rules: [{ required: true, message: '请输入开发商简介' }],
-          })(<Input.TextArea style={{width:400}} placeholder="120字内的简介"/>)}
+          })(<Input.TextArea style={{ width: 400 }} placeholder="120字内的简介" />)}
         </Form.Item>
-       
-        <Form.Item  {...tailFormItemLayout} style={{ display: 'flex', justifyContent: 'space-between' }}>
+
+        <Form.Item
+          {...tailFormItemLayout}
+          style={{ display: 'flex', justifyContent: 'space-between' }}
+        >
           <Button type="primary" htmlType="submit" style={{ margin: '0' }}>
             确定
           </Button>

src/pages/carouselFigure/customImg/edit.jsx

 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
-let activityVisible = true;
 let helpTips = '';
 
-const setExtraData = data => {
-  activityVisible = data.imgType === 'index';
-};
 
-const handleFormValueChange = (props, changedValues, allValues) => {
-  setExtraData(allValues);
-};
+// const handleFormValueChange = (props, changedValues, allValues) => {
+//   setExtraData(allValues);
+// };
 
-const XForm = createForm({ onValuesChange: handleFormValueChange });
+const XForm = createForm();
 
 const header = props => {
   const {
   const imgId = props.location.query.imgId;
   const imgType = props.location.query.imgType;
 
-  const [data, setData] = useState(
-    imgType === 'index'
-      ? {
-          imgUrl:
-            'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
-          imgType: 'index',
-          imgDesc: '小程序首页分享配图',
-          imgDocument: currentUser.orgName + ' 精准获客平台',
-        }
-      : {
-          imgUrl: 'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
-          imgType: 'indexNews',
-        },
+  const [data, setData] = useState({}
+    // imgType === 'index'
+    //   ? {
+    //       imgUrl:
+    //         'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    //       imgType: 'index',
+    //       imgDesc: '小程序首页分享配图',
+    //       imgDocument: currentUser.orgName + ' 精准获客平台',
+    //     }
+    //   : {
+    //       imgUrl: 'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
+    //       imgType: 'indexNews',
+    //     },
   );
 
   if (imgId) {
     // 查询列表
     const getData = imgId => {
       request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: imgId } }).then(data => {
-        console.log(data);
-        if (data.imgType === 'index') {
-          activityVisible = true;
-          helpTips = '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享';
-        } else {
-          activityVisible = false;
-          helpTips = '建议尺寸：80*80px，比例1:1，格式：jpg，用于：首页资讯logo';
-        }
+
         setData(data);
       });
     };
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: data.imgUrl,
-      help: helpTips,
+      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
       rules: [{ required: true, message: '请选择图片' }],
     },
     {
   };
 
   const cancelPage = () => {
-    router.push({
-      pathname: '/carouselFigure/customImg/list',
-    });
+    router.go('-1')
   };
 
   return (

src/pages/carouselFigure/editAdvertising.jsx

       if (!isHaveActive && !val.targetId) {
         val.contentType = '';
       }
+      val.showPosition='index'
       if (contentId) {
         request({
           ...apis.carsuseFigure.updataExtendContent,

src/pages/channel/Channel/List/index.jsx

     });
   }
 
+ const  onDelete =()=> {
+
+ }
+
   const searchFields = [
     {
       name: 'channelId',
       key: 'recommendCount',
       align: 'center',
     },
+    // {
+    //   title: '邀请经纪人',
+    //   dataIndex: 'customerNum',
+    //   key: 'customerNum',
+    //   align: 'center',
+    // },
     {
-      title: '邀请经纪人',
-      dataIndex: 'customerNum',
-      key: 'customerNum',
+      title: '操作',
+      dataIndex: 'edit',
+      key: 'edit',
       align: 'center',
+      render: (text, record) =>  <Button type='link' onClick={onDelete}>删除</Button>
+
+
     },
   ];
 

src/pages/channel/independentList/index.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification, Modal } from 'antd';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  notification,
+  Modal,
+  message,
+} from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
     this.state = {
       dataSource: { records: [] },
       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
-    }
+    };
   }
 
   // 挂载之后
   componentDidMount() {
-    this.getList({ pageNumber: 1, pageSize: 5 })
+    this.getList({ pageNumber: 1, pageSize: 5 });
   }
 
   componentDidUpdate(preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.getList({ pageNumber: 1, pageSize: 5 });
       this.setState({ visibleData: this.props.visibleData });
     }
   }
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } });
   }
 
   // 弹框取消按钮
   handleCancel() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
-    this.props.onCancel()
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } });
+    this.props.onCancel();
   }
 
   getList(params) {
     // eslint-disable-next-line no-console
-    console.log('this.state.visibleData', this.state.visibleData)
-    const { customerId } = this.state.visibleData
+    console.log('this.state.visibleData', this.state.visibleData);
+    const { customerId } = this.state.visibleData;
     if (customerId === '' || customerId === undefined) {
-      return
+      return;
     }
     // 网路请求
     // 网路请求
-    request({ ...apis.customer.recommend, urlData: { id: customerId }, params: { ...params } }).then(res => {
-      this.setState({ dataSource: res })
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
+    request({ ...apis.customer.recommend, urlData: { id: customerId }, params: { ...params } })
+      .then(res => {
+        this.setState({ dataSource: res });
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        <Alert
+          style={{
+            marginBottom: 24,
+          }}
+          message={err}
+          type="error"
+          showIcon
+        />;
+      });
   }
 
   // 分页
   onChange(pageNum) {
-
-    this.getList({ pageNumber: pageNum, pageSize: 5, })
-
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
   }
 
   render() {
       {
         title: '头像',
         // eslint-disable-next-line jsx-a11y/alt-text
-        render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+        render: (text, record) => (
+          <Avatar shape="square" src={record.picture} size={64} icon="user" />
+        ),
         // render: (text, records) => <img src={records.picture} width={50} height={50} />,
       },
       {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+        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) => {
-          console.log("retrun", records)
+          console.log('retrun', records);
           //     if (records.status === 1) { return '报备' }
           // if (records.status === 2) { return '推荐' }
           // if (records.status === 3) { return '认购' }
           // if (records.verifyStatus === 2) { return '审核同意' }
           // if (records.verifyStatus === 3) { return '签约' }
           if (records.status === 1) {
-            if (records.verifyStatus === 0) { return '待审核' }
-            if (records.verifyStatus === 1) { return '报备' }
+            if (records.verifyStatus === 0) {
+              return '待审核';
+            }
+            if (records.verifyStatus === 1) {
+              return '报备';
+            }
             // if (records.reportRecommendStatus === 1) { return '报备' }
             // if (records.reportRecommendStatus === 2) { return '推荐' }}
-            if (records.verifyStatus === 2) { return '审核驳回' }
-           }
-          if (records.status === 2) { return '到访' }
-          if (records.status === 3) { return '认购' }
-          if (records.status === 4) { return '签约' }
+            if (records.verifyStatus === 2) {
+              return '审核驳回';
+            }
+          }
+          if (records.status === 2) {
+            return '到访';
+          }
+          if (records.status === 3) {
+            return '认购';
+          }
+          if (records.status === 4) {
+            return '签约';
+          }
           // reportRecommendStatus
         },
       },
-    ]
+    ];
     return (
       <>
         <Modal
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
-          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ current: this.state.dataSource.current, pageSize: this.state.dataSource.size, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table
+            rowKey="independentList"
+            dataSource={this.state.dataSource.records}
+            columns={columns}
+            pagination={{
+              current: this.state.dataSource.current,
+              pageSize: this.state.dataSource.size,
+              total: this.state.dataSource.total,
+              onChange: e => this.onChange(e),
+            }}
+          />
         </Modal>
       </>
     );
     this.state = {
       dataSource: { records: [] },
       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
-    }
+    };
   }
 
   // 挂载之后
-  componentDidMount() {
-
-  }
+  componentDidMount() {}
 
   componentDidUpdate(preProps, preState) {
-    const { customerId } = this.props.visibleData
+    const { customerId } = this.props.visibleData;
 
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
+      this.getList({ id: customerId, pageNumber: 1, pageSize: 5 });
       this.setState({ visibleData: this.props.visibleData });
     }
   }
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk() {
-    this.setState({ dataSource: { records: [] } })
-    this.props.onCancel()
+    this.setState({ dataSource: { records: [] } });
+    this.props.onCancel();
   }
 
   // 弹框取消按钮
   handleCancel() {
-    console.log('345')
-    this.setState({ dataSource: { records: [] } })
-    this.props.onCancel()
+    console.log('345');
+    this.setState({ dataSource: { records: [] } });
+    this.props.onCancel();
   }
 
   getList(params) {
-    const { id } = params
-    console.log(id)
+    const { id } = params;
+    console.log(id);
     if (id === '' || id === undefined) {
-      return
+      return;
     }
-    request({ ...apis.customer.InviteClientsList, params: { ...params } }).then(res => {
-      this.setState({ dataSource: res })
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-
-    })
+    request({ ...apis.customer.InviteClientsList, params: { ...params } })
+      .then(res => {
+        this.setState({ dataSource: res });
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+      });
   }
 
   // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5 })
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
   }
 
   render() {
         dataIndex: 'nickname',
         key: 'nickname',
         align: 'center',
-        render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
+        render: row => (
+          <>
+            <span>
+              {console.log(row, 'row')}
+              {row.name || row.nickname}
+            </span>
+          </>
+        ),
       },
       {
         title: '电话',
         align: 'center',
         render: (text, list) => <span>{list.sex === 1 ? '男' : '女'}</span>,
       },
-    ]
+    ];
     return (
       <>
         <Modal
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
-          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table
+            rowKey="independent"
+            dataSource={this.state.dataSource.records}
+            columns={columns}
+            pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }}
+          />
         </Modal>
       </>
     );
  * @returns
  */
 function body(props) {
-  const { getFieldDecorator, getFieldsValue } = props.form
+  const { getFieldDecorator, getFieldsValue } = props.form;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
+  const [dataSource, setDataSource] = useState({ records: [] });
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10 })
-  }, [])
-
+    getList({ pageNumber: 1, pageSize: 10 });
+  }, []);
 
   function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
-      description:
-        '',
+      description: '',
     });
   }
 
   function getList(params) {
     // 网路请求
-    request({ ...apis.customer.agents, params: { ...params } }).then(res => {
-      setDataSource(res)
-    }).catch(err => {
-      openNotificationWithIcon('error', err)
-    })
+    request({ ...apis.customer.agents, params: { ...params } })
+      .then(res => {
+        setDataSource(res);
+      })
+      .catch(err => {
+        openNotificationWithIcon('error', err);
+      });
   }
 
   // 提交事件
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        getList({ pageNum: 1, pageSize: 10, ...values })
+        getList({ pageNum: 1, pageSize: 10, ...values });
       }
     });
   }
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gVisibleData, setGVisibleData] = useState({
+    visible: false,
+    customerId: '',
+    realtyConsultant: '',
+  });
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gInviteData, setGInviteData] = useState({
+    visible: false,
+    customerId: '',
+    realtyConsultant: '',
+  });
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
-    console.log(e)
+    console.log(e);
   }
   function gM(row) {
-    setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+    setGVisibleData({
+      visible: true,
+      customerId: row.personId,
+      realtyConsultant: row.realtyConsultant,
+    });
 
-    setGInviteData({ visible: false })
+    setGInviteData({ visible: false });
   }
 
   function Invite(row) {
-    setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+    setGInviteData({
+      visible: true,
+      customerId: row.personId,
+      realtyConsultant: row.realtyConsultant,
+    });
 
-    setGVisibleData({ visible: false })
+    setGVisibleData({ visible: false });
   }
 
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10 })
+    getList({ pageNum: pageNum, pageSize: 10 });
   }
 
   /**
-    * 重置搜索
-    */
+   * 重置搜索
+   */
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10 })
+    getList({ pageNumber: 1, pageSize: 10 });
   }
 
   function toAudit(cuurentId) {
       query: {
         id: cuurentId,
       },
-    })
+    });
   }
 
   function exportIndependen() {
-    const fieldsValue = getFieldsValue()
-    console.log('fieldsValue', fieldsValue)
-    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob', params: { ...fieldsValue } })
+    const fieldsValue = getFieldsValue();
+    console.log('fieldsValue', fieldsValue);
+    request({
+      ...apis.customer.customerRecommendAgentsExport,
+      responseType: 'blob',
+      params: { ...fieldsValue },
+    })
       .then(response => {
-        download(response)
-      }).catch(error => {
-
+        download(response);
+      })
+      .catch(error => {});
+  }
+  function onDelete(row) {
+    const fieldsValue = getFieldsValue();
+    request({ ...apis.customer.deleteChannelPerson, urlData: { id: row.personId } })
+      .then(response => {
+        message.info('删除成功');
+        getList({ pageNum: pageNum, pageSize: 10, ...fieldsValue });
       })
+      .catch(error => {});
   }
 
   function download(data) {
     if (!data) {
-      return
+      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()
+    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();
   }
 
   const columns = [
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
-      render: (_, record) => <><span>{record.name || record.nickname}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.name || record.nickname}</span>
+        </>
+      ),
     },
     {
       title: '电话',
       dataIndex: 'gender',
       key: 'gender',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span>
+        </>
+      ),
     },
     {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{record.personType === 'channel agent' ? '专业经纪人' : '专业经纪人'}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.personType === 'channel agent' ? '专业经纪人' : '专业经纪人'}</span>
+        </>
+      ),
     },
     {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
-      render: (_, record) => <><span>{record.channelName}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.channelName}</span>
+        </>
+      ),
     },
     {
       title: '操作',
                 <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
               </AuthButton> */}
               {/* &nbsp;&nbsp;&nbsp;&nbsp; */}
-              <AuthButton name="admin.customer.recommend.id.get" noRight={null}>
-                <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
-              </AuthButton>
+              {/* <AuthButton name="admin.customer.recommend.id.get" noRight={null}> */}
+              <Button type="link" onClick={() => gM(record)}>
+                推荐客户
+              </Button>
+              {/* </AuthButton> */}
+              {/* <AuthButton name="admin.customer.recommend.id.get" noRight={null}> */}
+              <Button type="link" onClick={() => onDelete(record)}>
+                删除
+              </Button>
+              {/* </AuthButton> */}
             </>
           }
         </>
       ),
     },
-  ]
+  ];
 
   // <div>
   //         <span className={channels.selectName}>渠道名称</span>
 
   return (
     <Card>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
+      <Form
+        layout="inline"
+        onSubmit={e => handleSubmit(e, props)}
+        style={{ display: 'flex', alignItems: 'center' }}
+      >
         <Form.Item>
           {getFieldDecorator('channelId')(
-            <ChannelSelect />
+            <ChannelSelect />,
             //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
             //   <option value="">全部</option>
             //   {data.channelNmae.map(Item =>
             />,
           )}
         </Form.Item>
-        <Form.Item style={{ position: 'absolute', right: '38px' }} >
+        <Form.Item style={{ position: 'absolute', right: '38px' }}>
           <AuthButton name="admin.major.search" noRight={null}>
-            <Button type="primary" htmlType="submit" >
+            <Button type="primary" htmlType="submit">
               搜索
             </Button>
           </AuthButton>
         </Form.Item>
       </Form>
       <AuthButton name="admin.major.import" noRight={null}>
-        <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        <Button
+          type="primary"
+          onClick={() => exportIndependen()}
+          style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
+        >
           导出
         </Button>
       </AuthButton>
-      <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table
+        rowKey="personId"
+        dataSource={dataSource.records}
+        columns={columns}
+        pagination={{ total: dataSource.total, onChange }}
+      />
       {/* 推荐客户 */}
-      <ModalTable visibleData={gVisibleData} onCancel={() => setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })}/>
+      <ModalTable
+        visibleData={gVisibleData}
+        onCancel={() => setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })}
+      />
 
       {/* 邀请经纪人 */}
-      <InviteTable visibleData={gInviteData} onCancel={() => setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })} />
+      <InviteTable
+        visibleData={gInviteData}
+        onCancel={() => setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })}
+      />
     </Card>
   );
 }
 const WrappedBody = Form.create({ name: 'body' })(body);
 
-export default WrappedBody
+export default WrappedBody;

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

     }
     // eslint-disable-next-line max-len
     request({
-      ...apis.customer.CustomerRecommendGet,
+      ...apis.customer.customerInfo,
       urlData: { id },
-      params: { ...params, pageNumber: 1, pageSize: 10 },
+      // params: { ...params, pageNumber: 1, pageSize: 10 },
     }).then(res => {
       setData(res);
-      if (res.visitRecords) {
-        setTableDataData(res.visitRecords);
-      }
-      setDataonsultant(res.geoInfo);
-      setIntentionData(res.intentions);
+      // if (res.visitRecords) {
+      //   setTableDataData(res.visitRecords);
+      // }
+      // setDataonsultant(res.geoInfo);
+      // setIntentionData(res.intentions);
     });
   }
   // 分页
 
   function changBuilding(buildingId) {
     setBuildingIdData(buildingId);
-    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
+    // getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
   }
 
   const columns = [
       render: (_, record) => <span>{record.intention}</span>,
     },
   ];
+ const  {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taUser={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
+ const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
+
   return (
     <>
       <div style={{ textAlign: 'right', marginBottom: '16px' }}>
           <p className={styles.tit}>客户信息</p>
           <div className={styles.flexBox}>
             <div>
-              <img className={styles.touxiang} src={data.picture && data.picture} />
+              <img className={styles.touxiang} src={data.avatarurl} />
             </div>
             <div className={styles.right}>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{data.phone}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{customerInfo?.name||taRecommendCustomer?.name||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{customerInfo?.phone||taRecommendCustomer.phone||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{customerInfo?.homeAddress||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.visitTimes||'--'}</span></p>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{customerInfo?.age||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{customerInfo?.householdIncome||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{customerInfo?.houseNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{customerInfo?.estimatedPurchaseTime||'--'}</span></p>
 
         
 
             <div className={styles.Centered}>
 
                 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{data.phone}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{customerInfo?.nickname||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{customerInfo?.sex||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{customerInfo?.firmAddress||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.channelName||'--'}</span></p>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{customerInfo?.career||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{customerInfo?.familyNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{customerInfo?.carNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{customerInfo?.motivation||'--'}</span></p>
 
 
             </div>
             <div className={styles.rightCentered}>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{customerInfo?.consultation||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{customerInfo?.resistanceAnalysis||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{customerInfo?.approval||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{customerInfo?.remark||'--'}</span></p>
 
          
       
         <div className={styles.rightBoxCentre}>
           <p className={styles.tit}>置业顾问信息</p>
           <div>
-            <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
+            <img className={styles.touxiangphoto} src={realtyConsultantPerson?.avatarurl} />
          
           </div>
           <div className={styles.rightphone}>
-          <p className={styles.infoItem}>{data.consultant && data.consultant.userName}</p>
-          <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
+          <p className={styles.infoItem}>{taUser?.userName}</p>
+          <p className={styles.infoItem}>号码：{taUser?.phone} </p>
       
           </div>
           <div className={styles.left}>
-          <p className={styles.infoItem}>部门：{data.consultant && data.consultant.orgName} </p>
-          <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.orgName} </p>
-          <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+          <p className={styles.infoItem}>部门：{taUser?.department} </p>
+          <p className={styles.infoItem}>岗位：{taUser?.position} </p>
+          <p className={styles.infoItem}>公司：{taUser?.orgName} </p>
            
             <p className={styles.infoItem}>
               所属项目：
-              {data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)}
+              {taBuildingList?.map((item, _) => <span>{item.buildingName} </span>)}
             </p>
           </div>
         </div>
             bordered={false}
             columnWidth={10}
             columns={intention}
-            dataSource={intentionData}
+            dataSource={personIntentions}
             pagination={false}
-            scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false}
+            key='personId'
+            scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
             width={500}
           />
           {/* </div> */}
         <p className={styles.tableName}>访问记录</p>
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
         <Table
-          dataSource={tableData.records}
+          dataSource={records}
           columns={columns}
+          key='recordId'
           style={{ marginTop: '15px' }}
-          pagination={{ pageSize: 10, total: tableData.total, onChange }}
+          pagination={{ pageSize: 10, total: records.length }}
         />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>

src/pages/customer/Customer/PublicCustomer/publicCustomerDetail.jsx

       return;
     }
 
-    request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { ...params } }).then(
+    request({ ...apis.customer.customerInfo, urlData: { id }, params: { ...params } }).then(
       res => {
-        setTableDataData(res.visitRecords);
+        // setTableDataData(res.visitRecords);
         setData(res);
-        setDataonsultant(res.geoInfo);
-        setIntentionData(res.intentions);
+        // setDataonsultant(res.geoInfo);
+        // setIntentionData(res.intentions);
       },
     );
   }
       render: (_, record) => <span>{record.intention}</span>,
     },
   ];
+
+  const  {customerInfo={},taRecommendCustomer={},realtyConsultantPerson={},taBuildingList=[],personIntentions=[],personVisitRecords=[]} = data
+ const records =buildingIdValue?personVisitRecords?.filter(x=>x.buildingId===buildingIdValue):personVisitRecords
   return (
     <>
       <div style={{ textAlign: 'right', marginBottom: '16px' }}>
         <div >
           <p className={styles.tit}>客户信息</p>
           <div className={styles.flexBox}>
-            <div>
-              <img className={styles.touxiang} src={data.picture && data.picture} />
+          <div>
+              <img className={styles.touxiang} src={data.avatarurl} />
             </div>
             <div className={styles.right}>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{data.phone}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>用户名称：</span><span>{customerInfo?.name||taRecommendCustomer?.name||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>手机号码：</span><span>{customerInfo?.phone||taRecommendCustomer.phone||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭住址：</span><span>{customerInfo?.homeAddress||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>访问次数：</span><span>{data.visitTimes||'--'}</span></p>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>年龄段：</span><span>{customerInfo?.age||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭年收入：</span><span>{customerInfo?.householdIncome||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有房产数：</span><span>{customerInfo?.houseNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>预计购房时间：</span><span>{customerInfo?.estimatedPurchaseTime||'--'}</span></p>
 
         
 
             <div className={styles.Centered}>
 
                 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{data.phone}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>昵称：</span><span>{customerInfo?.nickname||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>性别：</span><span>{customerInfo?.sex||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>工作住址：</span><span>{customerInfo?.firmAddress||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>来源渠道：</span><span>{data.channelName||'--'}</span></p>
 
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{data.name}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>职业：</span><span>{customerInfo?.career||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>家庭成员数：</span><span>{customerInfo?.familyNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>已有车辆数：</span><span>{customerInfo?.carNumber||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>购房动机：</span><span>{customerInfo?.motivation||'--'}</span></p>
 
 
             </div>
             <div className={styles.rightCentered}>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{data.name}</span></p>
-              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{data.name}</span></p>
-      
-              </div>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户资讯重点：</span><span>{customerInfo?.consultation||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>客户抗性分析：</span><span>{customerInfo?.resistanceAnalysis||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>对项目认可点：</span><span>{customerInfo?.approval||'--'}</span></p>
+              <p className={styles.rightItem}><span style={{width:'20%',minWidth:"100px"}}>备注：</span><span>{customerInfo?.remark||'--'}</span></p>
+
          
       
+            </div>
+      
+      
            
         </div>
       </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={publicStyle.infoItem}>
             <Table
-              columnWidth={10}
-              columns={intention}
-              dataSource={intentionData}
-              pagination={false}
-              scroll={intentionData.length >= 3 ? { y: 240 } : false}
+             bordered={false}
+             columnWidth={10}
+             columns={intention}
+             dataSource={personIntentions}
+             pagination={false}
+             key='personId'
+             scroll={personIntentions?.length >= 3 ? { y: 240 } : false}
+    
             />
           </div>
         </div>
         <p className={publicStyle.tableName}>访问记录</p>
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
         <Table
-          dataSource={tableData.records}
+          dataSource={records}
           columns={columns}
           style={{ marginTop: '15px' }}
-          pagination={{ pageSize: 10, total: tableData.total, onChange }}
+          pagination={{ pageSize: 10, total: records.length, onChange }}
         />
       </div>
     </>

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

-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/staff/staff/Edit/index.jsx

       extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
       value: userData.avatar,
       beforeUpload: e => photoBeforeUpload(e),
-      rules: [{ required: true, message: '请选择头像' }],
+      // rules: [{ required: true, message: '请选择头像' }],
     },
 
     {
       type: FieldTypes.Switch,
       value: userData.isConsultant,
       props: {
-        disabled: userData.isConsultant,
+        // disabled: userData.isConsultant,
         onChange: e => {
           console.log(e, '------');
           setIsConsultant(e);

src/pages/statistics/activity/index.jsx

 import React, { Component, useState, useEffect } from 'react';
-import { Card, Row, Col, Statistic, Icon } from 'antd';
+import { Card, Row, Col, Statistic, Icon, Table } from 'antd';
 // import IndexEcharts from './components/indexEcharts';
 // import Swiper from './swiper/index';
+import moment from 'moment';
 import router from 'umi/router';
 import request from '@/utils/request';
 import apis from '@/services/apis';
+import TimeSelect from '../compents/TimeSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
 // import Count from './components/Count';
 // import SourceRole from './components/SourceRole';
 // import UserSex from './components/UserSex';
 
 const DataReport = props => {
   const [data, setData] = useState([]);
+  const [time, setTime] = useState([]);
+  const [buildingValue, setBuildingValue] = useState();
+
+  useEffect(() => {
+    if (time) {
+      getTableList({
+        buildingValue,
+        startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
+        endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
+      });
+    }
+  }, [time, buildingValue]);
+
+  const columns = [
+    {
+      title: '活动名称',
+      dataIndex: 'activityName',
+      key: 'activityName',
+    },
+    {
+      title: '访问人数',
+      dataIndex: 'visitPersonNum',
+      key: 'visitPersonNum',
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'visitNum',
+      key: 'visitNum',
+    },
+    {
+      title: '报名人数',
+      dataIndex: 'visitNum',
+      key: 'visitNum',
+      // sorter: true,
+      //   render: (text, record) => (
+      //     <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+      //     // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+      //   ),
+    },
+  ];
+
+  function getTableList(params) {
+    request({
+      ...apis.activityDataStatis.activityDetailTableData,
+      params: {
+        ...params,
+        
+      },
+    })
+      .then(data => {
+        console.log(data);
+        // this.setState({ tableData: data.records, total: data.total });
+      })
+      .catch();
+  }
+
+  const onTimeChange = e => {
+    setTime(e);
+  };
 
   return (
-    <>234
-      {/* <div style={{ marginBottom: '20px' }}>
-        <Count></Count>
-      </div>
-      <div style={{ marginBottom: '20px' }}>
-        <Row gutter={16} style={{ textAlign: 'center' }}>
-          <Col span={8}>
-            <SourceRole></SourceRole>
-          </Col>
-          <Col span={8}>
-            <UserSex></UserSex>
-          </Col>
-          <Col span={8}>
-            <UserConversion></UserConversion>
-          </Col>
-        </Row>
-      </div>
-      <div style={{ marginBottom: '20px' }}>
-        <BuildingStatistic></BuildingStatistic>
-      </div> */}
-    </>
+    <Card
+      title={<BuildingSelect value={buildingValue} onChange={e => setBuildingValue(e)} all />}
+      headStyle={{ textAlign: 'left' }}
+      extra={<TimeSelect onChange={onTimeChange}></TimeSelect>}
+    >
+      <Table columns={columns} dataSource={[]}></Table>
+    </Card>
   );
 };
 export default DataReport;

src/pages/statistics/compents/TimeSelect.jsx

 
 const { RangePicker } = DatePicker;
 const TimeSelect = props => {
-  const { value, onChange } = props;
+  const { value, onChange=()=>{} } = props;
 
   const [rangePickerValue, setRangePickerValue] = useState();
   const [type, setType] = useState('');

src/services/apis.js

     getDetail: {
       method: 'GET',
       url: `${prefix}/channelCustomer/:id`,
-      action: 'admin.customer.recommend.recommender.get',
+      action: 'admin.customer.get',
+    },
+    customerInfo: {
+      method: 'GET',
+      url: `${prefix}/customerInfo/:id`,
+      action: 'admin.customerInfo.id.get',
     },
 
     getStatusChange: {
       url: `${prefix}/customer/list/:id`,
       action: 'admin.customer.list.get',
     },
+    deleteChannelPerson: {
+      // 根据置业顾问查询客户
+      method: 'delete',
+      url: `${prefix}/channelPerson/:id`,
+      action: 'admin.channelPerson.id.get',
+    },
+
   },
   indexEcharts: {
     list: {