manage

estateagents-admin-manager/src/pages/carouselFigure/SelectH5.1.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal, Button, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+const { Search } = Input;
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }, []);
+  const searchH5 = (e) => {
+    getH5List({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup('')
+    onChange('')
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[
+          <Button key="back" onClick={() => setVisible(false)}>
+            取消
+            </Button>,
+          <Button key="cancel" onClick={() => setData(value)}>
+            清空
+            </Button>,
+          <Button key="submit" type="primary" onClick={() => {
+            updateGroup(value)
+            onChange(value)
+            setVisible(false)
+          }}>
+            提交
+            </Button>
+        ]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchH5(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Select
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }>
+          {
+            list.map(x => (<Select.Option key={x.drainageId} value={x.drainageId}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/SelectH5.jsx

@@ -0,0 +1,135 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input, Row, Col } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Column, ColumnGroup } = Table;
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+const { Search } = Input;
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+        source: 2,
+        buildingId,
+      },
+    }).then(data => {
+      const getGroupTitle = val => {
+        return (data.records.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+      }
+      const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchH5 = e => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+        source: 2,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+      const getGroupTitle = val => {
+        return (data.records.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+      }
+      const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+      setList(data.records || [])
+      updateGroup(value ? undefined : value);
+    })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const clearVal = val => {
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'name',
+      key: 'drainageId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.drainageId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Row>
+          <Col span={18}>
+            <Search
+              placeholder="请输入标题"
+              enterButton="搜索"
+              size="default"
+              allowClear="true"
+              onSearch={value => searchH5(value)}
+              style={{ marginBottom: '16px' }}
+            />
+          </Col>
+          <Col span={4} offset={1}>
+            <Button type="primary" onClick={() => clearVal('')}>清除选择</Button>
+          </Col>
+        </Row>
+
+        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+
+      </Modal>
+    </div>
+  )
+}

estateagents-admin-manager/src/pages/carouselFigure/SelectHelp.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Search } = Input;
+
+const getHelpList = fetch(apis.helpActivity.effectiveList)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [help, setHelp] = useState({ helpId: undefined, helpName: '请选择助力' })
+  const getHelpTitle = val => {
+    return (list.filter(x => x.helpActivityId == val)[0] || {}).title || '请选择助力'
+  }
+
+  const updateHelp = val => setHelp({ helpId: val, helpName: getHelpTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getHelpList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateHelp(value ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchHelp = (e) => {
+    getHelpList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateHelp(value ? undefined : value);
+    })
+  }
+  if (value !== help.helpId) {
+    updateHelp(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateHelp(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'helpActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.helpActivityId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{help.helpName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchHelp(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.helpActivityId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/SelectNews.jsx

@@ -0,0 +1,106 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const getNewsList = fetch(apis.news.getList)
+const { Search } = Input;
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [news, setNews] = useState({ newsId: undefined, newsName: '请选择资讯' })
+  const getNewsTitle = val => ((list.filter(x => x.newsId == val)[0]) || {}).newsName || '请选择资讯'
+  const updateNews = val => setNews({ newsId: val, newsName: getNewsTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getNewsList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        newsStatus: 0,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateNews(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchActivity = (e) => {
+    getNewsList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        newsStatus: 0,
+        title: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateNews(buildingId ? undefined : value);
+    })
+  }
+  if (value !== news.newsId) {
+    updateNews(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateNews(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'newsName',
+      key: 'newsId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.newsId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{news.newsName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/customImg/edit.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../../channel/channelList.less';
+import { connect } from 'dva';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import { createForm, FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+let activityVisible = true
+let helpTips = ''
+
+const setExtraData = (data) => {
+    activityVisible = data.imgType === 'index';
+  }
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+const header = props => {
+  const {
+    currentUser = {
+      avatar: '',
+      userName: '',
+    },
+    menu,
+  } = props;
+
+  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',
+  }
+  )
+
+  if(imgId){
+    useEffect(() => {
+      getData(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)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '图片',
+      name: 'imgUrl',
+      type: FieldTypes.ImageUploader,
+      value: data.imgUrl,
+      help: helpTips,
+      rules: [
+        {required: true, message: '请选择图片'},
+      ]
+    },
+    {
+      label: '类型',
+      name: 'imgType',
+      type: FieldTypes.Select,
+      value: data.imgType,
+      dict: [{
+          label: '首页分享',
+          value: 'index',
+        },
+        {
+          label: '首页资讯',
+          value: 'indexNews',
+        },
+      ],
+      rules: [
+        { required: true, message: '请选择类型' },
+      ],
+    },
+    data.imgType === 'index' && {
+      label: '分享文案',
+      name: 'imgDocument',
+      type: FieldTypes.Text,
+      value: data.imgDocument,
+      rules: [
+        { required: true, message: '请输入分享文案' },
+      ],
+    },
+  ]
+
+  const handleSubmit = values => {
+    
+    if (imgId) {
+      values.imgId = imgId
+      request({ ...apis.carsuseFigure.updateCustomImg, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({ ...apis.carsuseFigure.addCustomImg, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+        pathname: '/carouselFigure/customImg/list',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+
+export default connect(({ user }) => ({
+  currentUser: user.currentUser,
+}))(WrappedNormalLoginForm);

estateagents-admin-manager/src/pages/carouselFigure/customImg/list.jsx

@@ -0,0 +1,81 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table } from 'antd';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+const { Column } = Table;
+
+function header(props) {
+  // 获取初始化数据
+  const [data, setData] = useState([])
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.customImg, params: { ...params }, }).then((data) => {
+      console.log(data, "datadata")
+      if (data.records.length > 0) {
+        setData(data.records)
+      } else {
+        setData([
+          { 'imgUrl': 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg', 'imgType': 'index', 'imgDesc': '小程序首页分享配图' },
+          { 'imgUrl': 'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png', 'imgType': 'indexNews', 'imgDesc': '首页资讯logo' }
+        ])
+      }
+
+    })
+  }
+
+  // 跳转到编辑商品
+  const toEditCustom = (imgId, imgType) => () => {
+    router.push({
+      pathname: '/carouselFigure/customImg/edit',
+      query: {
+        imgId,
+        imgType: imgType
+      },
+    });
+  }
+
+
+  // const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Table dataSource={data}>
+        <Column title="图片" dataIndex="imgUrl" key="imgUrl"
+          render={(text, record) => (
+            <Navigate onClick={toEditCustom(record.imgId, record.imgType)} ><img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }} /></Navigate>
+          )} />
+        <Column title="类型" dataIndex="imgType" key="imgType"
+          render={(text, record) => (
+            <span>
+              {record.imgType === 'index' ? '首页分享' : record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
+            </span>
+          )}
+        />
+        <Column title="说明" dataIndex="imgDesc" key="imgDesc" />
+        <Column title="操作"
+          dataIndex="handle"
+          key="handle"
+          render={withActions((text, record) => [
+            <AuthButton name="admin.custom.put" noRight={null}>
+              <EditIcon text="编辑" type="edit" onClick={toEditCustom(record.imgId, record.imgType)}></EditIcon>
+            </AuthButton>,
+          ])}
+        />
+      </Table>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/channel/InviteClients.jsx

@@ -0,0 +1,87 @@
+
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+function handleChange(value) {
+  console.log(`selected ${value}`);
+}
+const columns = [
+  {
+    title: '头像',
+    dataIndex: 'img',
+    key: 'img',
+    align: 'center',
+
+    render: (text, record) => <img src={record.avatarurl} className={channels.touxiang} />,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '电话',
+    dataIndex: 'tel',
+    key: 'tel',
+    align: 'center',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
+  },
+];
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getListInvite({ id: props.location.query.id, pageNum: 1, pageSize: 10 })
+  }, [])
+
+  // function getListInvite(params) {
+  //   request({
+  //     url: 'api/admin/channel/InviteClientsList',
+  //     method: 'GET',
+  //     params: { ...params },
+  // // eslint-disable-next-line no-shadow
+  // }).then(data => {
+  //     console.log(data)
+  //     setData(data)
+  // })
+  // }
+
+  function getListInvite(params) {
+    request({ ...apis.channelList.getListInvite, params: { ...params } }).then((data) => {
+      setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getListInvite({ pageNum: pageNumber, pageSize: 9 })
+  }
+  return (
+    <>
+      <div className={channels.searchBox}>
+      </div>
+      <Table dataSource={data.records} rowKey="InviteClient" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+  </>
+  )
+}
+
+
+export default header

estateagents-admin-manager/src/pages/channel/addChannel.jsx

@@ -0,0 +1,87 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+
+  // useEffect(() => {
+  //   addChannel({ pageNum: 1, pageSize: 10 })
+  // }, [])
+
+  function addChannel(params) {
+    request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
+      setData(data)
+      router.go(-1)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        // eslint-disable-next-line max-len
+        addChannel({
+          channelName: values.channelName,
+          channelContact: values.channelContact,
+          contactTel: values.contactTel,
+          explain: values.explain
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="渠道名称">
+          {getFieldDecorator('channelName', {
+            rules: [{ required: true, message: '请输入渠道名称' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系人">
+          {getFieldDecorator('channelContact', {
+            rules: [{ required: true, message: ' 请输入联系人' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系电话">
+          {getFieldDecorator('contactTel', {
+            rules: [{ required: true, message: '请输入联系电话' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="说明描述">
+          {getFieldDecorator('explain', {
+          })(<TextArea className={channels.inpuitTxt} rows={8} />)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
+          <div style={{ width: '190px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button className={channels.formButton} onClick={() => router.go(-1)} htmlType="submit">
+              取消
+          </Button>
+          </div>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/channel/brokerList.jsx

@@ -0,0 +1,193 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Avatar } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+function handleChange(value) {
+  console.log(`selected ${value}`);
+}
+
+
+const menu = (
+  <Menu onClick={handleMenuClick}>
+    <Menu.Item key="1">
+      <Icon type="user" />
+      1st menu item
+    </Menu.Item>
+    <Menu.Item key="2">
+      <Icon type="user" />
+      2nd menu item
+    </Menu.Item>
+    <Menu.Item key="3">
+      <Icon type="user" />
+      3rd item
+    </Menu.Item>
+  </Menu>
+);
+const columns = [
+  {
+    title: '头像',
+    dataIndex: 'avatarurl',
+    key: 'avatarurl',
+    align: 'center',
+
+    // eslint-disable-next-line jsx-a11y/alt-text
+    render: (text, list) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} src={list.avatarurl} size={64} icon="user" />,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'nickname',
+    key: 'nickname',
+    align: 'center',
+    render: (text, list) => <><span>{list.name || list.nickname}</span></>,
+  },
+  {
+    title: '电话',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    render: (text, list) => <a>{list.gender === '1' ? '男' : list.gender === '2' ? '女' : '未知'}</a>,
+  },
+  {
+    title: '推荐客户',
+    dataIndex: 'recommendCount',
+    key: 'recommendCount',
+    align: 'center',
+    // render: (text, list) => <a style={ { color: '#66B3FF' } } onClick= {() => torecommend(list.personId)} >{ list.recommendCount }</a>,
+    render: (text, list) => <Navigate onClick={() => torecommend(list.personId)} >{list.recommendCount}</Navigate>,
+  },
+  // {
+  //   title: '邀请经纪人',
+  //   dataIndex: 'inviteCount',
+  //   key: 'inviteCount',
+  //   align: 'center',
+  //   render: (text, list) => <a style={ { color: '#66B3FF' } } onClick= {() => toinvite(list.personId)} >{ list.inviteCount }</a>,
+  // },
+];
+
+// 跳转到推荐客户
+function torecommend(personId) {
+  router.push({
+    pathname: '/channel/recommendClients',
+    query: {
+      id: personId,
+    },
+  });
+}
+
+// 跳转到邀请经纪人
+function toinvite(personId) {
+  router.push({
+    pathname: '/channel/InviteClients',
+    query: {
+      id: personId,
+    },
+  });
+}
+
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [queryData, setQueryData] = useState({})
+
+  const channelId = props.location.query.id
+  //   const [page, changePage] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getListBroker({ channelId, pageNum: 1, pageSize: 10 })
+  }, [])
+
+  function getListBroker(params) {
+    request({ ...apis.channelList.getListBroker, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  // 搜索
+  function queryList() {
+    getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId })
+  }
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getListBroker({ pageNum: pageNumber, pageSize: 10, channelId })
+  }
+  //   // 获取input的值
+  //   function onInputChangeName (e) {
+  //     // const InputValue = e.target.name.x.value;
+  //     setQueryData({ ...queryData, name: e.target.value })
+  //  }
+
+  //  function onInputChangePhone (e) {
+  //   // const InputValue = e.target.name.x.value;
+  //   setQueryData({ ...queryData, phone: e.target.value })
+  // }
+  // function refurbishList () {
+  //   getListBroker({ pageNum: 1, pageSize: 10 })
+  // }
+  // eslint-disable-next-line no-undef
+  // function handleClick() {
+  //   alert('11', this)
+  //   console.log('this is:', this);
+  // }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log('values', values)
+      if (!err) {
+        console.log('values', values)
+        getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId, name: values.name, phone: values.phone })
+      }
+    });
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getListBroker({ pageNum: 1, pageSize: 10, channelId })
+  }
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item label="姓名">
+          {getFieldDecorator('name', {
+          })(<Input />)}
+        </Form.Item>
+        <Form.Item label="电话">
+          {getFieldDecorator('phone', {
+          })(<Input />)}
+        </Form.Item>
+        <Form.Item >
+          <Button type="primary" htmlType="submit" >搜索</Button>
+          <Button onClick={handleReset} style={{ marginLeft: 18 }}>重置</Button>
+        </Form.Item>
+      </Form>
+      <Table style={{ marginTop: '40px' }} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} rowKey="brokerList" />
+    </>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+function handleMenuClick(e) {
+  message.info('Click on menu item.');
+  console.log('click', e);
+}
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/channel/channelList.jsx

@@ -0,0 +1,215 @@
+import React, { useState, useEffect } from 'react';
+import { Button, message, Table } from 'antd';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import ChannelSelect from '@/components/SelectButton/channelSelect';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import channels from './channelList.less';
+import Navigate from '@/components/Navigate';
+
+const columns = [
+  // {
+  //   title: '商品图片',
+  //   dataIndex: 'img',
+  //   key: 'img',
+  //   align: 'center',
+
+  //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+  // },
+  {
+    title: '渠道代码',
+    dataIndex: 'channelCode',
+    key: 'channelCode',
+    align: 'center',
+  },
+  {
+    title: '渠道名称',
+    dataIndex: 'channelName',
+    key: 'channelName',
+    align: 'center',
+    render: (text, record) => <Navigate to={`/channel/editChannel?id=${record.channelId}`}>{text}</Navigate>,
+  },
+  {
+    title: '联系人',
+    dataIndex: 'channelContact',
+    key: 'channelContact',
+    align: 'center',
+  },
+  {
+    title: '联系电话',
+    dataIndex: 'contactTel',
+    key: 'contactTel',
+    align: 'center',
+  },
+  {
+    title: '经纪人数',
+    dataIndex: 'brokerCount',
+    key: 'brokerCount',
+    align: 'center',
+    render: (text, record) => <Navigate onClick={() => toBroker(record)}>{text}</Navigate>,
+  },
+  {
+    title: '推荐客户有效数',
+    dataIndex: 'recommendCount',
+    key: 'recommendCount',
+    align: 'center',
+  },
+  {
+    title: '引进注册客户',
+    dataIndex: 'customerNum',
+    key: 'customerNum',
+    align: 'center',
+    render: (text, record) => <Navigate onClick={() => toNewCustomer(record)}>{text}</Navigate>,
+  },
+  {
+    title: '操作',
+    dataIndex: '',
+    key: '',
+    align: 'center',
+    render: withActions((text, record) => [
+      <AuthButton name="admin.channel.id.put" noRight={null}>
+        <EditIcon text="编辑" type="edit" onClick={() => toedit(record.channelId)} />
+      </AuthButton>,
+    ]),
+  },
+];
+
+// 跳转到添加页面
+function toAdd() {
+  router.push({
+    pathname: '/channel/addChannel',
+    query: {
+      a: 'b',
+    },
+  });
+}
+// 跳编辑页面
+function toedit(channelId) {
+  // alert(channelId)
+  router.push({
+    pathname: '/channel/editChannel',
+    query: {
+      id: channelId,
+    },
+  });
+}
+
+// 经纪人页面
+function toBroker(record) {
+  // if (record.brokerCount === 0) {
+  //   return
+  // }
+  router.push({
+    pathname: '/channel/brokerList',
+    query: {
+      id: record.channelId,
+    },
+  });
+}
+
+// 引进注册用户
+function toNewCustomer(record) {
+  // if (record.brokerCount === 0) {
+  //   return
+  // }
+  router.push({
+    pathname: '/channel/newCustomer',
+    query: {
+      id: record.channelId,
+      name: record.channelName,
+      customerNum: record.customerNum,
+    },
+  });
+}
+
+export default function ChannelList (props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+  const [channelNmae, setChannelNmae] = useState()
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    localStorage.removeItem('value');
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [])
+
+  function getList(params) {
+    request({ ...apis.channelList.getList, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+  // value 的值
+  function handleChange(value) {
+    // setQueryData({ ...queryData, channelId: value });
+    localStorage.setItem('value', value);
+  }
+  // 查询
+  function queryList() {
+
+    getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
+  }
+  // 重置
+  function reset() {
+    setChannelNmae()
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  // 跳编辑页
+  function toEdit() {
+    router.push({
+      pathname: '/integralMall/editGoods',
+      query: {
+        a: 'b',
+      },
+    });
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    getList({ pageNum: pageNumber, pageSize: 10, channelId: channelNmae })
+    // getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    //   }
+    // });
+  }
+
+  function onChannelChange(value) {
+    setChannelNmae(value)
+  }
+
+  return (
+    <>
+      <div className={channels.searchBox}>
+        <div>
+          <span className={channels.selectName}>渠道名称</span>
+          <ChannelSelect value={channelNmae} onChange={onChannelChange}></ChannelSelect>
+          {/* 
+          <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
+            <option value="">全部</option>
+            {data.channelNmae.map(Item =>
+              <Option value={Item.channelId}> {Item.channelName} </Option>,
+            )} */}
+          {/* {listItems} */}
+          {/* </Select> */}
+        </div>
+        <div >
+          <AuthButton name="admin.channel.search" noRight={null}>
+            <Button type="primary" onClick={() => queryList()}>搜索</Button>
+          </AuthButton>
+          <Button onClick={() => reset()} style={{ marginLeft: '8px' }}>重置</Button>
+        </div>
+      </div>
+      <AuthButton name="admin.channel.post" noRight={null}>
+        <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
+      </AuthButton>
+      <Table dataSource={data.result.records} columns={columns} rowKey="channelList" pagination={{ pageSize: 10, total: data.result.total, onChange }} />
+    </>
+  )
+}

estateagents-admin-manager/src/pages/channel/channelList.less

@@ -0,0 +1,68 @@
+.searchBox {
+  font-size: 20px;
+  color: red;
+  display: flex;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .searchItem {
+    min-width: 20px;
+    margin-right: 20px;
+    text-align: left;
+    .anticon-down {
+      float: right !important;
+    }
+  }
+}
+.addBtn {
+  padding: 0 30px;
+  height: 36px;
+  background-color: #50be00;
+  color: #fff;
+  margin: 30px 0;
+}
+.touxiang {
+  width: 93px;
+  height: 93px;
+}
+.ant-table-column-title {
+  font-weight: 600;
+}
+
+.about {
+  padding: 0 30px;
+  height: 36px;
+  margin: 30px 0;
+  margin-left:8px;
+}
+
+.selectName {
+  font-size: 14px;
+  padding: 0 10px;
+  height: 36px;
+  color: rgb(10, 10, 10);
+  margin: 30px 0;
+}
+
+.inpuit {
+  width:50%;
+}
+
+.inpuitTxt {
+  width:70%;
+}
+
+
+.formButton{
+  margin-left: 12% 
+}
+
+.divInput{
+  float: 'left'; 
+  width: 500
+}
+.brokerTable{
+  padding: 0 30px;
+  height: 36px;
+  margin: 30px 0;
+}

estateagents-admin-manager/src/pages/channel/editChannel.jsx

@@ -0,0 +1,95 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+  }, [])
+
+
+  // 查询当前信息
+  function getById(params) {
+    request({ ...apis.channelList.getById, urlData: { id: props.location.query.id } }).then((data) => {
+      props.form.setFieldsValue(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  // 编辑
+  function editChannel(data) {
+    request({ ...apis.channelList.editChannel, urlData: { id: props.location.query.id }, data: { ...data } }).then((data) => {
+      router.go(-1)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('values', values)
+        editChannel({ ...values })
+      }
+    });
+  }
+  function go() {
+    router.push({
+      pathname: '/channel/channelList',
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="渠道名称">
+          {getFieldDecorator('channelName', {
+            rules: [{ required: true, message: '请输入渠道名称' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系人">
+          {getFieldDecorator('channelContact', {
+            rules: [{ required: true, message: ' 请输入联系人' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系电话">
+          {getFieldDecorator('contactTel', {
+            rules: [{ required: true, message: '请输入联系电话' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="说明描述">
+          {getFieldDecorator('explain', {
+          })(<TextArea className={channels.inpuitTxt} rows={8} />)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
+          <div style={{ width: '190px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button className={channels.formButton} onClick={go} htmlType="submit">
+              取消
+          </Button>
+          </div>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/channel/independentList/index.jsx

@@ -0,0 +1,518 @@
+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 moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
+import ChannelSelect from '@/components/SelectButton/channelSelect';
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+/**
+ * 推荐客户
+ */
+class ModalTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    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
+    if (customerId === '' || customerId === undefined) {
+      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
+      />
+    })
+  }
+
+  // 分页
+  onChange(pageNum) {
+
+    this.getList({ pageNumber: pageNum, pageSize: 5, })
+
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '头像',
+        // eslint-disable-next-line jsx-a11y/alt-text
+        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: 'name',
+        key: 'name',
+        // render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '性别',
+        dataIndex: 'sex',
+        key: 'sex',
+        render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
+      },
+      {
+        title: '意向项目',
+        dataIndex: 'intention',
+        key: 'intention',
+      },
+      {
+        title: '推荐时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+      },
+      {
+        title: '状态',
+        // eslint-disable-next-line consistent-return
+        render: (text, records) => {
+          console.log("retrun", records)
+          //     if (records.status === 1) { return '报备' }
+          // if (records.status === 2) { return '推荐' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
+          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          // if (records.status === 2) { return '到访' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { 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.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 '签约' }
+          // reportRecommendStatus
+        },
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="推荐客户"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          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) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+// defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current}
+
+/**
+ * 邀请客户
+ */
+class InviteTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+
+  }
+
+  componentDidUpdate(preProps, preState) {
+    const { customerId } = this.props.visibleData
+
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      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()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    console.log('345')
+    this.setState({ dataSource: { records: [] } })
+    this.props.onCancel()
+  }
+
+  getList(params) {
+    const { id } = params
+    console.log(id)
+    if (id === '' || id === undefined) {
+      return
+    }
+    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 })
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '头像',
+        dataIndex: 'img',
+        key: 'img',
+        align: 'center',
+        render: (text, record) => <img src={record.avatarurl} width={50} height={50} />,
+      },
+      {
+        title: '用户姓名',
+        dataIndex: 'nickname',
+        key: 'nickname',
+        align: 'center',
+        render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+      },
+      {
+        title: '性别',
+        dataIndex: 'sex',
+        key: 'sex',
+        align: 'center',
+        render: (text, list) => <span>{list.sex === 1 ? '男' : '女'}</span>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="邀请经纪人"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          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) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+/**
+ *
+ *主题列表
+ * @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
+  useEffect(() => {
+    getList({ pageNumber: 1, pageSize: 10 })
+  }, [])
+
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.customer.agents, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err)
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  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: '' })
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+  function gM(row) {
+    setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+
+    setGInviteData({ visible: false })
+  }
+
+  function Invite(row) {
+    setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+
+    setGVisibleData({ visible: false })
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNum, pageSize: 10 })
+  }
+
+  /**
+    * 重置搜索
+    */
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10 })
+  }
+
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/customer/recommendCustomer/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+  }
+
+  function exportIndependen() {
+    const fieldsValue = getFieldsValue()
+    console.log('fieldsValue', fieldsValue)
+    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob', params: { ...fieldsValue } })
+      .then(response => {
+        download(response)
+      }).catch(error => {
+
+      })
+  }
+
+  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()
+  }
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'avatarurl',
+      key: 'avatarurl',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      render: (_, record) => <><span>{record.name || record.nickname}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? '专业经纪人' : '专业经纪人'}</span></>,
+    },
+    {
+      title: '所属渠道',
+      dataIndex: 'channelName',
+      key: 'channelName',
+      render: (_, record) => <><span>{record.channelName}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      render: (_, record) => (
+        <>
+          {
+            <>
+              {/* <span style={{ color: 'rgba(239,39,58,1)' }}>查看详细</span> */}
+              {/* <AuthButton name="admin.channel.InviteClientsList.get" noRight={null}>
+                <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>
+            </>
+          }
+        </>
+      ),
+    },
+  ]
+
+  // <div>
+  //         <span className={channels.selectName}>渠道名称</span>
+  //         <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
+  //           <option value="">全部</option>
+  //           {data.channelNmae.map(Item =>
+  //             <Option value={Item.channelId}> {Item.channelName} </Option>,
+  //           )}
+  //           {/* {listItems} */}
+  //         </Select>
+  //       </div>
+  //       <div ></div>
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
+        <Form.Item>
+          {getFieldDecorator('channelId')(
+            <ChannelSelect />
+            //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
+            //   <option value="">全部</option>
+            //   {data.channelNmae.map(Item =>
+            //     <Option value={Item.channelId}> {Item.channelName} </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>
+        <Form.Item style={{ position: 'absolute', right: '38px' }} >
+          <AuthButton name="admin.major.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+          </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.major.import" noRight={null}>
+        <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 }} />
+      {/* 推荐客户 */}
+      <ModalTable visibleData={gVisibleData} onCancel={() => setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })}/>
+
+      {/* 邀请经纪人 */}
+      <InviteTable visibleData={gInviteData} onCancel={() => setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

estateagents-admin-manager/src/pages/channel/independentList/style.css

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

estateagents-admin-manager/src/pages/channel/independentList/style.less

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

estateagents-admin-manager/src/pages/channel/independentList/style.wxss

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

estateagents-admin-manager/src/pages/channel/newCustomer/dataRecord.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '../../../components/AuthButton';
+
+
+const dataRecord = props => {
+    const [data, setData] = useState({})
+    const { targetId, targetType, channelId, targetName, buildingId, newCustomers, startDate, endDate } = props.location.query
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    const getList = params => {
+        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
+            console.log(data,"dddddddddddd")
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+            align: 'center',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+            align: 'center',
+        },
+        {
+            title: '注册时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+        },
+
+    ]
+
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+
+
+/**
+     * 导出
+     */
+    const exportExcel = () => {
+        // const fieldsValue = getFieldsValue()
+        // console.log('fieldsValue', fieldsValue)
+        request({ ...apis.channelList.newuserListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
+          .then(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()
+          }).catch(() => {
+    
+          })
+      }
+
+    return <>
+        <div>
+            <div>
+                <span>内容:{targetName}</span>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div style={{ marginTop: '20px'  }}>
+                <span>注册用户:{newCustomers}</span>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportExcel}>导出</Button>
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records || []} columns={columns} pagination={false} rowKey="activityList" />
+            {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div> */}
+        </div>
+    </>
+}
+
+export default dataRecord

estateagents-admin-manager/src/pages/channel/newCustomer/index.jsx

@@ -0,0 +1,322 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Radio, DatePicker, notification } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import styles from '../../style/GoodsList.less';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import QrcodeType from '@/components/SelectButton/QrcodeType1'
+import ChannelSelect from '@/components/SelectButton/channelSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+// import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
+
+// function getDayBegin(dt) {
+//     return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
+//   }
+
+
+//   function getDayEnd(dt) {
+//     return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+//   }
+const { RangePicker } = DatePicker
+
+const qrcodelist = props => {
+    const { id, name, customerNum } = props.location.query
+    const [data, setData] = useState([])
+    const [showHelp, setShowHelp] = useState(false)
+    const [endDate, setEndDate] = useState(new Date())
+    const [startDate, setStartDate] = useState(moment().subtract(7, 'day').toDate())
+
+    // setEndDate(`${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`)
+    // setStartDate(`${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`)
+    // 查询列表
+    const getList = params => {
+        request({ ...apis.channelList.getIntroductionList, params: { ...params, channelId: id } }).then(data => {
+            console.log(data)
+            setData(data)
+        })
+    }
+    const formatDate = (start, end) => {
+        const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+        const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+        return { startDate: tempStartDate, endDate: tempEndDate }
+    }
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+        setEndDate(new Date())
+        setStartDate(moment().subtract(7, 'day').toDate())
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(startDate, endDate) });
+    }, [])
+
+
+    const toNewuser = (record) => {
+        router.push({
+            pathname: '/channel/newCustomer/dataRecord',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                newCustomers: record.newCustomers,
+                ...formatDate(startDate, endDate)
+            },
+        });
+    }
+
+    const toVisitNum = (record) => {
+        router.push({
+            pathname: '/channel/newCustomer/visitNum',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                visitNum: record.visitNum,
+                ...formatDate(startDate, endDate)
+            },
+        });
+    }
+
+    const toPersonNum = (record) => {
+        router.push({
+            pathname: '/channel/newCustomer/personNum',
+            query: {
+                channelId: record.channelId,
+                targetName: record.targetName,
+                targetId: record.targetId,
+                targetType: record.targetType,
+                buildingId: record.buildingId,
+                visitPersons: record.visitPersons,
+                ...formatDate(startDate, endDate)
+            },
+        });
+    }
+
+    /**
+     * 导出
+     */
+    const exportExcel = () => {
+        // console.log('fieldsValue', ...props.form.getFieldsValue())
+        request({ ...apis.channelList.getIntroductionListExport, params: { channelId: id, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate) } })
+            .then(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()
+            }).catch(() => {
+
+            })
+    }
+
+    // 排序
+    const handleTableChange = (pagination, filters, sorter) => {
+        console.log(pagination, filters, sorter)
+        // if (sorter.order === 'ascend') { 
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, asc: sorter.columnKey })
+        // } else if (sorter.order === 'descend') {
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, desc: sorter.columnKey })
+        // } else {
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate });
+        // }
+        // sortField, sortOrder
+        // getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, sorter.columnKey, sorter.order })
+        getList({ channelId: id, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate), sortField: sorter.columnKey, sortOrder: sorter.order })
+    };
+
+    /**
+     *
+     *
+     * @param {*} props
+     * @returns
+     */
+    const columns = [
+        {
+            title: '类型',
+            dataIndex: 'targetType',
+            key: 'targetType',
+            align: 'center',
+            render: (text, record) => <span>{text == 'building' ? '项目' : text == 'activity' ? '报名活动' : text == 'help' ? '助力活动' : text == 'group' ? '拼团活动'
+                : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动' : text == 'news' ? '资讯' : text == 'house' ? '在线选房' : ''}</span>,
+        },
+        {
+            title: '内容',
+            dataIndex: 'targetName',
+            key: 'targetName',
+            align: 'center',
+
+        },
+        {
+            title: '关联项目',
+            dataIndex: 'buildingName',
+            key: 'buildingName',
+            align: 'center',
+
+        },
+        {
+            title: '注册用户',
+            dataIndex: 'newCustomers',
+            key: 'new_customers',
+            align: 'center',
+            sorter: true,
+            render: (text, record) => <Navigate onClick={() => toNewuser(record)}>{text}</Navigate>,
+
+        },
+        {
+            title: '访问人数',
+            dataIndex: 'visitPersons',
+            key: 'visit_persons',
+            align: 'center',
+            sorter: true,
+            render: (text, record) => <Navigate onClick={() => toPersonNum(record)}>{text}</Navigate>,
+
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'visitNum',
+            key: 'visit_num',
+            align: 'center',
+            sorter: true,
+            render: (text, record) => <Navigate onClick={() => toVisitNum(record)}>{text}</Navigate>,
+        },
+    ];
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate) })
+    }
+
+
+    // 提交事件
+    const handleSubmit = e => {
+        e.preventDefault();
+
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                console.log(values, 'values')
+                getList({ pageNum: 1, pageSize: 10, ...values, ...formatDate(startDate, endDate) })
+            }
+        });
+    }
+
+    //   // 重置搜索
+    function handleReset() {
+        props.form.resetFields();
+        setEndDate(new Date())
+        setStartDate(moment().subtract(7, 'day').toDate())
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(moment().subtract(7, 'day').toDate(), new Date()) })
+    }
+
+    function onChangetime(dates, dateStrings) {
+        setEndDate(`${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`)
+        setStartDate(`${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`)
+        // daterange[1] = `${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
+        // daterange[0] = `${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
+
+    }
+
+    const getDataOf = days => {
+
+        setEndDate(new Date())
+        setStartDate(moment().subtract(days, 'day').toDate())
+
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(moment().subtract(days, 'day').toDate(), new Date()) })
+        // userResource({ startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
+    }
+
+    const dateRange = [moment(startDate), moment(endDate)]
+
+    const { getFieldDecorator } = props.form
+    return (
+
+        <>
+            <div style={{ marginBottom: '20px' }}>
+                <span> 渠道{name}总计引进{customerNum}个注册用户</span>
+                <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <Modal
+                title="相关说明"
+                centereds
+                visible={showHelp}
+                footer={null}
+                onCancel={() => setShowHelp(false)}
+            // width="700px"
+            >
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过关联当前渠道的二维码授权手机号的总人数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过关联当前渠道的二维码访问小程序的总人数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过关联当前渠道的二维码访问小程序的总次数</p>
+
+
+            </Modal>
+            <Form layout="inline" style={{ marginBottom: '10px' }} onSubmit={e => handleSubmit(e)}>
+                <Form.Item>
+                    {getFieldDecorator('state', {
+                        initialValue: 'a'
+                    })(
+                        <Radio.Group buttonStyle="solid" defaultValue="a" >
+                            <Radio.Button value="a" onClick={() => getDataOf(7)}>最近7天</Radio.Button>
+                            <Radio.Button value="b" onClick={() => getDataOf(30)}>最近1月</Radio.Button>
+                        </Radio.Group>,
+                    )}
+
+                </Form.Item>
+                {/* <Form.Item>
+                        <RangePicker value={dateRange} onChange={handleDateChange} placeholder={['开始日期', '结束日期']} />
+                    </Form.Item> */}
+                <Form.Item>
+
+                    <RangePicker
+                        ranges={{
+                            Today: [moment(), moment()],
+                            'This Month': [moment().startOf('month'), moment().endOf('month')],
+                        }}
+                        value={dateRange}
+                        onChange={(_dates, dateStrings) => onChangetime(_dates, dateStrings)}
+                        allowClear={false}
+                    />
+
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('buildingId')(
+                        <BuildSelect style={{ width: '200px' }} />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('targetType')(
+                        <QrcodeType all visible />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportExcel}>导出</Button>
+            <Table dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.serialNo} onChange={handleTableChange} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} scroll={{ y: 500 }} />
+            </div>
+        </>
+    )
+}
+const WrappedQrcodelist = Form.create({ name: 'qrcodelist' })(qrcodelist);
+
+export default WrappedQrcodelist

estateagents-admin-manager/src/pages/channel/newCustomer/personNum.jsx

@@ -0,0 +1,120 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '../../../components/AuthButton';
+
+
+const data = [
+    {
+        nickName: '2342',
+        phone: '2342',
+        gender: '2342',
+        province: '2342',
+    },
+]
+
+const dataRecord = props => {
+      const [data, setData] = useState({})
+      const { targetId, targetType, channelId, targetName, buildingId, visitPersons, startDate, endDate } = props.location.query
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    const getList = params => {
+        console.log(params)
+        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} }).then(data => {
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+            align: 'center',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+            align: 'center',
+        },
+        {
+            title: '访问次数',
+            dataIndex: 'visitNum',
+            key: 'visitNum',
+            align: 'center',
+        },
+
+    ]
+
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+
+
+/**
+     * 导出
+     */
+    const exportExcel = () => {
+        // const fieldsValue = getFieldsValue()
+        // console.log('fieldsValue', fieldsValue)
+        request({ ...apis.channelList.personNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} })
+          .then(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()
+          }).catch(() => {
+    
+          })
+      }
+
+    return <>
+        <div>
+            <div>
+                <span>内容{targetName}</span>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div style={{ marginTop: '20px'  }}>
+                <span>访问人数:{visitPersons}</span>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportExcel}>导出</Button>
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records || []} columns={columns} pagination={false} rowKey="activityList" />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+        </div>
+    </>
+}
+
+export default dataRecord

estateagents-admin-manager/src/pages/channel/newCustomer/visitNum.jsx

@@ -0,0 +1,121 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '../../../components/AuthButton';
+
+
+const data = [
+    {
+        nickName: '2342',
+        phone: '2342',
+        gender: '2342',
+        province: '2342',
+    },
+]
+
+const dataRecord = props => {
+    const [data, setData] = useState({})
+    const { targetId, targetType, channelId, targetName, buildingId, visitNum, startDate, endDate } = props.location.query
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    const getList = params => {
+        console.log(params)
+        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
+          console.log(data)
+          setData(data)
+        }).catch(e => {
+          console.log(e)
+        })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+            align: 'center',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+            align: 'center',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+            align: 'center',
+        },
+        {
+            title: '访问时间',
+            dataIndex: 'visitDate',
+            key: 'visitDate',
+            align: 'center',
+        },
+
+    ]
+
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+
+
+/**
+     * 导出
+     */
+    const exportExcel = () => {
+        // const fieldsValue = getFieldsValue()
+        // console.log('fieldsValue', fieldsValue)
+        request({ ...apis.channelList.visitNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
+          .then(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()
+          }).catch(() => {
+    
+          })
+      }
+
+    return <>
+        <div>
+            <div>
+                <span>内容:{targetName}</span>
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
+                    返回
+               </Button>
+            </div>
+            <div style={{ marginTop: '20px'  }}>
+                <span>访问次数:{visitNum}</span>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportExcel}>导出</Button>
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records || []} columns={columns} pagination={false} rowKey="activityList" />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+        </div>
+    </>
+}
+
+export default dataRecord

estateagents-admin-manager/src/pages/channel/recommendClients.jsx

@@ -0,0 +1,172 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Avatar } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+function handleChange(value) {
+  console.log(`selected ${value}`);
+}
+
+
+const menu = (
+  <Menu onClick={handleMenuClick}>
+    <Menu.Item key="1">
+      <Icon type="user" />
+      1st menu item
+    </Menu.Item>
+    <Menu.Item key="2">
+      <Icon type="user" />
+      2nd menu item
+    </Menu.Item>
+    <Menu.Item key="3">
+      <Icon type="user" />
+      3rd item
+    </Menu.Item>
+  </Menu>
+);
+// const dataSource = [
+//   {
+//     key: '1',
+//     img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+//     name: '123',
+//     age: 32,
+//     address: '西湖区湖底公园1号',
+//   },
+//   {
+//     key: '2',
+//     img: '',
+//     age: 42,
+//     address: '西湖区湖底公园1号',
+//   },
+// ];
+
+const columns = [
+  {
+    title: '头像',
+    // dataIndex: 'img',
+    // key: 'img',
+    align: 'center',
+
+    render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+    render: (text, record) => <div>{record.name}</div>,
+  },
+  {
+    title: '电话',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    render: (text, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>
+  },
+  {
+    title: '意向项目',
+    dataIndex: 'intention',
+    key: 'intention',
+    align: 'center',
+  },
+  {
+    title: '推荐时间',
+    dataIndex: 'createDate',
+    key: 'createDate',
+    align: 'center',
+    render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center',
+    // eslint-disable-next-line consistent-return
+    render: (text, records) => {
+      //    if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+      // if (records.status === 2) { return '到访' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { return '待审核' }
+      // if (records.verifyStatus === 2) { return '审核同意' }
+      // if (records.verifyStatus === 3) { return '签约' }
+      // if (records.status === 1) { return '报备' }
+      // if (records.status === 2) { return '推荐' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { 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.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 '签约' }
+    }
+  },
+];
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getListRecommend({ pageNumber: 1, pageSize: 10 })
+  }, [])
+
+  // function getListRecommend(params) {
+  //   request({
+  //     url: `api/admin/customer/recommend/${props.location.query.id}`,
+  //     method: 'GET',
+  //     params: { ...params },
+  // // eslint-disable-next-line no-shadow
+  // }).then(data => {
+  //     console.log(data)
+  //     setData(data)
+  // })
+  // }
+
+  function getListRecommend(params) {
+    request({ ...apis.channelList.getListRecommend, urlData: { id: props.location.query.id }, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getListRecommend({ pageNumber: pageNum, pageSize: 10 })
+  }
+  return (
+    <>
+      <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    </>
+  )
+}
+
+function handleMenuClick(e) {
+  message.info('Click on menu item.');
+  console.log('click', e);
+}
+export default header

estateagents-admin-manager/src/pages/charts/CityNums.jsx

@@ -0,0 +1,138 @@
+import React, { useState, useEffect } from 'react';
+import Echart from '../../components/EchartsTest/EChart';
+import { fetch, apis } from '@/utils/request';
+
+const geoOptions = {
+  backgroundColor: '#fff',
+  title: {
+    text: '城市分布',
+    subtext: '数据会存在一定时间延迟',
+    left: 40,
+    top: 40
+  },
+  tooltip : {
+      trigger: 'item',
+      formatter: (params) => {
+        return `${params.data.name}: ${params.data.value[2]}`
+      }
+  },
+  geo: {
+      map: 'china',
+      roam: true,
+      zoom: 1.2,
+      label: {
+        normal: {
+          show: true,
+          color: '#aaa',
+        },
+        emphasis: {
+          show: true
+        }
+      },
+      itemStyle: {
+          normal: {
+              areaColor: '#f3f3f3',
+              borderColor: '#ddd'
+          },
+          emphasis: {
+              areaColor: '#eee'
+          }
+      }
+  },
+}
+
+const getCityData = fetch(apis.indexEcharts.personCity)
+
+const mapDataRange = x => {
+  // 映射区间 [1, 100000] => [rangeStart, rangeEnd]
+  const min = 1
+  const max = 100000
+  const rangeStart = 16
+  const rangeEnd = 24
+
+  return rangeStart + (x - min) * (rangeEnd - rangeStart) / (max - min)
+}
+
+const CityNums = (props) => {
+  const [data, setData]= useState([])
+
+  useEffect(() => {
+    getCityData().then(response => {
+      const { selectCityUser = [] } = response || {}
+      const data = selectCityUser.map((item) => {
+        return {
+          name: item.name,
+          value: [item.lng - 0, item.lat - 0, item.cityCount]
+        }
+      })
+      setData(data)
+    })
+  }, [])
+
+  const options = {
+    ...geoOptions,
+    series: [
+      {
+        name: '人数',
+        type: 'scatter',
+        coordinateSystem: 'geo',
+        data,
+        symbolSize: 10,
+        label: {
+            normal: {
+                formatter: '{b}',
+                position: 'right',
+                show: false
+            },
+            emphasis: {
+                show: true
+            }
+        },
+        itemStyle: {
+            normal: {
+                color: '#DB3C4B'
+            }
+        }
+      },
+      {
+          name: '前三',
+          type: 'effectScatter',
+          coordinateSystem: 'geo',
+          data: data.sort(function (a, b) {
+              return b.value[2] - a.value[2];
+          }).slice(0, 3),
+          symbolSize: function (val) {
+              return mapDataRange(val[2]);
+          },
+          showEffectOn: 'render',
+          rippleEffect: {
+              brushType: 'stroke'
+          },
+          hoverAnimation: true,
+          label: {
+              normal: {
+                  formatter: '{b}',
+                  position: 'right',
+                  show: false
+              }
+          },
+          itemStyle: {
+              normal: {
+                  color: '#DB3C4B',
+                  shadowBlur: 10,
+                  shadowColor: '#333'
+              }
+          },
+          zlevel: 1
+      }
+    ],
+  }
+
+  return (
+    <div style={{ marginBottom:'40px', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+      <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
+    </div>
+  )
+}
+
+export default CityNums;

estateagents-admin-manager/src/pages/customer/customerlist/components/BatchAssistConsultant.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/components/assistConsultant.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/components/attribution.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/components/changeStatus.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/components/integralRecord.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/components/recommend.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/customerDetail.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/index.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/publicCustomerDetail.jsx

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

estateagents-admin-manager/src/pages/customer/customerlist/publicStyle.less

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

estateagents-admin-manager/src/pages/customer/customerlist/style.css

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

estateagents-admin-manager/src/pages/customer/customerlist/style.less

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

estateagents-admin-manager/src/pages/customer/customerlist/style.wxss

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

estateagents-admin-manager/src/pages/customer/drift/index.jsx

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

estateagents-admin-manager/src/pages/customer/drift/style.less

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

estateagents-admin-manager/src/pages/customer/visiting/index.jsx

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

estateagents-admin-manager/src/pages/customer/visiting/style.less

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

estateagents-admin-manager/src/pages/eContract/businessConfig/add.jsx

@@ -0,0 +1,193 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect2 from '../../../components/SelectButton/BuildSelect2'
+import LivePlatSelect from '../../../components/SelectButton/LivePlatSelect'
+import CitySelect3 from '../../../components/SelectButton/CitySelect3'
+import ImageUpload from '../../../components/XForm/ImageUpload'
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import SelectContractTemp from './components/SelectContractTemp';
+import SelectRaise from './components/SelectRaise';
+import SelectCompany from './components/SelectCompany';
+import SelectSeal from './components/SelectSeal';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+let cityId = ''
+let contractTemplateName = ''
+let targetName = ''
+
+const header = props => {
+  const { salesBatchId } = props.location.query
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+
+  // const [targetName, setTargetName] = useState({})
+  const [companyName, setCompanyName] = useState({})
+  // const [contractTemplateName, setContractTemplateName] = useState('')
+  const [contractTemplateLink, setContractTemplateLink] = useState('')
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/eContract/businessConfig/list',
+    });
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+    if(contractTemplateLink){
+     window.open(contractTemplateLink);
+    }else{
+      message.info('请选择合同模板');
+    }
+ }
+
+  function highlightsTypeChange(e) {
+    setTypeState(e.target.value)
+  }
+
+  function disabledDate(current) {
+    // Can not select days before today and today
+    return current && current < moment().endOf('day');
+  }
+
+  function companyOnSuccess(e){
+    console.log(e)
+    setCompanyName(e)
+  }
+
+  function contractOnSuccess(e){
+    contractTemplateName = e.name
+    request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: e.id} }).then((data) => {
+      setContractTemplateLink(data.contractTemplateAddress)
+    })
+  }
+
+  function targetOnSuccess(e){
+    console.log('targetOnSuccess', e)
+    targetName = e
+    console.log('targetOnSuccess', targetName)
+  }
+
+  function sealOnSuccess(e){
+    console.log('sealOnSuccess', e)
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log(values)
+      if (!err){
+        request({ ...apis.taEcontract.addTaContractBusiness, data: { ...values },}).then((data) => {
+          message.info("保存成功")
+          router.push({
+            pathname: '/eContract/businessConfig/list',
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="合同标题">
+          {getFieldDecorator('contractTemplateId', {
+            rules: [{ required: true, message: ' 请选择合同模板' }],
+          })(<SelectContractTemp  onSuccess={e => contractOnSuccess(e)}/>)}
+          {getFieldDecorator('contractTemplateName')(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="合同文件">
+          {getFieldDecorator('contractTemplate')}<Button type="danger" style={{marginRight:'20px'}} onClick={openIndexImg}>查看文件</Button>
+        </Form.Item>
+        <Form.Item label="关联业务类型"> 
+          {getFieldDecorator('targetType', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="关联业务类型" style={{ width: '400px' }}>
+            <Option value="raise">房源认筹</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="关联业务">
+          {getFieldDecorator('targetId', {
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<SelectRaise targetType={props.form.getFieldValue('targetType')} onSuccess={e => targetOnSuccess(e)}/>)}
+          {getFieldDecorator('targetName', {initialValue:targetName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方" help="系统会在业务需要时自动签所选企业印章，比如用户在签署认筹合同前系统会自动签署企业印章。">
+          {getFieldDecorator('companyId', {
+            rules: [{ required: true, message: ' 请选择关联企业' }],
+          })(<SelectCompany onSuccess={e => companyOnSuccess(e)}/>)}
+          {getFieldDecorator('companyName', {initialValue:companyName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方印章" style={{marginTop:'20px'}}>
+          {getFieldDecorator('sealId', {
+            rules: [{ required: true, message: ' 请选择企业印章' }],
+          })(<SelectSeal companyId={props.form.getFieldValue('companyId')} onSuccess={e => sealOnSuccess(e)}/>)}
+        </Form.Item>
+        <Form.Item label="甲方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('signatoryKeywords', {
+            rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="甲方关键字签章策略" style={{marginTop:'20px'}}> 
+          {getFieldDecorator('signatoryStrategy', {
+              rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
+            })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="2">最后一个关键字签章</Option>
+            <Option value="0">所有关键字签章</Option>
+            <Option value="1">第一个关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="乙方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('customerKeywords', {
+            rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="乙方关键字签章策略" style={{marginTop:'20px'}}> 
+          {getFieldDecorator('customerStrategy', {
+              rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
+            })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="2">最后一个关键字签章</Option>
+            <Option value="0">所有关键字签章</Option>
+            <Option value="1">第一个关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="发布状态"> 
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '400px' }}>
+            <Option value='0'>否</Option>
+            <Option value='1'>是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/components/SelectCompany.jsx

@@ -0,0 +1,192 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, Pagination } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+
+const { Column, ColumnGroup } = Table;
+const { Search } = Input;
+const SelectContractTemp = props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [dataInfo, setDataInfo] = useState({ list: [], total: 0 });
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '甲方企业' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.companyId == val)[0] || {}).companyName || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taCompanyList, params: { ...params } }).then((data) => {
+      setList(data.records || [])
+      setDataInfo(data)
+      updateGroup(buildingId ? undefined : value);
+    })
+  }
+
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val.id)
+    onChange(val.id)
+    setVisible(false)
+    props.onSuccess(val.name);
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, companyName: values.companyName, companyCode: values.companyCode })
+      }
+    });
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const clearVal = val => {
+    onChange(val)
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+    const newWin=window.open('about:blank');
+    newWin.location.href="https://easydoc.xyz/s/24703398/3SqDkJDw/F8szOMk0"
+  }
+
+  const columns = [
+    {
+      title: '企业名称',
+      dataIndex: 'companyName',
+      key: 'companyName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '企业编号',
+      dataIndex: 'companyCode',
+      key: 'companyCode',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '实名认证状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      ellipsis: true,
+      render: (status) => <span>{status === 0 ? '未认证' : status === 1 ? "管理员资料已提交" : status === 2 ? "企业基本资料（没有申请表）已提交" : status === 3 ? "已提交待审核" : 
+      status === 4 ? '审核通过' : status === 5 ? "审核不通过" : status === 6 ? "人工初审通过" : "" }</span>,
+    },
+    {
+      title: '印章数',
+      dataIndex: 'sealNum',
+      key: 'sealNum',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '自动签章授权状态',
+      dataIndex: 'authorizeStatus',
+      key: 'authorizeStatus',
+      align: 'center',
+      ellipsis: true,
+      render: (authorizeStatus) => <span>{authorizeStatus === '3000' ? '已授权' : '未授权' }</span>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          {record.sealNum >0 && record.authorizeStatus === '3000' && <Navigate onClick={() => setData({id:record.companyId, name:record.companyName})}>选择</Navigate>}
+        </span>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+
+  return (
+    <div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>选择关联企业</Navigate></div>
+      <Modal
+        title="选择关联企业"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+        width={1500}
+      >
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('companyName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="企业名称"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('companyCode')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="企业编号"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <span style={{color:'#999'}}>可选企业必须已认证通过、已上传印章且授权了自动签章。</span><Navigate onClick={openIndexImg}>查看电子合同接入手册</Navigate>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} pagination={false} />
+      <Pagination defaultCurrent={1} total={dataInfo.total} onChange={e => changePageNum(e)} current={dataInfo.current}/>
+      </Modal>
+    </div>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/components/SelectContractTemp.jsx

@@ -0,0 +1,157 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon ,Pagination} from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+
+const { Column, ColumnGroup } = Table;
+const { Search } = Input;
+const SelectContractTemp = props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [dataInfo, setDataInfo] = useState({ list: [], total: 0 });
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.contractTemplateId == val)[0] || {}).contractTemplateName || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taContractTemplateList, params: { ...params } }).then((data) => {
+      setList(data.records)
+      setDataInfo(data)
+      updateGroup(buildingId ? undefined : value);
+    })
+  }
+
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val.id)
+    onChange(val.id)
+    setVisible(false)
+    props.onSuccess(val);
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, contractTemplateName:values.contractTemplateName })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const clearVal = val => {
+    onChange(val)
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const columns = [
+    {
+      title: '合同编号',
+      dataIndex: 'contractTemplateId',
+      key: 'contractTemplateId',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '合同标题',
+      dataIndex: 'contractTemplateName',
+      key: 'contractTemplateName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '新增时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      ellipsis: true,
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData({id:record.contractTemplateId, name:record.contractTemplateName})}>选择</Navigate>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+
+  return (
+    <div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>选择合同模板</Navigate></div>
+      <Modal
+        title="选择合同模板"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+        width='1000px'
+      >
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('contractTemplateName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="合同标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} pagination={false} />
+      <Pagination defaultCurrent={1} total={dataInfo.total} onChange={e => changePageNum(e)} current={dataInfo.current}/>
+      </Modal>
+    </div>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/components/SelectRaise.jsx

@@ -0,0 +1,186 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, Pagination } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+
+const { Column, ColumnGroup } = Table;
+const { Search } = Input;
+const SelectContractTemp = props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [dataInfo, setDataInfo] = useState({ list: [], total: 0 });
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '关联业务' })
+
+  const targetType = props.targetType;
+  
+  const getGroupTitle = val => {
+    return (list.filter(x => x.raiseId == val)[0] || {}).salesBatchName || '请选择业务类型'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, status: 1 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.house.taRaiseList, params: { ...params } }).then((data) => {
+      setList(data.records || [])
+      setDataInfo(data)
+      updateGroup(buildingId ? undefined : value);
+    })
+  }
+
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, status: 1, ...props.form.getFieldsValue() })
+  }
+  const setData = val => {
+    updateGroup(val.id)
+    onChange(val.id)
+    setVisible(false)
+    props.onSuccess(val.name);
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, buildingId:values.buildingId, salesBatchName:values.salesBatchName })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const clearVal = val => {
+    onChange(val)
+  }
+
+  const columns = [
+    {
+      title: '销售批次名',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchName',
+      align: 'center',
+    },
+    {
+      title: '楼盘名称',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '认筹开始时间',
+      dataIndex: 'raiseStartTime',
+      key: 'raiseStartTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseStartTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '认筹结束时间',
+      dataIndex: 'raiseEndTime',
+      key: 'raiseEndTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseEndTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '锁房方式',
+      dataIndex: 'houseLockingType',
+      key: 'houseLockingType',
+      align: 'center',
+      render: (x, row) => <><span>{row.houseLockingType == 'auto' ? "自动锁房" : "手动锁房"}</span></>,
+    },
+    {
+      title: '缴费方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center',
+      render: (x, row) => <><span>{row.payType == 'offLine' ? "线下缴费" : row.payType == 'onLine' ? "线上缴费" : "线上缴费，线下缴费"}</span></>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData({id:record.raiseId, name:record.salesBatchName})}>选择</Navigate>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+
+  return (
+    <div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>{targetType != undefined && '选择关联业务'}</Navigate></div>
+      <Modal
+        title="选择关联业务"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+        width={900}
+      >
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('salesBatchName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="销售批次名"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <span style={{color:'#AAAAAA'}}>仅显示已发布的销售批次对应的认筹</span>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} pagination={false}/>
+      <Pagination defaultCurrent={1} total={dataInfo.total} onChange={e => changePageNum(e)} current={dataInfo.current}/>
+      </Modal>
+    </div>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/components/SelectSeal.jsx

@@ -0,0 +1,168 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, Avatar, Pagination } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+
+const { Column, ColumnGroup } = Table;
+const { Search } = Input;
+const SelectContractTemp = props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [dataInfo, setDataInfo] = useState({ list: [], total: 0 });
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.sealId == val)[0] || {}).sealImg || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const companyId = props.companyId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [companyId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taCompanySealList, params: { ...params, companyId:companyId } }).then((data) => {
+      setList(data.records || [])
+      setDataInfo(data)
+      updateGroup(companyId ? undefined : value);
+    })
+  }
+
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val.id)
+    onChange(val.id)
+    setVisible(false)
+    props.onSuccess(val.name);
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, sealName:values.sealName })
+      }
+    });
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const clearVal = val => {
+    onChange(val)
+  }
+
+  const columns = [
+    {
+      title: '印章编号',
+      dataIndex: 'sealId',
+      key: 'sealId',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '印章名称',
+      dataIndex: 'sealName',
+      key: 'sealName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '印章图',
+      dataIndex: 'sealImg',
+      key: 'sealImg',
+      align: 'center',
+      ellipsis: true,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} src={record.sealImg} size={64} icon="user" />,
+    },
+    {
+      title: '印章上传时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      ellipsis: true,
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData({id:record.sealId, name:record.sealName})}>选择</Navigate>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+
+  return (
+    <div>
+      <div>
+        <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} src={group.groupName} size={54} icon="user" />
+  <a style={{marginLeft:'30px', color: '#1D74D9' }} onClick={() => setVisible(true)}>{companyId != undefined && '选择企业印章'}</a>
+      </div>
+      <Modal
+        title="选择企业印章"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+        width={900}
+      >
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sealName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="印章名称"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} pagination={false} />
+      <Pagination defaultCurrent={1} total={dataInfo.total} onChange={e => changePageNum(e)} current={dataInfo.current}/>
+      </Modal>
+    </div>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/detail.jsx

@@ -0,0 +1,207 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect2 from '../../../components/SelectButton/BuildSelect2'
+import LivePlatSelect from '../../../components/SelectButton/LivePlatSelect'
+import CitySelect3 from '../../../components/SelectButton/CitySelect3'
+import ImageUpload from '../../../components/XForm/ImageUpload'
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import SelectContractTemp from './components/SelectContractTemp';
+import SelectRaise from './components/SelectRaise';
+import SelectCompany from './components/SelectCompany';
+import SelectSeal from './components/SelectSeal';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+  const contractBusinessId = props.location.query.id
+  const [ contractBusinessData, setContractBusinessData ] = useState({})
+
+  const [targetName, setTargetName] = useState({})
+  const [companyName, setCompanyName] = useState({})
+  const [contractTemplateName, setContractTemplateName] = useState({})
+  const [contractTemplateLink, setContractTemplateLink] = useState('')
+
+  if(contractBusinessId){
+    useEffect(() => {
+      getContractBusinessData(contractBusinessId);
+    },[])
+
+  // 查询列表
+  const getContractBusinessData = (contractBusinessId) => {
+    request({ ...apis.taEcontract.taContractBusinessById, urlData: {id: contractBusinessId} }).then((data) => {
+        setContractBusinessData(data)
+        request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: data.contractTemplateId} }).then((data) => {
+          setContractTemplateLink(data.contractTemplateAddress)
+        })
+    }) 
+  }
+  }
+
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/eContract/businessConfig/list',
+    });
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+     if(contractTemplateLink){
+      window.open(contractTemplateLink);
+     }else{
+       message.info('请选择合同模板');
+     }
+  }
+
+  function highlightsTypeChange(e) {
+    setTypeState(e.target.value)
+  }
+
+  function disabledDate(current) {
+    return current && current < moment().endOf('day');
+  }
+
+  function companyOnSuccess(e){
+    console.log(e)
+    setCompanyName(e)
+  }
+
+  function contractOnSuccess(e){
+    console.log('contractOnSuccess', e)
+    setContractTemplateName(e.name)
+    request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: e.id} }).then((data) => {
+      setContractTemplateLink(data.contractTemplateAddress)
+      console.log(contractTemplateLink,'dddddddddd')
+    })
+  }
+
+  function targetOnSuccess(e){
+    console.log('targetOnSuccess', e)
+    setTargetName(e)
+  }
+
+  function sealOnSuccess(e){
+    console.log('sealOnSuccess', e)
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.taEcontract.updateTaContractBusinessById, urlData: {id: contractBusinessId}, data: { ...values },}).then((data) => {
+          message.info("保存成功")
+          router.push({
+            pathname: '/eContract/businessConfig/list',
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="合同标题">
+          {getFieldDecorator('contractTemplateId', {initialValue:contractBusinessData.contractTemplateId,
+            rules: [{ required: true, message: ' 请选择合同模板' }],
+          })(<SelectContractTemp  onSuccess={e => contractOnSuccess(e)}/>)}
+          {getFieldDecorator('contractTemplateName', {initialValue:contractBusinessData.contractTemplateName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="合同文件">
+          {getFieldDecorator('contractTemplateId')}<Button type="danger" style={{marginRight:'20px'}} onClick={openIndexImg}>查看文件</Button>
+        </Form.Item>
+        <Form.Item label="关联业务类型"> 
+          {getFieldDecorator('targetType', {initialValue:contractBusinessData.targetType,
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="关联业务类型" style={{ width: '400px' }}>
+            <Option value="raise">房源认筹</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="关联业务">
+          {getFieldDecorator('targetId', {initialValue:contractBusinessData.targetId,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<SelectRaise targetType={props.form.getFieldValue('targetType')} onSuccess={e => targetOnSuccess(e)}/>)}
+          {getFieldDecorator('targetName', {initialValue:contractBusinessData.targetName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方" help="系统会在业务需要时自动签所选企业印章，比如用户在签署认筹合同前系统会自动签署企业印章。">
+          {getFieldDecorator('companyId', {initialValue:contractBusinessData.companyId,
+            rules: [{ required: true, message: ' 请选择关联企业' }],
+          })(<SelectCompany onSuccess={e => companyOnSuccess(e)}/>)}
+          {getFieldDecorator('companyName', {initialValue:contractBusinessData.companyName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方印章" style={{marginTop:'20px'}}>
+          {getFieldDecorator('sealId', {initialValue:contractBusinessData.sealId,
+            rules: [{ required: true, message: ' 请选择企业印章' }],
+          })(<SelectSeal companyId={props.form.getFieldValue('companyId')} onSuccess={e => sealOnSuccess(e)}/>)}
+        </Form.Item>
+        <Form.Item label="甲方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('signatoryKeywords', {initialValue:contractBusinessData.signatoryKeywords,
+            rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="甲方关键字签章策略" style={{marginTop:'20px'}}> 
+          {getFieldDecorator('signatoryStrategy', {initialValue:contractBusinessData.signatoryStrategy,
+              rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
+            })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="2">最后一个关键字签章</Option>
+            <Option value="0">所有关键字签章</Option>
+            <Option value="1">第一个关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="乙方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('customerKeywords', {initialValue:contractBusinessData.customerKeywords,
+            rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="乙方关键字签章策略" style={{marginTop:'20px'}}> 
+          {getFieldDecorator('customerStrategy', {initialValue:contractBusinessData.customerStrategy,
+              rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
+            })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="2">最后一个关键字签章</Option>
+            <Option value="0">所有关键字签章</Option>
+            <Option value="1">第一个关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {initialValue:contractBusinessData.status,
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value={0}>否</Option>
+            <Option value={1}>是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/businessConfig/list.jsx

@@ -0,0 +1,277 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import styles from '../../style/GoodsList.less';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Navigate from '@/components/Navigate';
+
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+  const sampleId  = props.location.query.id;
+  const sampleName = props.location.query.sampleName;
+  const [data, setData] = useState({})
+  const [demend, setDemend] = useState({})
+  const [contractBusinessList, setContractBusinessList] = useState([])
+  const [contractBusinessIndexList, setContractBusinessIndexList] = useState([])
+  const [batchDel, setBatchDel] = useState({visable:false,demandIds:''})
+  const [addDemand, setAddDemand] = useState({visable:false})
+
+  useEffect(() => {
+    if(sampleId){
+      getList({ pageNum: 1, pageSize: 10, sampleId: sampleId });
+    }else{
+      getList({ pageNum: 1, pageSize: 10});
+    }
+    
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    console.log(params);
+    request({ ...apis.taEcontract.taContractBusinessList, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/eContract/businessConfig/detail',
+      query: {
+        id: rowData.contractBusinessId,
+      },
+    });
+      return
+    }
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '合同标题',
+      dataIndex: 'contractTemplateName',
+      key: 'contractTemplateName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toDetail(row)}>{row.contractTemplateName}</Navigate>,
+    },
+    {
+      title: '关联业务类型',
+      dataIndex: 'targetType',
+      key: 'targetType',
+      align: 'center',
+      render: (x, row) => <><span>{row.targetType === 'raise' ? '房源认筹' : ''}</span></>
+    },
+    {
+      title: '关联业务标题',
+      dataIndex: 'targetName',
+      key: 'targetName',
+      align: 'center',
+    },
+    {
+      title: '甲方',
+      dataIndex: 'companyName',
+      key: 'companyName',
+      align: 'center',
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (text, records) => {
+        if (records.status === 1) { return '是' }
+        if (records.status === 0) { return '否' }
+      },
+    },
+    {
+      title: '新增时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateDate',
+      key: 'updateDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((text, record) => [
+        <AuthButton name="admin.eContractBusiness.detail.get" noRight={null}>
+           <EditIcon text="查看详情" type="look" onClick={toDetail(record)} />
+          {/* <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a> */}
+        </AuthButton>,
+      ])
+    },
+  ];
+  
+  const rowSelection = {
+    selectedRowKeys: contractBusinessIndexList,
+    onChange: (selectedRowKeys, selectedRows) => {
+      setContractBusinessList(selectedRows)
+      setContractBusinessIndexList(selectedRowKeys)
+    },
+  };
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  function showBatchDel(e){
+  
+    if (demandIds.length <= 0){
+      message.info("请选择数据");
+      return;
+    }
+    setBatchDel(e);
+    if(!e.visable){
+      getList()
+    }
+  }
+
+  function batchDelTaContractBusiness(){
+    console.log(contractBusinessList)
+    if (contractBusinessList.length <= 0){
+      message.info('请至少选择一条数据')
+      return;
+    }
+    Modal.confirm({
+      title: '确认将所选的' + contractBusinessList.length + '条业务配置删除？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.taEcontract.batchDelTaContractBusiness, data: {contractBusinessList} }).then((data) => {
+          message.info('操作成功！')
+          setContractBusinessIndexList([])
+          getList({ pageNum: 1, pageSize: 10 })
+        }).catch((err) => {
+          console.log('111111', err)
+        })
+      }
+    });
+  }
+
+  function addContractManage(){
+    router.push({
+      pathname: '/eContract/businessConfig/add',
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('contractName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="合同标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('targetType')(
+            <Select style={{ width: '180px' }} placeholder="业务类型">
+                <option value="">全部</option>
+                <option value="raise">房源认筹</option>
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('targetName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="业务标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('companyName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="甲方"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="发布状态">
+                <option value="">全部</option>
+                <option value='1'>是</option>
+                <option value='0'>否</option>
+            </Select>
+          )}
+        </Form.Item>
+        
+        <Form.Item>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                    搜索
+                </Button>
+            </AuthButton>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                        重置
+                </Button>
+            </AuthButton>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.eContractBusiness.add.post" noRight={null}>
+        <Button type="danger" onClick={() => addContractManage()} className={styles.addBtn}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.eContractBusiness.del" noRight={null}>
+        <Button type="primary" onClick={() => batchDelTaContractBusiness()} className={styles.addBtn} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Table rowSelection={rowSelection}
+        style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/manage/edit.jsx

@@ -0,0 +1,141 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import Styles from './styles.less';
+import router from 'umi/router';
+import moment from 'moment';
+
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+
+import AuthButton from '@/components/AuthButton';
+
+
+const header = props => {
+
+    const id = props.location.query.id
+
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+
+        getList(id);
+
+
+    }, [])
+
+    const getList = (id) => {
+        request({ ...apis.manage.detail, urlData: { id: id } }).then((data) => {
+            setData(data)
+        })
+    }
+
+    const onArchives = () => {
+        request({
+            ...apis.manage.archives,
+            urlData: { id: id },
+            data: { contractId: parseInt(id), archives: true }
+        }).then((data) => {
+            setData(data)
+            message.info("归档成功")
+
+        })
+    }
+
+    const datas = [
+        {
+            name: "合同标题",
+            value: data.contractName
+        },
+        {
+            name: "关联业务类型",
+            value: data.targetType,
+            render: () => <><span>{data.targetType == "raise" ? "房源认筹" : ""}</span></>,
+        },
+        {
+            name: "关联业务",
+            value: data.targetName
+
+        },
+        {
+            name: "关联单据类型",
+            value: data.invoiceTargetType,
+            render: () => <><span>{data.invoiceTargetType == "raise_record" ? "认筹单" : ""}</span></>,
+        },
+        {
+            name: "关联单据编号",
+            value: data.invoiceTargetId
+        },
+        {
+            name: "甲方名称",
+            value: data.signatoryName,
+
+        },
+        {
+            name: "甲方签署时间",
+            value: data.signatoryTime,
+            render: <><span>{data.signatoryTime ? moment(data.signatoryTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+        {
+            name: "乙方名称",
+            value: data.customerName
+        },
+        {
+            name: "乙方手机号",
+            value: data.customerTel
+        },
+        {
+            name: "乙方身份证号",
+            value: data.customerIdcard
+        },
+        {
+            name: "乙方签署时间",
+            value: data.customerTime,
+            render: <><span>{data.customerTime ? moment(data.customerTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+        {
+            name: "已签署合同",
+            // value:data.,
+            render: (x, row) => <><a type="button" className={Styles.btn} href={data.contractViewUrl} target="_blank">查看合同</a> <a href={data.contractDownloadUrl} download="234.pdf" style={{ color: '#1D74D9', marginLeft: '30px' }}>下载合同</a> </>
+        },
+        {
+            name: "是否归档",
+            value: data.archives,
+            render: (x, row) => <><span>{data.archives ? '是' : '否'}</span>{!data.archives && <a onClick={() => onArchives(data.contractId)} style={{ color: '#1D74D9', marginLeft: '30px' }}>归档</a>}  </>
+        },
+        {
+            name: "归档时间",
+            value: data.archivesTime,
+            render: <><span>{data.archivesTime ? moment(data.archivesTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+    ]
+
+
+    return (
+
+        <>
+            <div align="right"><Button onClick={() => router.go(-1)}>返回</Button></div>
+
+            {datas.map((x) => {
+                return <Row style={{ margin: '20px 0' }}>
+                    <Col span={5} className={Styles.title} align="right" >
+                        {x.name}
+                    </Col>
+                    <Col span={9} offset={2} className={Styles.text}>
+                        {
+                            x.render ? typeof x.render === 'function' ? x.render(props) : x.render : x.value
+                        }
+                    </Col>
+                    <Col span={2} offset={4}>
+                    </Col>
+                </Row>
+            })}
+        
+
+        </>
+    )
+}
+
+
+export default header

estateagents-admin-manager/src/pages/eContract/manage/list.jsx

@@ -0,0 +1,248 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Table, Pagination, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Navigate from '@/components/Navigate';
+
+
+const { RangePicker } = DatePicker;
+
+const header = props => {
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.manage.list, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // 跳转到编辑
+  const toDetail = id => () => {
+    if (id) {
+      router.push({
+        pathname: '/eContract/manage/edit',
+        query: {
+          id,
+        },
+      });
+
+    }
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '合同标题',
+      dataIndex: 'contractName',
+      key: 'contractName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toDetail(row.contractId)}>{row.contractName}</Navigate>,
+    },
+    {
+      title: '甲方名称',
+      dataIndex: 'signatoryName',
+      key: 'signatoryName',
+      align: 'center',
+
+    },
+    {
+      title: '甲方是否签署',
+      align: 'center',
+      render: (x, row) => <><span>{row.signatoryTime ? '是' : '否'}</span></>
+    },
+    {
+      title: '甲方签署时间',
+      dataIndex: 'signatoryTime',
+      key: 'signatoryTime',
+      align: 'center',
+      render: (x, row) => <><span>{row.signatoryTime ? `${moment(row.signatoryTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
+    {
+      title: '乙方名称',
+      dataIndex: 'customerName',
+      key: 'customerName',
+      align: 'center',
+
+    },
+    {
+      title: '乙方是否签署',
+      align: 'center',
+      render: (x, row) => <><span>{row.customerTime ? '是' : '否'}</span></>
+
+    },
+    {
+      title: '乙方签署时间',
+      dataIndex: 'customerTime',
+      key: 'customerTime',
+      align: 'center',
+      render: (x, row) => <><span>{row.customerTime ? `${moment(row.customerTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
+    {
+      title: '是否归档',
+      dataIndex: 'archives',
+      key: 'archives',
+      align: 'center',
+      render: (x, row) => <><span>{row.archives ? '是' : '否'}</span></>
+
+    },
+    {
+      title: '归档时间',
+      dataIndex: 'archivesTime',
+      key: 'archivesTime',
+      align: 'center',
+      render: (x, row) => <><span>{row.archivesTime ? `${moment(row.archivesTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((text, record) => [
+        <AuthButton name="admin.eContractManager.detail.get" noRight={null}>
+          <EditIcon text="查看详情" type="look" onClick={toDetail(record.contractId)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setDemandIds(selectedRows)
+    },
+  };
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        const { archivesDate, ...submitValue } = values
+        if (null != archivesDate && archivesDate.length > 0) {
+          const [archivesStartDate, archivesEndDate] = archivesDate
+          submitValue.archivesStartDate = moment(archivesStartDate).format('YYYY-MM-DD');
+          submitValue.archivesEndDate = moment(archivesEndDate).format('YYYY-MM-DD');
+        }
+        console.log(submitValue)
+        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('contractName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="合同标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('signatoryName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入甲方名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('customerName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入乙方名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('signatoryStatus')(
+            <Select style={{ width: '180px' }} placeholder="甲方是否签署">
+              <option value="">全部</option>
+              <option value="1">是</option>
+              <option value="0">否</option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('customerStatus')(
+            <Select style={{ width: '180px' }} placeholder="乙方是否签署">
+              <option value="">全部</option>
+              <option value="1">是</option>
+              <option value="0">否</option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('archives')(
+            <Select style={{ width: '180px' }} placeholder="是否归档">
+              <option value="">全部</option>
+              <option value="1">是</option>
+              <option value="0">否</option>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+
+          {getFieldDecorator('archivesDate')(
+            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+                </Button>
+          </AuthButton>
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+                </Button>
+          </AuthButton>
+        </Form.Item>
+      </Form>
+
+
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/manage/styles.less

@@ -0,0 +1,44 @@
+.title {
+    height     : 45px;
+    font-size  : 16px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color      : rgba(102, 102, 102, 1);
+    line-height: 45px;
+   
+}
+.text {
+    font-size  : 16px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    // font-weight: 400;
+    color      : rgba(51, 51, 51, 1);
+    line-height: 45px;
+}
+
+.btn {
+    width        : 140px;
+    height       : 45px;
+    background   : rgba(255, 126, 72, 1);
+    border-radius: 7px;
+    line-height  : 43px;
+    font-size    : 20px;
+    font-family  : PingFangSC-Regular, PingFang SC;
+    font-weight  : 400;
+    color        : rgba(255, 255, 255, 1);
+    text-align: center;
+}
+.btn:hover{
+    color        : rgba(255, 255, 255, 1);
+}
+
+.rebtn {
+    width:140px;
+    height:45px;
+    background:rgba(255,255,255,1);
+    border-radius:7px;
+    border:1px solid rgba(156,156,156,1);
+    font-size:20px;
+font-weight:400;
+color:rgba(102,102,102,1);
+line-height:28px;
+}

estateagents-admin-manager/src/pages/eContract/template/add.jsx

@@ -0,0 +1,156 @@
+import React, { useState, useEffect } from 'react';
+import { Upload, Input, Modal, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import { fetch } from '../../../utils/request';
+import moment from 'moment';
+
+const header = props => {
+
+  const [data, setData] = useState({})
+  const [flag, setFlag] = useState({})
+  const [uploadTip, setUploadTip] = useState({})
+  const [loading, setLoading] = useState({})
+  const uploadFile = fetch(apis.image.upload)
+
+
+  useEffect(() => {
+    setFlag(false);
+    setUploadTip("请选择合同文件")
+    setLoading(false)
+  }, []);
+
+  const upload = () => {
+    console.log("上传")
+  }
+
+  const removeFile = () => {
+    console.log("删除文件")
+  }
+
+  const uploaderProps = {
+    name: 'file',
+    accept: '.pdf',
+    showUploadList: true,
+    customRequest({
+      action,
+      file,
+      headers,
+      onError,
+      onProgress,
+      onSuccess,
+      withCredentials,
+    }) {
+      const data = new FormData()
+      data.append('file', file)
+
+      uploadFile({ data }).then((img) => {
+        setFlag(true)
+        setUploadTip("上传成功")
+        setData({
+          contractTemplateAddress: img
+        })
+        onSuccess(img, file)
+      }).catch(onError);
+
+      return {
+        abort() {
+          console.log('upload progress is aborted.');
+        },
+      };
+    },
+    onRemove(file) {
+      setFlag(false)
+      setUploadTip("请选择合同文件")
+    }
+  }
+
+  const fields = [
+    {
+      label: '合同标题',
+      name: 'contractTemplateName',
+      type: FieldTypes.Text,
+      value: data.contractTemplateName,
+      rules: [
+        { required: true, message: '标题长度20字以内不能有空格', pattern: new RegExp('^[^ ]+$') },
+        { max: 20, message: '标题长度不能超过20个字符' }
+      ],
+      placeholder: "标题长度20字以内不能有空格"
+    },
+    {
+      label: '合同文件',
+      name: 'contractTemplateAddress',
+      // type: FieldTypes.text,
+      value: data.contractTemplateAddress,
+      // beforeUpload: (e) => photoBeforeUpload(e),
+      rules: [
+        { required: true, message: '请选择合同文件' },
+      ],
+      render: <div><Upload beforeUpload={beforeUpload} {...uploaderProps}><Button disabled={flag}>{uploadTip}</Button></Upload></div>,
+      help: <div>仅支持pdf格式，合同必须按规则生成，否则无法正确签章。未按规则生成合同导致的问题，致云免除相关责任。详细要求查看
+        <a href='https://easydoc.xyz/s/24703398/3SqDkJDw/odnmIIwl' style={{ color: '#66B3FF' }} target='_blank'>《合同模板制作要求》</a></div>
+    },
+
+  ]
+
+  function beforeUpload(file) {
+    console.log(file, 'file')
+    return new Promise((resolve, reject) => {
+      if (file.type === 'application/pdf') {
+          resolve(file)
+      } else {
+        message.info('仅支持PDF格式')
+        reject()
+      }
+    })
+  }  
+
+  const handleSubmit = (values) => {
+    let submitValues = values;
+    submitValues.contractTemplateAddress = data.contractTemplateAddress
+
+    props.form.validateFields((err, values) => {
+      console.log(values)
+      if (!err) {
+        request({ ...apis.taEcontract.addContractTemplate, data: { ...submitValues }, }).then((data) => {
+          router.push({
+            pathname: '/eContract/template/list',
+            query: {
+              //   salesBatchId: data.salesBatchId,
+            },
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+  //model
+  const handleShowModel = val => {
+    setVisible(true);
+  }
+
+  const handleCancel = val => {
+    setVisible(false);
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/eContract/template/list',
+    });
+  }
+
+  return (
+    <>
+      <div>
+        <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      </div>
+    </>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/eContract/template/detail.jsx

@@ -0,0 +1,49 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const header = props => {
+  const templateId = props.location.query.id;
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getData(templateId);
+  }, [])
+
+  const getData = (templateId) => {
+    request({ ...apis.taEcontract.getContractTemplate, urlData: { id: templateId } }).then((data) => {
+      setData(data)
+      props.form.setFieldsValue(data)
+    })
+  }
+
+  const toCancel = () => {
+    router.go(-1)
+  }
+
+  return (
+    <>
+      <div align="right"><Button onClick={() => toCancel()}>返回</Button></div>
+
+      <Form labelCol={{ span: 6 }} wrapperCol={{ span: 14 }} style={{ position: 'relative' }}>
+        <Form.Item label="合同标题">
+          <span>{data.contractTemplateName}</span>
+        </Form.Item>
+        <Form.Item label="合同文件">
+          <div>
+            <Navigate to={data.contractTemplateAddress}>查看文件</Navigate>
+          </div>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+export default WrappedHeader

estateagents-admin-manager/src/pages/eContract/template/list.jsx

@@ -0,0 +1,199 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../style/GoodsList.less';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+// import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+ 
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [], total: 0 })
+  //   const [page, changePage] = useState({})
+  const [contractList, setContractList] = useState([])
+  const [time, setTime] = useState('')
+  const [showHelp, setShowHelp] = useState(false)
+
+  // 查询列表
+  const getList = params => {
+    request({ ...apis.taEcontract.listContractTemplate, params: { ...params } }).then(data => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  const toAdd = rowData => () => {
+    router.push({
+      pathname: '/eContract/template/add',
+    });
+  }
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  const toDel = rowData => () =>{
+    if(contractList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要删除的合同模板')
+      return
+    }
+
+    Modal.confirm({
+      title: '确定将所选的'+ contractList.length +'条合同模板删除?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        console.log(contractList,'contractList');
+        request({ ...apis.taEcontract.batchDeleteContractTemplate, data: contractList, }).then((data) => {
+          message.info("操作成功")
+          getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          // message.info(err.msg)
+        })
+      },
+    });
+  }
+
+  const toDetail = (record) => () => {
+    router.push({
+        pathname: '/eContract/template/detail',
+        query: {
+          id: record.contractTemplateId
+        },
+    });
+}
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '合同标题',
+      dataIndex: 'contractTemplateName',
+      key: 'contractTemplateName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toDetail(row)}>{row.contractTemplateName}</Navigate>,
+    },
+    {
+      title: '新增时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: withActions((text, record) => [(
+          <AuthButton name="admin.eContractTemplate.detail.get" noRight={null}>
+            <EditIcon type="look" text="查看详情" onClick={toDetail(record)}></EditIcon>
+          </AuthButton>
+      ),])
+    },
+  ];
+  const getSignList = dynamicId => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setContractList(selectedRows)
+    },
+  };
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {      
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    setTime('')
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      {/* style={{ display: 'none' }} */}
+      <div id="qrcode"></div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('contractTemplateName')(
+             <Input
+             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+             placeholder="合同标题"
+           />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.eContractTemplate.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toAdd()}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.eContractTemplate.del" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toDel()} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Table rowSelection={rowSelection}
+       dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.contractTemplateId} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
+      </div>
+      {/* <RaiseHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} /> */}
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/funds/accountfunds/components/Basic.jsx

@@ -0,0 +1,187 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Modal, Input, Row, Col, message } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import Styles from './styles.less';
+import Recharge from './Recharge'
+import Refund from './Refund'
+import Pay from './Pay'
+import Contact from './Contact'
+
+function Basic(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+    const [visible, setvisiblea] = useState(false)
+    const [confirmLoading, setConfirmLoading] = useState(false)
+    const [title, setTitle] = useState()
+    const [amount, setAmount] = useState()
+    useEffect(() => {
+        getData();
+    }, [])
+    // 查询列表
+
+    const getData = params => {
+        request({ ...apis.funds.get, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    const handleOkRecharge = e => {
+        console.log(e, '123123')
+        if (e == 0) {
+            message.error('充值金额不能为0')
+            return
+        }
+        if (e) {
+
+            request({ ...apis.funds.saveOrder, data: { amount: Math.round(e * 100) } }).then(data => {
+                setAmount(data)
+                showModal('pay')
+            }).catch(err => {
+                console.log(err)
+            })
+
+        }
+
+
+    };
+    // data: { amount: e }
+    const handleOkRefund = e => {
+        console.log(e, e * 100, '123123')
+
+        if (e) {
+            request({ ...apis.funds.saveRefundOrder, data: { amount: Math.round(e * 100) } }).then(data => {
+                message.info('申请退款成功')
+                setvisiblea(false)
+            }).catch(err => {
+                console.log(err)
+            })
+        }
+        // setConfirmLoading(true)
+        // setTimeout(() => {
+        //   this.setState({
+        //     visible: false,
+        //     confirmLoading: false,
+        //   });
+        // }, 2000);
+        // setvisiblea(false)
+    };
+
+    const handleOkRepay = e => {
+        console.log(e, '123123')
+        if (e === 'success') {
+            showModal('contact')
+        } else {
+            // showModal()
+            Modal.error({
+                title: '充值失败',
+                // content: 'some messages...some messages...',
+            });
+            setvisiblea(false)
+        }
+        // setConfirmLoading(true)
+        // setTimeout(() => {
+        //   this.setState({
+        //     visible: false,
+        //     confirmLoading: false,
+        //   });
+        // }, 2000);
+
+    };
+
+    const toNewContact = () => {
+
+        router.push({
+            pathname: '/funds/financialContact',
+            // query: {
+            //   id: rowData.raiseId,
+            //   buildingId: rowData.buildingId,
+            //   salesBatchId: rowData.salesBatchId,
+        })
+
+    }
+
+
+    const showModal = value => {
+        if (value === 'recharge') {
+            setTitle('线上充值')
+        }
+        if (value === 'refund') {
+            setTitle('申请退款')
+        }
+        if (value === 'pay') {
+            setTitle('扫码支付')
+        }
+        if (value === 'contact') {
+            setTitle('联系我们')
+        }
+        setvisiblea(true)
+    };
+
+    const handleCancel = () => {
+        console.log('Clicked cancel button');
+        setvisiblea(false)
+    };
+
+    return (
+
+        <>
+            对资金有疑问？ <Navigate onClick={() => toNewContact()}>请联系我们</Navigate>
+            <div style={{ display: 'flex', margin: '20px 0 40px' }}>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>总充值金额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRechargeAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}> 对账请在充值订单中查看充值状态为“已支付”的充值记录</div>
+                </div>
+                <div className={Styles.redHeader} style={{ margin: '0 40px' }}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已消费金额/元</div><div className={Styles.redHeaderTopNum}>{data.purchaseAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在消费订单中查看消费状态为“成功”的消费记录</div>
+                </div>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已退款额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRefund / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在退款订单中查看退款状态为“已退款”的退款记录</div>
+                </div>
+
+                <div className={Styles.redHeader} style={{ margin: '0 40px' }}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>退款冻结额/元</div><div className={Styles.redHeaderTopNum}>{data.refundBlockedAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在退款订单中查看退款状态为“已申请”的退款记录</div>
+                </div>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>账户余额/元</div><div className={Styles.redHeaderTopNum}>{data.availableBalance / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>账户余额=总充值金额-已消费金额-已退款额-退款冻结额</div>
+                </div>
+            </div>
+            <div style={{ textAlign: 'center', marginTop: '272px' }}>
+                <AuthButton name="admin.funds.account.recharge" noRight={null}>
+                    <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => showModal('recharge')}>充值</Button>
+                </AuthButton>
+                <AuthButton name="admin.funds.account.refund" noRight={null}>
+                    <Button className={Styles.btn} style={{ marginLeft: '80px' }} onClick={() => showModal('refund')}>退款</Button>
+                </AuthButton>
+            </div>
+
+            <Modal
+                title={title}
+                visible={visible}
+                // onOk={handleOk}
+                confirmLoading={confirmLoading}
+                onCancel={handleCancel}
+                footer={null}
+                width="1000px"
+                maskClosable={false}
+            >
+                {title === '线上充值' && <Recharge value={e => handleOkRecharge(e)}></Recharge>}
+                {title === '申请退款' && <Refund balance={data.availableBalance / 100 || 0} value={e => handleOkRefund(e)}></Refund>}
+                {title === '扫码支付' && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
+                {title === '联系我们' && <Contact></Contact>}
+
+            </Modal>
+        </>
+    )
+}
+
+export default Basic

estateagents-admin-manager/src/pages/funds/accountfunds/components/ConsumerOrder.jsx

@@ -0,0 +1,285 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton'
+
+const { Option } = Select
+const { RangePicker } = DatePicker
+
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+    const [modalData, setModalData] = useState([])
+    const [visible, setvisiblea] = useState(false)
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
+        }
+        // if (params.startTime) {
+        //     params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.endTime) {
+        //     params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        // console.log("请求数据", params)
+        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...values, consumeType: 'RedPacket' } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values });
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const showModal = (row) => {
+        setvisiblea(true)
+        setModalData(row)
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '消费金额',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
+        },
+        {
+            title: '消费方式',
+            dataIndex: 'itemType',
+            key: 'itemType',
+            align: 'center',
+            // render: () => <>红包</>,
+            render: (x, row) => <><span>{`${row.consumeType === 'RedPacket' ? '红包' : ''}`}</span></>,
+        },
+        {
+            title: '活动名称',
+            dataIndex: 'activityName',
+            key: 'activityName',
+            align: 'center',
+        },
+        {
+            title: '消费下单时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '接收人手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+            render: (x, row) => <><Navigate onClick={() => showModal(row)}>{x}</Navigate> </>,
+        },
+        {
+            title: '消费状态',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
+            align: 'center',
+            render: (x, row) => <><span>{row.tradingStatus === 'success' ? '成功' : '失败'}</span></>,
+        },
+    ]
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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 exportReport = () => {
+        const requestParams = props.form.getFieldsValue();
+
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
+        }
+        // if (requestParams.startTime) {
+        //     requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.endTime) {
+        //     requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...values, consumeType: 'RedPacket' } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+
+
+                <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['消费开始时间', '消费结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* 
+
+                <Form.Item>
+                    {getFieldDecorator('startTime')(
+                        <DatePicker placeholder="消费开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('endTime')(
+                        <DatePicker placeholder="消费结束时间" />,
+                    )}
+                </Form.Item> */}
+                <Form.Item>
+                    {getFieldDecorator('tradingStatus')(
+                        <Select style={{ width: '180px' }} placeholder="消费状态">
+                            <Option value="">全部</Option>
+                            <Option value="success">成功</Option>
+                            <Option value="fail">失败</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('consumeType')(
+                        <Select style={{ width: '180px' }} placeholder="消费方式">
+                            <Option value="">全部</Option>
+                            <Option value="RedPacket">红包</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="接收人手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <AuthButton name="admin.funds.account.recharge" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+            <Modal
+                title="接收人信息"
+                visible={visible}
+                // onOk={handleOk}
+                // confirmLoading={confirmLoading}
+                onCancel={() => setvisiblea(false)}
+                footer={null}
+            // width="1000px"
+            // maskClosable={false}
+            >
+                <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }}>
+                    <Form.Item label="昵称">
+
+                        <span>{modalData.nickname}</span>
+
+                    </Form.Item>
+                    <Form.Item label="头像">
+
+                        <img src={modalData.avatarurl} alt="" width="100px" height="100px" />
+
+                    </Form.Item>
+                    <Form.Item label="姓名">
+
+                        <span>{modalData.name || modalData.nickname}</span>
+
+                    </Form.Item>
+                    <Form.Item label="手机号">
+
+                        <span>{modalData.phone}</span>
+
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

estateagents-admin-manager/src/pages/funds/accountfunds/components/Contact.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import ContactText from './contactText'
+
+const Recharge = () => (
+    <>
+        <span style={{ fontSize: '22px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
+        <div style={{ fontSize: '18px', color: '#333', lineHeight: '34px', marginTop: '20px' }}>
+            您已充值成功，微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由致云预先充值垫付，需要在使用预算前和运营人员确认致云余额是否充足，<ContactText />
+        </div>
+    </>
+)
+export default Recharge

estateagents-admin-manager/src/pages/funds/accountfunds/components/Pay.jsx

@@ -0,0 +1,81 @@
+import React, { useState, useEffect, useMemo } from 'react';
+import { Button, Input, Row, Col, message } from 'antd';
+import QRCode from 'qrcode.react';
+import Styles from './styles.less';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+
+
+let intervalState = true
+const Recharge = props => {
+
+    const { amount } = props
+    console.log(amount, 'amount')
+    const { orderInfo } = amount
+    console.log(orderInfo, 'orderInfo')
+    useEffect(() => {
+        console.log(props.visible, 'props.visible')
+
+        return () => clearInterval(getByInfo);
+        // setTimeout(() => { getByInfo() }, 1000)
+    }, [props.visible])
+
+
+    const getByInfo = setInterval(() => {
+        if (intervalState) {
+            intervalState = false
+            request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
+                if (data.tradingStatus === 'processing') {
+                    // clearInterval(getByInfo)
+                    // props.value()
+                    // if (!visible) { clearInterval(getByInfo) }
+                    intervalState = true
+                } else if (data.tradingStatus === 'success') {
+                    message.info('充值成功')
+                    clearInterval(getByInfo)
+
+                    props.value('success')
+                } else {
+                    message.info('充值失败')
+                    clearInterval(getByInfo)
+                    props.value('fail')
+                }
+                // tradingStatus
+                // setTimeout(() => { getByInfo() }, 1000)
+            }).catch(err => {
+                console.log(err)
+                clearInterval(getByInfo)
+                message.info('充值失败')
+                props.value('fail')
+            })
+        }
+    }, 2000)
+
+
+    return (
+        <>
+            <div style={{ fontSize: '18px', fontWeight: '400', color: '#333333' }}>
+                <span onClick={props.value}>充值金额{amount.amount / 100 || 0}元</span><span style={{ marginLeft: '80px' }}>微信商户手续费率{amount.mchPayRate}</span><span style={{ marginLeft: '80px' }}>手续费{amount.serviceFee / 100 || 0}元</span>
+                {/* <img src="" alt="" width:/> */}
+            </div>
+            <div style={{ height: '278px', borderRadius: '12px', border: '1px solid rgba(218,218,218,1', margin: '40px 0', display: 'flex' }}>
+                <div className={Styles.box}>
+                    <QRCode
+                        value={amount.payQrCode}  //value参数为生成二维码的链接
+                        size={194} //二维码的宽高尺寸
+                        fgColor="#000000"  //二维码的颜色
+                    />
+                    {/* <img src={amount.payQrCode} alt="" /> */}
+                </div>
+                <div className={Styles.boxRight}>
+                    <div className={Styles.child}>
+                        <p style={{ lineHeight: '43px', height: '43px', marginBottom: '5px' }}><span style={{ fontSize: '32px', fontWeight: '600', color: '#EF273A' }}>￥{amount.realAmount / 100 || 0}</span><span style={{ marginLeft: '5px' }}>应付金额</span></p>
+                        <p>仅支持微信支付</p>
+                    </div>
+
+                </div>
+            </div>
+        </>
+    )
+}
+export default Recharge

estateagents-admin-manager/src/pages/funds/accountfunds/components/Recharge.jsx

@@ -0,0 +1,46 @@
+import React, { useState } from 'react';
+import { Button, Input, Row, Col } from 'antd';
+import Styles from './styles.less';
+import Navigate from '@/components/Navigate';
+import ContactText from './contactText'
+
+const Recharge = props => {
+
+    const [value, setValue] = useState()
+    // /^1[3456789]\d{9}$/
+    function onChange(e) {
+        // if (e.target.value < 0) return
+        // if (e.target.value == '') { setValue(e.target.value); return }
+        // if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+        // if (e.target.value > balance) { setValue(balance); return }
+        // // console.log('changed', e.target.value);
+        // setValue(e.target.value)
+        if (e.target.value == '') { setValue(e.target.value); return }
+        if (e.target.value < 0) return
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+        if (e.target.value > 99999.99) { setValue(99999.99); return }
+        console.log('changed', e.target.value);
+        setValue(e.target.value)
+
+    }
+    return (
+        <>
+            <Row>
+                <Col span={3}> <span style={{ fontSize: '20px', color: '#666' }}>充值金额/元</span></Col>
+                <Col span={17} offset={1}>
+                    <Input type="number" min={0} step={0.01} value={value} onChange={onChange} style={{ marginBottom: '40px' }}></Input>
+                    <span style={{ fontSize: '20px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>1.充值流程：输入充值金额-点击确定-扫码支付-支付成功。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>2.因微信限制，微信充值有手续费，因此充值金额中应包含手续费，费率1%。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>3.微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由致云预先充值垫付，需要在使用预算前和运营人员确认致云余额是否充足。充值后请联系我们。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>4.您也可使用银行卡转账/支付宝支付/对公账户打款/现金支付等方式充值，具体方式<ContactText /></p>
+                </Col>
+            </Row>
+            <div style={{ textAlign: 'center', marginTop: '40px' }}>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value)}>充值</Button>
+
+            </div>
+        </>
+    )
+}
+export default Recharge

estateagents-admin-manager/src/pages/funds/accountfunds/components/RechargeOrder.jsx

@@ -0,0 +1,275 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import Navigate from '@/components/Navigate'
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import ShowVoucher from './ShowVoucher';
+
+const { RangePicker } = DatePicker
+
+
+const { Option } = Select
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    const [showVoucher, setShowVoucher] = useState({})
+    //     {
+    //         visible: false,
+    //         bannerList: ['//njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1591609582282-1584614514971-504167f68a5d43ee693949b26498ef21.jpg', '//njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1591609582282-1584614514971-504167f68a5d43ee693949b26498ef21.jpg'],
+    //     },
+    // )
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
+        }
+        // if (params.payStartTime) {
+        //     params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.payEndTime) {
+        //     params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+
+        request({ ...apis.funds.czlist, params: { ...values } }).then(data => {
+            setData(data)
+        })
+    }
+    const openImg = data => {
+        setShowVoucher(
+            {
+                visible: true,
+                bannerList: data,
+            },
+        )
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '充值金额',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
+        },
+        {
+            title: '充值方式',
+            dataIndex: 'isOffline',
+            key: 'isOffline',
+            align: 'center',
+            render: x => <><span>{x ? '运营手工充值' : '业务线上充值'}</span></>,
+        },
+        {
+            title: '下单时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '充值凭证',
+            dataIndex: 'certificateUrlList',
+            key: 'certificateUrlList',
+            align: 'center',
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
+        },
+        {
+            title: '充值状态',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
+            align: 'center',
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : (row.tradingStatus == 'success' ? '已支付' : '失败')}</span></>,
+        },
+        {
+            title: '支付时间',
+            dataIndex: 'payDate',
+            key: 'payDate',
+            align: 'center',
+            render: (x, row) => <><span>{row.payDate == null ? "" : `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+    ]
+
+    const { getFieldDecorator } = props.form
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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 exportReport = () => {
+        const requestParams = props.form.getFieldsValue();
+
+        
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
+        }
+        // if (requestParams.payStartTime) {
+        //     requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.payEndTime) {
+        //     requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...values } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+
+                <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['支付开始时间', '支付结束时间']} />,
+                    )}
+                </Form.Item>
+
+
+                {/* <Form.Item>
+                    {getFieldDecorator('payStartTime')(
+                        <DatePicker placeholder="支付开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('payEndTime')(
+                        <DatePicker placeholder="支付结束时间" />,
+                    )}
+                </Form.Item> */}
+                <Form.Item>
+                    {getFieldDecorator('isOffline')(
+                        <Select style={{ width: '180px' }} placeholder="充值方式">
+                            <Option value="">全部</Option>
+                            <Option value={0}>业务线上充值</Option>
+                            <Option value={1}>运营手工充值</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('tradingStatus')(
+                        <Select style={{ width: '180px' }} placeholder="充值状态">
+                            <Option value="">全部</Option>
+                            <Option value="processing">待支付</Option>
+                            <Option value="success">已支付</Option>
+                            <Option value="fail">失败</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                {/* <Form.Item>
+                    {getFieldDecorator('tel')(
+                        <Input
+                            placeholder="充值方式"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('tel')(
+                        <Input
+                            placeholder="充值状态"
+                        />,
+                    )}
+                </Form.Item> */}
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <AuthButton name="admin.funds.account.export" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+
+            {showVoucher.visible && <ShowVoucher bannerList={showVoucher.bannerList} closeSwiper={() => setShowVoucher({ visible: false })} />}
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

estateagents-admin-manager/src/pages/funds/accountfunds/components/Refund.jsx

@@ -0,0 +1,46 @@
+import React, { useState } from 'react';
+import { Button, Input, Row, Col } from 'antd';
+import Styles from './styles.less';
+import ContactText from './contactText'
+
+const Recharge = props => {
+    const { balance } = props
+
+    // if (e.target.value == 0) { setValue(0); return }
+    // if (e.target.value <= 0) return
+    // if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+    // if (e.target.value > 99999.99) { setValue(99999.99); return }
+    // console.log('changed', e.target.value);
+    // setValue(e.target.value)
+
+    const [value, setValue] = useState()
+
+    function onChange(e) {
+        console.log('changed', e.target.value);
+        // if (e.target.value == 0) { setValue(); return }
+        if (e.target.value < 0) return
+        if (e.target.value == '') { setValue(e.target.value); return }
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+        if (e.target.value > balance) { setValue(balance); return }
+        // console.log('changed', e.target.value);
+        setValue(e.target.value)
+
+    }
+    return (
+        <>
+            <Row>
+                <Col span={3}> <span style={{ fontSize: '20px', color: '#666' }}>退款金额/元</span></Col>
+                <Col span={17} offset={1}>
+                    <Input type="number" min={0} step={0.01} value={value} onChange={onChange} style={{ marginBottom: '40px' }}></Input>
+                    <span style={{ fontSize: '20px', color: '#979797', lineHeight: '30px' }}>账户余额：{balance}元</span>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>因微信商户平台限制，需先提交退款申请，提交后会冻结退款额对应余额资金，冻结金额无法使用，若您的平台有正在举办的活动等需要消费的地方，请预留充足的余额。如有疑问， <ContactText /></p>
+                </Col>
+            </Row>
+            <div style={{ textAlign: 'center', marginTop: '40px' }}>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value)}>确认申请</Button>
+
+            </div>
+        </>
+    )
+}
+export default Recharge

estateagents-admin-manager/src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -0,0 +1,250 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import apis from '../../../../services/apis';
+import AuthButton from '@/components/AuthButton';
+import request from '../../../../utils/request';
+import Navigate from '@/components/Navigate'
+import ShowVoucher from './ShowVoucher';
+
+const { Option } = Select
+
+const { RangePicker } = DatePicker
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    const [showVoucher, setShowVoucher] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
+        }
+        // if (params.refundStartTime) {
+        //     params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.refundEndTime) {
+        //     params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundlist, params: { ...values } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    const openImg = data => {
+        setShowVoucher(
+            {
+                visible: true,
+                bannerList: data,
+            },
+        )
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '退款金额（元）',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+            render: (x, row) => <><span>{`${row.amount / 100}`}</span></>,
+        },
+        {
+            title: '退款创建时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '退款状态',
+            dataIndex: 'auditStatus',
+            key: 'auditStatus',
+            align: 'center',
+            // width: '20%',
+            render: (x, row) => <><span>{row.auditStatus == 'checking' ? '已申请' : (row.auditStatus == 'agree' ? '已退款' : '已驳回')}</span></>,
+        },
+        {
+            title: '驳回原因',
+            dataIndex: 'auditResult',
+            key: 'auditResult',
+            align: 'center',
+            width: '20%',
+        },
+
+        {
+            title: '退款凭证',
+            dataIndex: 'certificateUrlList',
+            key: 'certificateUrlList',
+            align: 'center',
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
+        },
+        {
+            title: '操作',
+            dataIndex: 'num',
+            key: 'num',
+            align: 'center',
+            render: withActions((text, row) => [
+
+                <EditIcon type="look" text="查看联系人" onClick={() => router.push({
+                    pathname: '/funds/financialContact',
+                })}> </EditIcon>,
+
+
+            ]),
+        },
+    ]
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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 exportReport = () => {
+        const requestParams = props.form.getFieldsValue();
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
+        }
+        // if (requestParams.refundStartTime) {
+        //     requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.refundEndTime) {
+        //     requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...values } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+
+                <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['退款开始时间', '退款结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* <Form.Item>
+                    {getFieldDecorator('refundStartTime')(
+                        <DatePicker placeholder="退款开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('refundEndTime')(
+                        <DatePicker placeholder="退款结束时间" />,
+                    )}
+                </Form.Item> */}
+                <Form.Item>
+                    {getFieldDecorator('auditStatus')(
+                        <Select style={{ width: '180px' }} placeholder="退款状态">
+                            <Option value="">全部</Option>
+                            <Option value="checking">已申请</Option>
+                            <Option value="unagree">已驳回</Option>
+                            <Option value="agree">已退款</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <AuthButton name="admin.funds.account.export" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+            {showVoucher.visible && <ShowVoucher bannerList={showVoucher.bannerList} closeSwiper={() => setShowVoucher({ visible: false })} />}
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

estateagents-admin-manager/src/pages/funds/accountfunds/components/ShowVoucher.jsx

@@ -0,0 +1,128 @@
+import React from 'react';
+import Swiper from 'swiper';
+import styles from './styles.less'
+import closeImg from '../../../../assets/close2.png';
+import classNames from 'classnames';
+import 'swiper/css/swiper.min.css';
+
+class ShowVoucher extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            bannerList: this.props.bannerList,
+        }
+
+        this.slider = null
+    }
+
+    componentDidMount() {
+        this.showSwiper()
+
+
+    }
+
+
+    showSwiper() {
+        //swiper初始化
+        const { bannerList } = this.state
+        if (bannerList.length > 1) {
+            this.swiper = new Swiper('.swiper-container', {
+                slidesPerView: 1,
+                loop: true,
+                autoplay: {
+                    disableOnInteraction: false,
+                },
+                touchRatio: 1.5,
+                pagination: {
+                    el: '.swiper-pagination',
+                    bulletElement: 'li',
+                    clickable: true,
+                    bulletActiveClass: 'antd-pro-pages-swiper-style-active',
+                },
+                observer: true,
+                observeParents: true,
+            })
+        } else {
+            this.swiper = new Swiper('.swiper-container', {
+                loop: false,
+                observer: true,
+                observeParents: true,
+            })
+        }
+    }
+
+    render() {
+
+        const { bannerList } = this.state
+        // const showSwiper = window.localStorage.getItem(storageKey)
+        return (
+            <>
+                {bannerList.length > 0 && <div className={styles.mask}>
+                    <div className={styles.content}>
+                        <img src={closeImg} alt="" className={styles.close} onClick={() => this.props.closeSwiper()} />
+                        <div className={classNames(['swiper-container', styles.carousel])} >
+                            <div className={classNames(['swiper-wrapper', styles.carousel])} >
+                                {bannerList.map((item, index) =>
+                                    <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
+                                        {/* <img style={{ width: '100%', borderRadius: '10px' }} src={item} alt="" /> */}
+                                        <img style={{ maxHeight: '504px', borderRadius: '10px' }} src={item} alt="" />
+                                    </div>,
+                                )}
+                            </div>
+                            <div className={classNames(['swiper-pagination', styles.dots])} ></div>
+                        </div>
+                    </div>
+                </div>}
+            </>
+        )
+    }
+}
+
+
+export default ShowVoucher
+
+
+
+
+
+// import React, { useState, useEffect } from 'react';
+// import Carousel, { Modal, ModalGateway } from 'react-images';
+
+// const ShowVoucher = props => {
+//     const { bannerList = [], open, onClose } = props;
+//     const [modalIsOpen, setModalIsOpen] = useState(open)
+//     useEffect(() => {
+//         setModalIsOpen(open)
+//     }, [bannerList, open])
+
+//     const toggleModal = () => {
+//         setModalIsOpen(!modalIsOpen)
+//         if (typeof onClose === 'function') {
+//             onClose()
+//         }
+
+//     }
+//     const styleInit = {
+//         header: (base, state) => ({ //头部样式
+//             position: 'absolute',
+//             top: 90,
+//             right: 90,
+//             zIndex: 9999,
+//         }),
+//         view: (base, state) => ({
+//             textAlign: 'center',
+//             height: state.isFullscreen ? '100%' : 600  //当点击全屏的时候图片样式
+//         })
+//     }
+//     return (
+//         <ModalGateway >
+//             {modalIsOpen ? (
+//                 <Modal onClose={toggleModal} >
+//                     <Carousel views={bannerList} styles={styleInit} />
+//                 </Modal>
+//             ) : null}
+//         </ModalGateway>
+//     );
+
+// }
+

estateagents-admin-manager/src/pages/funds/accountfunds/components/contactText.jsx

@@ -0,0 +1,17 @@
+import React from 'react'
+import Navigate from '@/components/Navigate';
+
+const ContactText = () => {
+    // const toNewContact = () => {
+    //     const aTag = document.createElement('a')
+
+    //     aTag.setAttribute('href', `${window.location.origin}${window.location.pathname}#/funds/financialContact`);
+    //     aTag.setAttribute('target', '_blank')
+    //     document.body.appendChild(aTag)
+    //     aTag.click();
+    // }
+    return <a href={`${window.location.origin}${window.location.pathname}#/funds/financialContact`} style={{ color: '#1D74D9' }} target="_blank">请联系我们</a>
+
+}
+
+export default ContactText

estateagents-admin-manager/src/pages/funds/accountfunds/components/styles.less

@@ -0,0 +1,130 @@
+
+  .redHeader{
+    width: 20%;
+    // height: 217px;
+    background:rgba(249,249,249,1);
+    border-radius:12px;
+    padding: 20px 24px;
+    .redHeaderTop{
+      text-align: center;
+      height: 122px;
+      font-family:PingFangSC-Regular,PingFang SC;
+      font-size:18px;
+      font-weight:400;
+      color:rgba(51,51,51,1);
+      .redHeaderTopText{
+        font-size:18px;
+        color:rgba(51,51,51,1);
+      }
+      .redHeaderTopNum{
+        font-size:48px;
+        font-weight:500;
+        color:rgba(255,126,72,1);
+line-height: 97px;
+      }
+    }
+    .redHeaderBottom{
+      padding-top: 10px;
+      border-top:1px solid rgba(216,216,216,1);
+      font-size:16px;
+      font-weight:400;
+      color:rgba(153,153,153,1);
+      // line-height:22px;
+    }
+  }
+
+  .mask{
+    width: 100vw;
+    height: 100vh;
+    // max-height: 600px;
+    background-color: rgba(0,0,0,0.32);
+    position: fixed;
+    z-index: 999;
+    top: 0;
+    left: 0;
+}
+
+  .btn {
+    width: 140px;
+    height: 45px;
+  }
+
+  .box{
+    height: 204px;
+    width: 204px;
+    // background-color:red;
+    margin: 37px 40px 40px 249px;
+    // borderRadius: '12px', border: '1px solid rgba(218,218,218,1', margin: '40px 0' 
+      // width: 100px; 
+      // height: 100px;
+      // border-radius:5px;
+      background: linear-gradient(to left, #1D74D9, #1D74D9) left top no-repeat, 
+            linear-gradient(to bottom, #1D74D9, #1D74D9) left top no-repeat, 
+            linear-gradient(to left, #1D74D9, #1D74D9) right top no-repeat,
+            linear-gradient(to bottom, #1D74D9, #1D74D9) right top no-repeat, 
+            linear-gradient(to left, #1D74D9, #1D74D9) left bottom no-repeat,
+            linear-gradient(to bottom, #1D74D9, #1D74D9) left bottom no-repeat,
+            linear-gradient(to left, #1D74D9, #1D74D9) right bottom no-repeat,
+            linear-gradient(to left, #1D74D9, #1D74D9) right bottom no-repeat;
+      background-size: 2px 10px, 10px 2px, 2px 10px, 10px 2px; 
+      padding: 5px;
+      // background-color:#aaaaaa
+    
+  }
+  .boxRight{
+    width: 400px;
+    margin: 40px 0;
+    // position: absolute;
+    // top: 50%;
+    // transform: translate(50%,-50%);
+    position:relative;
+    .child{
+      position: absolute;
+    top: 50%;
+    transform: translate(0,-50%);
+    font-size:18px;
+font-weight:400;
+color:rgba(102,102,102,1);
+float: left;
+// line-height:25px;
+    }
+  }
+
+  .content{
+    width: 32vw;
+    min-width: 757px;
+    height: 21.3vw;
+    min-height: 504px;
+    position: absolute;
+    left: 50%;
+    top: 110px;
+    transform: translateX(-50%);
+    border-radius: 10px;
+    .close{
+        width: 40px;
+        height: 40px;
+        position: absolute;
+        top: -22px;
+        right: -22px;
+        z-index: 9;
+    }
+}
+
+.carousel {
+  width: 32vw;
+  min-width: 757px;
+  height: 21.3vw;
+  min-height: 504px;
+  border-radius: 10px;
+  text-align: center;
+  
+  .carouselItem{
+      width: 32vw;
+      min-width: 757px;
+      height: 21.3vw;
+      min-height: 504px;
+      position: relative;
+      display: inline-block;
+     
+  }
+}

estateagents-admin-manager/src/pages/funds/accountfunds/index.jsx

@@ -0,0 +1,68 @@
+import React, { useState, useEffect } from 'react';
+import { Radio } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Basic from './components/Basic';
+import RechargeOrder from './components/RechargeOrder'
+import ConsumerOrder from './components/ConsumerOrder'
+import RefundOrder from './components/RefundOrder'
+
+const H5configuration = props => {
+
+    const [tab, setTab] = useState('1')
+    const [data, setData] = useState({})
+
+    const id = props.location.query.id
+    // const type = props.activeType
+
+
+    useEffect(() => {
+        console.log(props)
+        // getData({ id: id, type: type })
+
+    }, [])
+
+    const getData = (params) => {
+
+        // request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
+        //     console.log(data)
+        //     setData(data || {})
+        // })
+    }
+
+    function tabsCallback(e) {
+
+        setTab(e.target.value)
+    }
+    const onDetai = (e) => {
+        console.log(e)
+        setTab('4')
+    }
+
+
+    return <>
+
+        <div>
+            <Radio.Group value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
+                <Radio.Button value="1">基本信息</Radio.Button>
+                <Radio.Button value="2">充值订单</Radio.Button>
+                <Radio.Button value="3">消费订单</Radio.Button>
+                <Radio.Button value="4">退款订单</Radio.Button>
+            </Radio.Group>
+            <div style={{ marginTop: '20px' }}>
+                {/* 基本信息 */}
+                {(tab === '1' && <Basic />)}
+                {/* 充值订单 */}
+                {(tab === '2' && <RechargeOrder />)}
+                {/* 消费订单 */}
+                {(tab === '3' && <ConsumerOrder />)}
+                {/* 退款订单 */}
+                {(tab === '4' && <RefundOrder />)}
+            </div>
+        </div>
+    </>
+}
+
+export default H5configuration

estateagents-admin-manager/src/pages/funds/financialContact/index.jsx

@@ -0,0 +1,142 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+function financialContact(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.list, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'contactName',
+            key: 'contactName',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: x => <span>{x == 1 ? '男' : x === 2 ? '女' : '未知'}</span >,
+        },
+        {
+            title: '头像',
+            dataIndex: 'avatar',
+            key: 'avatar',
+            align: 'center',
+            render: (x, row) => <img src={row.avatar} alt="" width="93px" height="93px"></img >,
+        },
+        {
+            title: '固话',
+            dataIndex: 'telephone',
+            key: 'telephone',
+            align: 'center',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '头衔',
+            dataIndex: 'appellation',
+            key: 'appellation',
+            align: 'center',
+        },
+    ]
+
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+            }
+        });
+    }
+
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('contactName')(
+                        <Input
+                            placeholder="姓名"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('telephone')(
+                        <Input
+                            placeholder="固话"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            {/* <div style={{ marginTop: '20px' }}>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div> */}
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+        </>
+
+    )
+}
+
+
+const WrappedFinancialContact = Form.create({ name: 'financialContact' })(financialContact);
+
+export default WrappedFinancialContact
+

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/components/AddDemand.jsx

@@ -0,0 +1,45 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+
+// import Style from './style.less'
+// import HotBlock from '../HotBlock'
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+
+const BatchDel = props => {
+
+    function sampleList(record) {
+        router.push({
+          pathname: '/h5SampleManager/h5Sample/list',
+        })
+    }
+
+  return (
+    <>
+      <Modal footer={null} title="新增需求单" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <div style={{textAlign:'center', marginBottom:'15px'}}>
+            <span style={{fontSize:'15px'}}>请到H5样例中筛选并查看详情后从详情提交需求单</span><br/>
+        </div>
+        <Form >
+          <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
+            <Button type="primary" onClick={() => sampleList()}>
+              查看全部样例
+            </Button>
+            <Button onClick={props.onCancel} style={{marginLeft:'20px'}}>
+              取消
+            </Button>
+          </Form.Item>
+        </Form>
+        
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchDel' })(BatchDel);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/components/BatchDel.jsx

@@ -0,0 +1,56 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+// import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+// import Style from './style.less'
+// import HotBlock from '../HotBlock'
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+
+const BatchDel = props => {
+  const taRaiseRecords = props.demandIds;
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.taH5SampleManager.batchDelDemands, data: { taH5Demands: taRaiseRecords }, }).then((data) => {
+          const resultMessage = '操作成功，其中'+data.successNum+'条成功删除，'+data.failNum+'条非作废/提交状态未删除。'
+          message.info(resultMessage)
+          props.onSuccess(false);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="确认删除" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <div style={{textAlign:'center', marginBottom:'30px'}}><span style={{fontSize:'20px'}}>确认将所选{taRaiseRecords.length}条数据删除？</span></div>
+        <div style={{textAlign:'center', marginBottom:'15px'}}>
+            <span style={{fontSize:'15px'}}>可删除条件：需求单状态 为已提交或作废</span><br/>
+        </div>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              确定
+            </Button>
+            <Button onClick={props.onCancel} style={{marginLeft:'20px'}}>
+              取消
+            </Button>
+          </Form.Item>
+        </Form>
+        
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchDel' })(BatchDel);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/detail.jsx

@@ -0,0 +1,138 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col} from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import TextArea from 'antd/lib/input/TextArea';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+  const demandId  = props.location.query.id;
+  const [demandData, setDemandData] = useState({})
+
+  useEffect(() => {
+    getDemandData(demandId);
+  },[])
+
+  // 查询列表
+  const getDemandData = (demandId) => {
+      request({ ...apis.taH5SampleManager.taH5DemandById, urlData: {id: demandId} }).then((data) => {
+          setDemandData(data)
+          props.form.setFieldsValue(data)
+      })
+  }
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/h5SampleManager/h5Demand/edit',
+      query: {
+        id: demandId,
+      },
+    });
+      return
+    }
+  }
+
+  function sampleDetail(sampleId){
+    request({ ...apis.taH5SampleManager.taH5SampleById, urlData: { id: sampleId } }).then((data) => {
+      router.push({
+        pathname: '/h5SampleManager/h5Sample/detail',
+        query: {
+          id: sampleId,
+        },
+      });
+    }).catch(err => {
+      message.info("该H5样例已取消发布或已删除")
+    })
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        console.log(values,'valuesvaluesvalues')
+        if (values.payType == 'onLine' && (values.payDescriptionOnline == '' || values.payDescriptionOnline == null)){
+            message.info("请填写线上缴费说明");
+            return;
+        }
+        if (values.payType == 'offLine' && (values.payDescriptionOffline == '' || values.payDescriptionOffline == null)){
+          message.info("请填写线下缴费说明");
+          return;
+        }
+        if ((values.payType == 'onLine' && (values.payDescriptionOnline == '' || values.payDescriptionOnline == null)) ||
+            (values.payType == 'offLine' && (values.payDescriptionOffline == '' || values.payDescriptionOffline == null))){
+          message.info("请填写缴费说明");
+          return;
+        }
+        
+        let {liveTime, ...submitValue} = values
+        if (values.raiseStartTime > values.raiseEndTime){
+          message.info("认筹结束时间大于认筹开始时间")
+          return;
+        }
+        submitValue.raiseStartTime = moment(submitValue.raiseStartTime).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.raiseEndTime = moment(submitValue.raiseEndTime).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.payType = values.payType.toString();
+        submitValue.raisePrice = submitValue.raisePrice * 100;
+        request({ ...apis.house.addRaise, data: { ...submitValue },}).then((data) => {
+          message.info("保存成功")
+          router.push({
+            pathname: '/house/raise/list',
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="样例名">
+          <Navigate onClick={() => sampleDetail(demandData.sampleId)}>{demandData.sampleName}</Navigate>
+        </Form.Item>
+        <Form.Item label="下单人">
+          <span>{demandData.orderer}</span>
+        </Form.Item>
+        <Form.Item label="联系方式">
+        <span>{demandData.phone}</span>
+        </Form.Item>
+        <Form.Item label="下单时间">
+        <span>{`${moment(demandData.createDate).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="更新时间">
+        <span>{`${moment(demandData.updateDate).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="需求单状态">
+        <span>{demandData.demandStatus === 1 ? "已提交": demandData.demandStatus === 2 ?"处理中":demandData.demandStatus === 3?"已交付":"作废"}</span>
+        </Form.Item>
+        <Form.Item label="需求描述">
+          {getFieldDecorator('demandContent')(<Wangedit contenteditable={false}/>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary"  onClick={toDetail(demandId)} style={{marginRight:'20px'}}>
+            修改需求
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/detail.less

@@ -0,0 +1,69 @@
+.searchBox {
+    font-size: 20px;
+    color: red;
+    display: flex;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchItem {
+      min-width: 20px;
+      margin-right: 20px;
+      text-align: left;
+      .anticon-down {
+        float: right !important;
+      }
+    }
+  }
+  .addBtn {
+    padding: 0 30px;
+    height: 36px;
+    background-color: #50be00;
+    color: #fff;
+    margin: 30px 0;
+  }
+  .touxiang {
+    width: 93px;
+    height: 93px;
+  }
+  .ant-table-column-title {
+    font-weight: 600;
+  }
+  
+  .about {
+    padding: 0 30px;
+    height: 36px;
+    margin: 30px 0;
+    margin-left:8px;
+  }
+  
+  .selectName {
+    font-size: 14px;
+    padding: 0 10px;
+    height: 36px;
+    color: rgb(10, 10, 10);
+    margin: 30px 0;
+  }
+  
+  .inpuit {
+    width:50%;
+  }
+  
+  .inpuitTxt {
+    width:70%;
+  }
+  
+  
+  .formButton{
+    margin-left: 12% 
+  }
+  
+  .divInput{
+    float: 'left'; 
+    width: 500
+  }
+  .brokerTable{
+    padding: 0 30px;
+    height: 36px;
+    margin: 30px 0;
+  }
+  

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/edit.jsx

@@ -0,0 +1,87 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import channels from './detail.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+  }, [])
+
+
+  // 查询当前信息
+  function getById(params) {
+    request({ ...apis.taH5SampleManager.taH5DemandById, urlData: { id: props.location.query.id } }).then((data) => {
+      props.form.setFieldsValue(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  // 编辑
+  function editDemandById(data) {
+    console.log('datadata', data)
+    console.log('props.location.query.id', props.location.query.id)
+    request({ ...apis.taH5SampleManager.updateH5DemandById, urlData: { id: props.location.query.id }, data: { ...data } }).then((data) => {
+      router.go(-1)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('values', values)
+        if (values.demandContent == '<p><br></p>') {
+          message.info("请填写需求内容")
+          return
+        }
+        editDemandById({ ...values })
+      }
+    });
+  }
+  function go() {
+    router.push({
+      pathname: '/h5SampleManager/h5Demand/list',
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="修改需求" help="注意，修改的需求可能会大幅增加开发时间，请在增加前和联系人确认，若需求对应开发工作量较大，可能需要重新评估报价和开发周期，因此，建议一次性提交完全部需求">
+          {getFieldDecorator('sampleName')(<Input disabled={true} />)}
+        </Form.Item>
+        <Form.Item label="需求描述" style={{ marginTop: '20px' }}>
+          {getFieldDecorator('demandContent', {
+            rules: [{ required: true, message: '请输入需求描述' }],
+          })(<Wangedit />)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ offset: 9 }}>
+          <div style={{ display: 'flex', alignItems: 'center', width: '220px' }}>    <Button type="primary" htmlType="submit">
+            保存
+          </Button>
+            <Button className={channels.formButton} onClick={() => router.go(-1)}>取消</Button></div>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/h5SampleManager/h5Demand/list.jsx

@@ -0,0 +1,255 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../style/GoodsList.less';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import BatchDel from './components/BatchDel';
+import AddDemand from './components/AddDemand';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+  const sampleId  = props.location.query.id;
+  const sampleName = props.location.query.sampleName;
+  const [data, setData] = useState({})
+  const [demend, setDemend] = useState({})
+  const [demandIds, setDemandIds] = useState([])
+  const [batchDel, setBatchDel] = useState({visable:false,demandIds:''})
+  const [addDemand, setAddDemand] = useState({visable:false})
+
+  useEffect(() => {
+    if(sampleId){
+      getList({ pageNum: 1, pageSize: 10, sampleId: sampleId });
+    }else{
+      getList({ pageNum: 1, pageSize: 10});
+    }
+    
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    console.log(params);
+    request({ ...apis.taH5SampleManager.taH5Demand, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/h5SampleManager/h5Demand/detail',
+      query: {
+        id: rowData.demandId,
+      },
+    });
+      return
+    }
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '样例名',
+      dataIndex: 'sampleName',
+      key: 'sampleName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toDetail(row)}>{row.sampleName}</Navigate>,
+    },
+    {
+      title: '下单人',
+      dataIndex: 'orderer',
+      key: 'orderer',
+      align: 'center',
+      
+    },
+    {
+      title: '联系方式',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
+    },
+    {
+      title: '需求单状态',
+      dataIndex: 'demandStatus',
+      key: 'demandStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.demandStatus === 1) { return '已提交' }
+        if (records.demandStatus === 2) { return '处理中' }
+        if (records.demandStatus === 3) { return '已交付' }
+        if (records.demandStatus === 4) { return '作废' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((text, record) =>[ (
+        <AuthButton name="admin.h5Demand.detail.get" noRight={null}>
+          <EditIcon type="look" text="查看详情" onClick={toDetail(record)}></EditIcon>
+        </AuthButton>
+      )]
+      ),
+    },
+  ];
+  
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setDemandIds(selectedRows)
+    },
+  };
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        
+        if (values.startCreateDate != null){
+          values.startCreateDate = moment(values.startCreateDate).format('YYYY-MM-DD HH:mm:ss')
+        }
+        if (values.endCreateDate != null){
+          values.endCreateDate = moment(values.endCreateDate).format('YYYY-MM-DD HH:mm:ss')
+        }
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  function showBatchDel(e){
+  
+    if (demandIds.length <= 0){
+      message.info("请选择数据");
+      return;
+    }
+    setBatchDel(e);
+    if(!e.visable){
+      getList()
+    }
+  }
+
+  function addDemandInfo(e){
+    setAddDemand(e);
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sampleName',{
+            initialValue: sampleName
+          })(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="样例名"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('orderer')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="下单人"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="联系方式"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('startCreateDate')(
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="下单时间开始时间"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('endCreateDate')(
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="下单时间结束时间"/>,
+          )}
+        </Form.Item>  
+        <Form.Item>
+          {getFieldDecorator('demandStatus')(
+            <Select style={{ width: '180px' }} placeholder="需求单状态">
+                <option value="">全部</option>
+                <option value="1">已提交</option>
+                <option value="2">处理中</option>
+                <option value="3">已交付</option>
+                <option value="4">作废</option>
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                    搜索
+                </Button>
+            </AuthButton>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                        重置
+                </Button>
+            </AuthButton>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.h5Demand.add.post" noRight={null}>
+        <Button type="danger" onClick={() => addDemandInfo({visable:true})} className={styles.addBtn}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.h5Demand.del" noRight={null}>
+        <Button type="primary" onClick={() => showBatchDel({visable:true, demandIds: demandIds})} className={styles.addBtn} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <AddDemand visible={addDemand.visable} onCancel={() => addDemandInfo({visable:false})}></AddDemand>
+      <BatchDel visible={batchDel.visable} demandIds={batchDel.demandIds} onCancel={() => showBatchDel({visable:false, demandIds: ''})} onSuccess={() => showBatchDel({visable:false, demandIds:'' })}/>
+      <Table rowSelection={rowSelection}
+        style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/add.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col} from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import TextArea from 'antd/lib/input/TextArea';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+  const sampleId  = props.location.query.id;
+  const sampleName  = props.location.query.sampleName;
+  const [sampleData, setSampleData] = useState({})
+
+//   useEffect(() => {
+//     getSampleData(sampleId);
+//   },[])
+
+//   // 查询列表
+//   const getSampleData = (demandId) => {
+//       request({ ...apis.taH5SampleManager.taH5DemandById, urlData: {id: demandId} }).then((data) => {
+//           setDemandData(data)
+//           props.form.setFieldsValue(data)
+//       })
+//   }
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/h5SampleManager/h5Demand/edit',
+      query: {
+        id: demandId,
+      },
+    });
+      return
+    }
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        values.sampleId = sampleId
+        values.sampleName = sampleName
+        request({ ...apis.taH5SampleManager.addTaH5Demand, data: { ...values },}).then((data) => {
+          message.info("保存成功")
+          router.go(-1);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="样例名">
+          {/* {getFieldDecorator('sampleName')(<Input disabled={true}/>)} */}
+          <span>{sampleName}</span>
+        </Form.Item>
+        <Form.Item label="下单人">
+          {getFieldDecorator('orderer',{
+          rules: [
+            {
+              required: true,
+              message: '请填写下单人',
+            },
+          ],
+        })(<Input maxLength={20}/>)}
+        </Form.Item>
+        <Form.Item label="联系方式">
+          {getFieldDecorator('phone',{
+          rules: [
+            {
+              required: true,
+              message: '请填写正确的联系方式',
+              // max:11,
+              // min:11,
+              pattern: new RegExp('^1[0-9]{10}$'),
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="需求描述">
+          <span style={{color:'rgba(0, 0, 0, 0.45)', fontSize:'14px'}}>请在下方填写定制化内容，如替换样例中的企业名称、logo文案等，如暂不确定，可先不填，提交后可在H5需求单详情中继续修改</span>
+          {getFieldDecorator('demandContent')(<Wangedit />)}
+        </Form.Item>
+        <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit">保存</Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>取消</Button>
+         </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -0,0 +1,248 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
+
+const header = props => {
+    const sampleId = props.location.query.id;
+
+    const [data, setData] = useState({})
+
+    const [visible, setVisible] = useState(false)
+    // const sampleName = props.location.query.sampleName;
+    // const [sampleData, setSampleData] = useState({})
+
+    //   useEffect(() => {
+    //     getSampleData(sampleId);
+    //   },[])
+
+    //   // 查询列表
+    //   const getSampleData = (demandId) => {
+    //       request({ ...apis.taH5SampleManager.taH5DemandById, urlData: {id: demandId} }).then((data) => {
+    //           setDemandData(data)
+    //           props.form.setFieldsValue(data)
+    //       })
+    //   }
+
+    // 跳转到编辑
+    const toDetail = rowData => () => {
+        if (rowData) {
+            router.push({
+                pathname: '/h5SampleManager/h5Demand/edit',
+                query: {
+                    id: demandId,
+                },
+            });
+            return
+        }
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                values.h5SampleId = sampleId
+                values.endDate = moment(values.endDate._d).format('YYYY-MM-DD HH:mm:ss')
+                values.isMiniapp = 1
+                values.fromH5Sample = true
+                request({ ...apis.activity.addtaDrainage, data: { ...values } }).then(data => {
+                    message.info('操作成功')
+                    setData(data)
+                    setVisible(true)
+
+                }).catch(err => {
+                    message.error(err.msg || err.message)
+                })
+
+                // values.sampleName = sampleName
+                // request({ ...apis.taH5SampleManager.addTaH5Demand, data: { ...values } }).then(() => {
+                //     message.info('保存成功')
+                //     // router.go(-1);
+                // }).catch((err) => {
+                //     message.info(err.msg || err.message)
+                // })
+            }
+        });
+    }
+
+    function disabledDate(current) {
+        // Can not select days before today and today 
+        // console.log(current, 'current')
+        // return current && current < moment().startOf('day');
+        return current < moment().add(0, 'd');
+    }
+
+    const disabledHours = () => {
+        const hours = [];
+        console.log(moment().hour(), 'moment().hour()')
+        for (let i = 0; i < moment().hour(); i++) {
+            hours.push(i);
+        }
+        return hours;
+    };
+
+    const disabledMinutes = currentDate => {
+        const currentMinute = moment().minute();
+        const currentHour = moment(currentDate).hour();
+        const minutes = [];
+        if (currentHour === moment().hour()) {
+            for (let i = 0; i <= currentMinute; i++) {
+                minutes.push(i);
+            }
+        }
+        return minutes;
+    };
+
+    const disabledTime = dateTime => {
+        if (moment(dateTime).isBefore(moment(), 'day')) {
+            return {
+                disabledHours: () => [],
+                disabledMinutes: () => [],
+            };
+        }
+        console.log(moment(dateTime).isSame(moment(), 'day'), 'moment(dateTime).isSame(moment(), )')
+        console.log(moment(dateTime).isSame(moment().add(1, 'days'), 'day'), 'moment(dateTime).isSame(moment().add(1,  )')
+        if (moment(dateTime).isSame(moment().add(1, 'days'), 'day')) {
+            return {
+                disabledHours: () => disabledHours(dateTime),
+                disabledMinutes: () => disabledMinutes(dateTime),
+            };
+        }
+    };
+
+    const toH5Edit = () => {
+        router.push({
+            pathname: '/activity/drainage/h5edit',
+            query: {
+                id: data.activityId,
+                name: data.name,
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
+    const toDrainageDetail = () => {
+        router.push({
+            pathname: '/activity/drainage/DetailDrainage',
+            query: {
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
+    const { getFieldDecorator } = props.form;
+
+    function validatorNum(rule, value, callback) {
+        callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
+    }
+
+    return (
+        <>
+            <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+                <Form.Item label="H5活动名称">
+                    {getFieldDecorator('name', {
+                        rules: [
+                            {
+                                required: true,
+                                message: '请填写活动名称',
+                            },
+                        ],
+                    })(<Input placeholder="H5活动名称" />)}
+                </Form.Item>
+                <Form.Item label="选择项目">
+                    {getFieldDecorator('buildingId')(
+                        <BuildSelect />,
+                    )}
+                </Form.Item>
+                <Form.Item label="下架时间">
+                    {getFieldDecorator('endDate', {
+                        // initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
+                        rules: [
+                            { required: true, message: '请输入下架时间' },
+
+                            // {
+                            //     validator: (rule, value, callback) => {
+                            //         callback(moment(value).isSame(moment().add(1, 'days'), 'day') ? '金额最多5位整数 2位小数' : undefined)
+                            //     }
+                            // }
+
+                        ]
+                    })(
+                        <DatePicker
+                            showTime={{ format: 'HH:mm:ss' }}
+                            disabledDate={disabledDate}
+                            disabledTime={disabledTime}
+                            showToday={false}
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item label="分享设置" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
+                    {getFieldDecorator('shareImg', {
+                        // initialValue: formsDate.shareImg,
+                        rules: [
+                            { required: true, message: '请选择分享图片' },
+                        ]
+                    })(<ImageUploader />)}
+                </Form.Item>
+                <Form.Item label="活动分享语" help="可使用{name}代表用户昵称。">
+                    {getFieldDecorator('shareTitle', {
+                        // initialValue: formsDate.shareTitle,
+                        rules: [
+                            { required: true, message: '请输入活动分享语' },
+                        ]
+                    })(
+                        <Input
+                            placeholder="分享语，不超过15个字"
+                            maxLength="15"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item label="中间页飞机图" help="建议图片尺寸：750*1667px，比例9:20,格式：jpg。图片底部不要放置关键信息。">
+                    {getFieldDecorator('middleImg', {
+                        // initialValue: formsDate.middleImg,
+                        rules: [
+                            { required: true, message: '请选择中间页飞机图' },
+                        ]
+                    })(<ImageUploader />)}
+                </Form.Item>
+                <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" htmlType="submit">保存</Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>取消</Button>
+
+                </Form.Item>
+                <Row>
+                    <Col span={7}></Col>
+                    <Col span={17}><span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span></Col>
+                </Row>
+            </Form>
+            <Modal
+                title="新增成功"
+                visible={visible}
+                // onOk={handleOk}
+                // confirmLoading={confirmLoading}
+                onCancel={() => setVisible(false)}
+                footer={null}
+            // width="1000px"
+            // maskClosable={false}
+            >
+                建议修改内容以适合您的项目，若有红包等需要消费的内容，请到资金管理中查看余额是否充足
+                <div style={{ width: '300px', margin: '30px auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" style={{ width: '140px' }} onClick={toH5Edit}>修改配置</Button>
+
+                    <Button style={{ width: '140px' }} onClick={toDrainageDetail}>查看H5活动详情</Button>
+                </div>
+            </Modal>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/components/ContactInfo.jsx

@@ -0,0 +1,258 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, Select, InputNumber } from 'antd';
+import { render } from 'react-dom';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import styles from './style.less';
+import cardImg from '../../../../assets/card.png';
+import girlImg from '../../../../assets/girl.png';
+import boyImg from '../../../../assets/boy.png';
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+/**
+ * 项目类型 form 表单子组件
+ *
+ * @param {*} props
+ */
+class TypeForm extends React.Component {
+
+  componentDidMount() {
+    console.log(this.props.type, 'this.props.type')
+    this.props.form.setFieldsValue(this.props.type)
+  }
+
+  onChange(e, name) {
+    // console.log(e)
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        this.props.onSuccess(values)
+      }
+    });
+  }
+
+  close() {
+    this.props.onClose(this.props.form.getFieldsValue(['buildingTypeId']))
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+
+    return (
+      <>
+        <Col span={24} className={styles.card} >
+          <Form {...formItemLayout} style={{ padding: '30px 26px' }}>
+            <div className={styles.flexItem}>
+              <img src={this.props.type.avatar} height="50px" width="50px" style={{ borderRadius: '50%', margin: ' 0 7px 0 10px' }} /><span>{this.props.type.contactName}</span>
+            </div>
+            <div className={styles.flexItem} style={{ justifyContent: 'space-between' }}>
+              <div>
+                {this.props.type.sex != '' && this.props.type.sex != null && <div className={styles.flexItem}>
+                  <div className={styles.left}> 性别 </div>
+                  <div className={styles.right} style={{ display: 'flex', alignItems: 'center' }}>{this.props.type.sex == '1' ? '男' : '女'}<img src={this.props.type.sex == '1' ? boyImg : girlImg} height="16px" width="16px" style={{ marginLeft: '5px' }} /></div>
+                </div>}
+                {this.props.type.appellation != '' && this.props.type.appellation != null && <div className={styles.flexItem}>
+                  <div className={styles.left}><img src={cardImg} height="18px" width="24px" /></div>
+                  <div className={styles.right}>{this.props.type.appellation}</div>
+                </div>}
+                {this.props.type.telephone != '' && this.props.type.telephone != null && <div className={styles.flexItem}>
+                  <div className={styles.left}> 固话 </div>
+                  <div className={styles.right}>{this.props.type.telephone}</div>
+                </div>}
+                {this.props.type.phone != '' && this.props.type.phone != null && <div className={styles.flexItem}>
+                  <div className={styles.left}> 手机 </div>
+                  <div className={styles.right}>{this.props.type.phone}</div>
+                </div>}
+                {this.props.type.mail != '' && this.props.type.mail != null && <div className={styles.flexItem}>
+                  <div className={styles.left}> 邮箱 </div>
+                  <div className={styles.right}>{this.props.type.mail}</div>
+                </div>}
+                {this.props.type.address != '' && this.props.type.address != null && <div className={styles.flexItem}>
+                  <div className={styles.left}> 联系地址 </div>
+                  <div className={styles.right}>{this.props.type.address}</div>
+                </div>}
+              </div>
+              {this.props.type.wxCardImg != null && this.props.type.wxCardImg != '' &&
+              <div style={{ textAlign: 'center' }}>
+                <img src={this.props.type.wxCardImg} height="80px" width="80px" />
+                <p style={{ margin: ' 0px', fontSize: '0.096rem', color: '#666' }}>扫码添加微信好友</p>
+                <p sstyle={{ margin: ' 0px', fontSize: '0.096rem', color: '#666' }}>备注H5活动咨询</p>
+              </div>}
+            </div>
+          </Form>
+        </Col>
+      </>
+    )
+  }
+}
+
+const WrappedTypeForm = Form.create({ name: 'TypeForm' })(TypeForm);
+
+/**
+ *项目类型组件
+ *
+ * @param {*} props
+ */
+class ProjectTypeBody extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      one: false,
+      projectType: [],
+      defaultCheckboxValue: [], // 多选框默认选中的值
+      visible: true,
+      data: [],
+      sampleId: props.sampleId,
+      // data: [{ buildingTypeId: '1', buildingTypeName: '公寓', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '2', buildingTypeName: '住宅', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '3', buildingTypeName: '太平房', price: '10', decoration: '全包', rightsYear: '10', status: '1' }],
+    }
+  }
+
+  componentDidMount() {
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  componentDidUpdate(prevProps) {
+    // 典型用法（不要忘记比较 props）：
+    if (this.props.value !== prevProps.data && !this.state.one) {
+      this.setValue()
+      this.setState({ one: true })
+    }
+  }
+
+  onSuccess = (values, item) => {
+    const newData = this.getNewProjectType(values)
+    this.setState({ data: newData })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(newData)
+    }
+  }
+
+  onCheckboxChange = checkedValues => {
+    const checked = (`${checkedValues}` || '').split(',')
+    const { projectType } = this.state
+    const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, startPrice: null, endPrice: null, priceType: "average", decoration: null, rightsYear: null, status: '1' }))
+    const updateProjectDate = this.updateProjectType(tempDate)
+    console.log('updateProjectDate: ', updateProjectDate)
+    this.setState({ data: updateProjectDate })
+    this.setState({ defaultCheckboxValue: updateProjectDate.map(item => item.buildingTypeId) })
+  }
+
+  onClose = e => {
+    console.log(2)
+    const { data } = this.state
+    console.log('onClose——data: ', data)
+    console.log('onClose: ', e.buildingTypeId)
+    const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    console.log('onClose——data111: ', buildingType)
+    this.setState({ data: buildingType })
+    this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(buildingType)
+    }
+  }
+
+  getNewProjectType = values => {
+    const data = []
+    this.state.data.map(item => {
+      if (item.buildingTypeId === values.buildingTypeId) {
+        data.push(values)
+      } else {
+        data.push(item)
+      }
+    })
+    console.log('getNewProjectType', getNewProjectType)
+    return data
+  }
+
+  updateProjectType = values => {
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
+
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
+  }
+
+  getList = params => {
+    request({ ...apis.taH5SampleManager.taContactList, urlData: { id: this.state.sampleId } }).then(res => {
+      this.setState({ data: res.records })
+      console.log(this.state.data, 'data');
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  setValue = () => {
+    let tempData = []
+    let tempCheckboxValue = []
+    const { value } = this.props
+    // console.log('value: ', value)
+    if (value !== undefined && value !== null) {
+      tempData = value
+      tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+      this.setState({ defaultCheckboxValue: tempCheckboxValue })
+      this.setState({ data: tempData })
+    }
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    })
+  }
+
+  handleOk = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  handleCancel = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  showMadel = () => {
+    this.setState({ visible: true })
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  render() {
+    return (
+      <>
+        <Row type="flex" justify="space-between">
+          {
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.buildingTypeId} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+          }
+        </Row>
+      </>
+    )
+  }
+}
+
+export default ProjectTypeBody

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/components/style.less

@@ -0,0 +1,26 @@
+.card{
+    position: relative;
+    border: 1px solid #eee;
+    margin-top: 16px;
+    min-width: 480px;
+    box-shadow: 0px 0px 10px 4px rgba(0;0;0;0.12);
+    border-radius: 6px;
+   
+    .flexItem{
+        display: flex;
+        align-items: center;
+        .left{
+            font-size: 0.096rem;
+            color: #666;
+            width: 0.4rem;
+            text-align: right;
+            line-height: 0.2rem;
+            margin-right: 0.2rem;
+        }
+        .right{
+            font-size: 0.1rem;
+            color: #333;
+            text-align: right;
+        }
+    }
+}

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -0,0 +1,165 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import DragableUploadImageList from './components/ContactInfo'
+import TextArea from 'antd/lib/input/TextArea';
+import copy from 'copy-to-clipboard';
+import copyImg from '../../../assets/copy.png';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+  const sampleId = props.location.query.id;
+  const [demandData, setDemandData] = useState({})
+  const [demandNum, setDemandNum] = useState()
+
+  useEffect(() => {
+    getDemandData(sampleId);
+  }, [])
+
+  // 查询列表
+  const getDemandData = (demandId) => {
+    request({ ...apis.taH5SampleManager.taH5SampleById, urlData: { id: sampleId } }).then((data) => {
+      setDemandData(data)
+      setDemandNum(data.demandNum)
+      props.form.setFieldsValue(data)
+    })
+  }
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+
+    request({ ...apis.taH5SampleManager.taH5SampleById, urlData: { id: sampleId } }).then((data) => {
+      if (rowData) {
+        router.push({
+          pathname: '/h5SampleManager/h5Sample/add',
+          query: {
+            id: sampleId,
+            sampleName: demandData.sampleName
+          },
+        });
+        return
+      }
+    }).catch(err => {
+      message.info("该H5样例已取消发布或已删除")
+    })
+
+
+  }
+
+  const toAddH5 = rowData => () => {
+    router.push({
+      pathname: '/h5SampleManager/h5Sample/addH5',
+      query: {
+        id: sampleId,
+        sampleName: demandData.sampleName
+      },
+    });
+
+
+  }
+  const toCancel = () => {
+    router.go(-1)
+  }
+
+  function viewDemand() {
+    router.push({
+      pathname: '/h5SampleManager/h5Demand/list',
+      query: {
+        id: sampleId,
+        sampleName: demandData.sampleName,
+      },
+    });
+  }
+
+  //打开新页面
+  const copyLink = (e) => {
+    copy(e)
+    message.info('复制成功')
+  }
+
+  function handleSubmit(e) {
+  }
+
+  function newTab(e) {
+    console.log(e, 'eeeeeeee')
+    const newWin = window.open('about:blank');
+    newWin.location.href = e
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 6 }} wrapperCol={{ span: 14 }} style={{ position: 'relative' }} onSubmit={handleSubmit}>
+        <Form.Item label="样例名">
+          <span>{demandData.sampleName}</span>
+        </Form.Item>
+        {demandData.sampleTryLink != '' && demandData.sampleTryLink != null && <Form.Item label="样例体验链接" help="请复制发送到手机，用手机微信打开，PC端打开样式比例与手机端不同，以手机端为准">
+          <span>{demandData.sampleTryLink}</span><span style={{ marginLeft: '10px' }}><a onClick={(e) => copyLink(demandData.sampleTryLink)} style={{ color: 'orange' }}> <img src={copyImg} height="16px" width="14px" /> 复制链接</a></span>
+        </Form.Item>}
+        {demandData.sampleTryCode != '' && demandData.sampleTryCode != null && <Form.Item label="样例体验小程序码/二维码" help="请使用微信扫码查看样例体验">
+          <img src={demandData.sampleTryCode} height="100px" width="120px" />
+        </Form.Item>}
+        {demandData.taContactList != null && demandData.taContactList != '' && <Form.Item label="联系人">
+          <span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>若您想在您的小程序举办类似活动，请联系以下联系人咨询，或直接点击底部的 提交需求 按钮下单，下单后与联系人沟通定制活动</span>
+          <DragableUploadImageList sampleId={sampleId}></DragableUploadImageList>
+        </Form.Item>}
+        <Form.Item label="样例内容">
+          {demandData.sampleType === 'link' && <div><span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>点击链接查看内容</span><br /></div>}
+          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent }}></div>) : getFieldDecorator('sampleContentLink')(<Navigate to={demandData.sampleContentLink}>{demandData.sampleContentLink}</Navigate>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <div style={{ margin: '0.16rem 0 0.06rem' }}>
+            {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+              <Button type="primary" onClick={toAddH5(sampleId)} style={{ marginRight: '20px' }}>
+                创建H5活动
+              </Button>
+            </AuthButton>}
+            <Button type="primary" onClick={toDetail(sampleId)} style={{ marginRight: '20px' }}>
+              提交需求
+          </Button>
+            <Button danger onClick={() => toCancel()} style={{ marginLeft: '20px' }}>
+              取消
+          </Button>
+          </div>
+        </Form.Item>
+        <div style={{ position: 'fixed', right: '0.4rem', bottom: '6%' }}>
+          {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+            <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginBottom: '20px' }}>样例可直接使用 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
+              <Button type="primary" onClick={toAddH5(sampleId)} >
+                创建H5活动
+              </Button>
+            </div>
+          </AuthButton>}
+          <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between' }}>我想办类似活动 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
+            <Button type="primary" onClick={toDetail(sampleId)} >
+              提交需求
+              </Button>
+          </div>
+
+          {demandNum != 0 && <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginTop: '10px' }}>已有{demandNum + '个'}需求单 <span style={{ margin: '0 0.1rem' }}>>></span>
+            <Button danger onClick={() => viewDemand()}>
+              查看需求
+            </Button>
+          </div>
+          }
+        </div>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/list.jsx

@@ -0,0 +1,198 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, message, Col, Pagination, Alert, notification, Modal } 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';
+import AuthButton from '@/components/AuthButton';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+/**
+ *卡片
+ *
+ * @returns
+ */
+function CartBody(props) {
+  const { data } = props
+
+  function toEdi(record) {
+    router.push({
+      pathname: '/h5SampleManager/h5Sample/detail',
+      query: {
+        id: record.sampleId,
+      },
+    })
+  }
+  const tagList = data.tag.split(',')
+
+  // src={((data.buildingImg && data.buildingImg[0]) || {}).url}background: `url(${item.caseCoverImg})` style={{ background: `url(((data.buildingImg && data.buildingImg[0]) || {}).url)` }}
+  const { buildingImg } = data
+  console.log("buildingImg1: ", data.coverImg)
+  return (
+    <Card
+      hoverable
+      onClick={() => toEdi(data)}
+      style={{ minWidth: '330px', borderRadius: '12px', margin: '10px 20px 10px 0', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+    // cover={}
+    // bodyStyle={{ padding: '10px 20px' }}
+    >
+      {/* 因为 background 方式设置图片背景，如果 图片url 存在空格或者其他特殊字符，导致显示不出来，需要进行 encodeURI(xxx) 转码 */}
+      {tagList.length > 0 && <div className={Styles.recommderTagBox}>
+        {tagList.map((tag, index) =>
+          <span key={index + 'tag'} style={index % 2 == 0 ? { background: '#4886FF' } : { background: '#34BD28' }} className={Styles.recommderTag}>{tag}</span>
+        )}
+      </div>
+
+      }
+      <img className={Styles.cover} style={{ backgroundImage: `url('` + data.coverImg + `')` }}   ></img>
+      <p className={Styles.cardText} style={{ padding: '0.1rem 0.096rem',marginBottom:'0px' }}>
+        {/* <span className={Styles.title}>样例名</span> */}
+        <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>{data.sampleName}</span>
+      </p>
+    </Card>
+  )
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [], size: 0 })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 9 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.taH5SampleManager.taH5Sample, params: { ...params } }).then(res => {
+      setDataSource(res)
+      console.log("res:", res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // eslint-disable-next-line no-console
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        if (values.startDate !== undefined) {
+
+          values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        }
+        getList({ pageNum: 1, pageSize: 9, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() })
+  }
+
+
+  /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 9 })
+  }
+
+  function onSuccess() {
+    getList({ pageNum: 1, pageSize: 9 })
+  }
+
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sampleName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="样例名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tag')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="标签"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            搜索
+            </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row style={{ paddingTop: ' 16px' }}>
+        {
+          dataSource.records.map((item, _) => (
+            <Col span={8}>
+              <CartBody data={item} key={item.buildingId} onSuccess={() => onSuccess()} />
+            </Col>
+          ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
+      </div>
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/style.css

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

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/style.less

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

estateagents-admin-manager/src/pages/h5SampleManager/h5Sample/style.wxss

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

estateagents-admin-manager/src/pages/house/house/add/HouseBatchAdd.jsx

@@ -0,0 +1,167 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Modal } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import { fetch } from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
+import request from '@/utils/request';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+function HouseBatchAdd(props) {
+
+const [data, setData] = useState({list: [], total: 0})
+
+const [uploadFile, setUploadFile] = useState(null)
+
+const uploadExcel = fetch(apis.house.uploadExcel)
+
+const [loadingState, setLoadingState] = useState(false)
+
+const uploaderProps = {
+  name: 'file',
+  accept: '.xls, .xlsx',
+  showUploadList: false,
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+    setLoadingState(true);
+    const data = new FormData()
+    data.append('file', file)
+    data.append('salesBatchId', props.location.query.salesBatchId)
+    data.append('buildingId', props.location.query.buildingId)
+
+    setUploadFile(file)
+
+    uploadExcel({ data }).then((res) => {
+      setLoadingState(false);
+      setData(res)
+      onSuccess(res, file);
+    }).catch(err => {
+      setLoadingState(false);
+    });
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
+}
+
+//取消
+function handleCancel(){
+  router.push({
+    pathname: '/house/house/edit',
+    query: {
+      id: props.location.query.salesBatchId,
+      buildingId: props.location.query.buildingId,
+    },
+  });
+}
+
+function batchSaveHouse() {
+  if(null == uploadFile){
+    message.error('请先上传房源数据，再提交')
+    return
+  }
+  setLoadingState(true);
+  const uploadData = new FormData()
+  uploadData.append('file', uploadFile)
+  uploadData.append('salesBatchId', props.location.query.salesBatchId)
+  uploadData.append('buildingId', props.location.query.buildingId)
+
+  request({ ...apis.house.saveExcelValue, data: uploadData,headers: "content-type=multipart/form-data" }).then(res => {
+    setLoadingState(false);
+    Modal.info({
+      title: '新增房源成功',
+      content: '请确认全部数据正常，然后在房源详情页 销售批次栏 选择 发布状态 为“是” 将房源 发布到小程序。如需要置业顾问或用户分享，请在房源详情中配套海报图和分享图。',
+      okText: '确定',
+      onOk() {
+        router.push({
+          pathname: '/house/house/edit',
+          query: {
+            id: props.location.query.salesBatchId,
+            buildingId: props.location.query.buildingId,
+          },
+        });
+      },
+    });
+    
+  }).catch(err => {
+    setLoadingState(false);
+    // openNotificationWithIcon('error', err.message)
+  })
+}
+
+const columns = [
+  {
+    title: '期/区',
+    dataIndex: 'termName',
+    key: 'termName',
+  },
+  {
+    title: '楼栋',
+    dataIndex: 'blockName',
+    key: 'blockName',
+  },
+  {
+    title: '单元',
+    dataIndex: 'unitName',
+    key: 'unitName',
+  },
+  {
+    title: '层',
+    dataIndex: 'floorName',
+    key: 'floorName',
+  },
+  {
+    title: '房号',
+    dataIndex: 'roomName',
+    key: 'roomName',
+  },
+  {
+    title: '价格（万元）',
+    dataIndex: 'price',
+    key: 'price',
+  },
+  // {
+  //   title: '预选基础热度',
+  //   dataIndex: 'heat',
+  //   key: 'heat',
+  // },
+  {
+    title: '发布状态',
+    dataIndex: 'status',
+    key: 'status',
+    render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+  },
+]
+
+
+return (
+  <>
+    <div style={{ marginBottom: '30px' }} ><span>1.导入房源先下载模板--></span><a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%88%BF%E6%BA%90%E6%A8%A1%E6%9D%BF.xlsx" download="房源模板.xlsx"><Button type="primary" htmlType="submit">下载模板</Button></a></div>
+    <div style={{ marginBottom: '30px' }}>2.使用excel打开模板文件，编辑房源数据并保存</div>
+    <div style={{ marginBottom: '30px' }}><span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit" loading={loadingState}>上传</Button></Upload></div>
+    <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+    <Table dataSource={data.list} columns={columns} pagination={{ total: data.total }} style={{ marginTop: '20px' }} rowKey="House" />
+
+    <div style={{ marginTop: '30px' }}>5.全部正常请点击提交</div>
+    <Button type="primary" loading={loadingState} onClick={() => batchSaveHouse()}>提交</Button>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <span>暂时未确定房源?  --></span><Button onClick={() => handleCancel()}>以后处理</Button>
+  </>
+)
+}
+export default HouseBatchAdd

estateagents-admin-manager/src/pages/house/house/add/index.jsx

@@ -0,0 +1,141 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col} from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../../style/GoodsList.less';
+import SelectCity from '../../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import ImageUpload from '../../../../components/XForm/ImageUpload'
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import SaleBatchHelpDoc from '../edit/components/SalesBatchHelpDoc';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+
+
+const header = props => {
+  const { salesBatchId } = props.location.query
+  console.log(salesBatchId)
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+  if(salesBatchId){
+    useEffect(() => {
+      getSaleBatchData(salesBatchId);
+    },[])
+
+  // 查询列表
+  const getSaleBatchData = (salesBatchId) => {
+      request({ ...apis.system.taPolicy, urlData: {id: salesBatchId} }).then((data) => {
+          console.log(data)
+          setSaleBatchData(data)
+      })
+    }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/house/house/list',
+    });
+  }
+
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        let {preSelectTime, ...submitValue} = values
+        if(null != preSelectTime && preSelectTime.length > 0){
+          const [preselectionStartTime, preselectionEndTime] = preSelectTime
+          submitValue.preselectionStartTime = moment(preselectionStartTime).format('YYYY-MM-DD HH:mm:ss');
+          submitValue.preselectionEndTime = moment(preselectionEndTime).format('YYYY-MM-DD HH:mm:ss');
+        }else{
+          submitValue.preselectionStartTime = null
+          submitValue.preselectionEndTime = null
+        }        
+        // getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        console.log(submitValue)
+        request({ ...apis.house.addTaSalesBatch, data: { ...submitValue },}).then((data) => {
+          message.info("保存成功,请上传房源")
+          console.log(data,"datattttttt")
+          router.push({
+            pathname: '/house/house/batch',
+            query: {
+              salesBatchId: data.salesBatchId,
+              buildingId: data.buildingId,
+            },
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="销售批次名">
+          {getFieldDecorator('salesBatchName', {
+            rules: [{ required: true, message: '请输入销售批次名' }],
+          })(<Input maxLength={20} placeholder="为本次销售命名，如二期销售" />)}
+        </Form.Item>
+        <Form.Item label="销售楼盘">
+          {getFieldDecorator('buildingId', {
+            rules: [{ required: true, message: ' 请输入销售楼盘' }],
+          })(<BuildSelect />)}
+        </Form.Item>
+        <Form.Item label="备注">
+          {getFieldDecorator('remark')
+            (<Input maxLength={20} placeholder="本次销售哪几栋楼，多少套房源等"/>)}
+        </Form.Item>
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value="0">否</Option>
+            <Option value="1">是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="房源显示价格">
+          {getFieldDecorator('displayHousePrice', {
+              rules: [{ required: true, message: '请选择房源是否显示价格' }],
+            })(<Select placeholder="房源是否显示价格" style={{ width: '300px' }}>
+            <Option value="false">否</Option>
+            <Option value="true">是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="分栋鸟瞰图" help="建议尺寸：690*388px，比例16::9，格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。">
+              {getFieldDecorator('aerialViewImg', {
+                  rules: [{ required: true, message: '请上传分栋鸟瞰图' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item label="说明信息">
+          <Icon type="question-circle" theme="filled" style={{ fontSize: '18px', color: '#F00' }} onClick={() => setShowHelp(true)} />
+        </Form.Item> 
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            下一步
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+      <SaleBatchHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/house/house/edit/components/base.jsx

@@ -0,0 +1,170 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import styles from '../../../../style/GoodsList.less';
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import apis from '../../../../../services/apis';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
+import request from '../../../../../utils/request';
+import SalesBatchHelpDoc from './SalesBatchHelpDoc';
+import MiniQRCode from '@/components/MiniQRCode';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const Base = props => {
+  const salesBatchId = props.salesBatchId.batchId
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+  
+  if(salesBatchId){
+    useEffect(() => {
+      getSaleBatchData(salesBatchId);
+    },[])
+
+  // 查询列表
+  const getSaleBatchData = (salesBatchId) => {
+    request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
+        setSaleBatchData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/house/house/list',
+    });
+  }
+  const fields = [
+    {
+      label: '销售批次名',
+      name: 'salesBatchName',
+      type: FieldTypes.Text,
+      value: saleBatchData.salesBatchName,
+      rules: [
+        {
+          required: true,
+          message: '销售批次名不合法',
+          max:20,
+        },
+      ],
+    },
+    {
+      label: '销售楼盘',
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: saleBatchData.buildingId,
+      rules: [
+        {
+          required: true,
+          message: '请选择销售楼盘',
+        },
+      ],
+    },
+    {
+      label: '备注',
+      name: 'remark',
+      type: FieldTypes.Text,
+      value: saleBatchData.remark,
+      rules: [
+        {
+          message: '最多20字',
+          max:20
+        }
+      ],
+    },
+    {
+      label: '发布状态',
+      name: 'status',
+      type: FieldTypes.Select,
+      dict: [{label:"否",value:0},{label:"是",value:1}],
+      value: saleBatchData.status != null ? saleBatchData.status : 1,
+      rules: [
+        {
+          required: true,
+          message: '请选择发布状态',
+        },
+      ],
+    },
+    {
+      label: '房源显示价格',
+      name: 'displayHousePrice',
+      type: FieldTypes.Select,
+      dict: [{label:"否",value:false},{label:"是",value:true}],
+      value: saleBatchData.displayHousePrice != null ? saleBatchData.displayHousePrice : true,
+      rules: [
+        {
+          required: true,
+          message: '请选择房源显示价格',
+        },
+      ],
+    },
+    // {
+    //   label: '预选时间',
+    //   name: 'preSelectTime',
+    //   type: FieldTypes.RangePicker,
+    //   props: {showTime : 'HH:mm:ss' },
+    //   value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm:ss'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm:ss')] : null,
+    //   rules: [
+    //     { required: true, message: '请选择预选时间' },
+    //   ],
+    // },
+    {
+      label: '分栋鸟瞰图',
+      name: 'aerialViewImg',
+      type: FieldTypes.ImageUploader,
+      value: saleBatchData.aerialViewImg,
+      help: '建议图片尺寸：690*388px，比例16::9，格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。',
+      rules: [
+        {
+          required: true,
+          message: '请选择分栋鸟瞰图',
+        },
+      ],
+    },
+    {
+      label: '扫码查看房源列表',
+      name: 'qrCode',
+      // type: FieldTypes.ImageUploader,
+      value: saleBatchData.qrCode,
+      // props: { disabled: true },
+      render: <MiniQRCode targetId={saleBatchData.salesBatchId} page="onlineSelling/pages/houseList/index" />
+    },
+    {
+      label: '说明',
+      name: 'buildingId',
+      render: <Icon type="question-circle" theme="filled" style={{ fontSize: '18px', color: '#F00' }} onClick={() => setShowHelp(true)} />,
+      value: saleBatchData.buildingId,
+    },
+  ]
+  
+    const handleSubmit = values => { 
+      let {preSelectTime, ...submitValue} = values
+        if(null != preSelectTime && preSelectTime.length > 0){
+          const [preselectionStartTime, preselectionEndTime] = preSelectTime
+          submitValue.preselectionStartTime = moment(preselectionStartTime).format('YYYY-MM-DD HH:mm:ss');
+          submitValue.preselectionEndTime = moment(preselectionEndTime).format('YYYY-MM-DD HH:mm:ss');
+        }else{
+          submitValue.preselectionStartTime = null
+          submitValue.preselectionEndTime = null
+        }        
+        console.log(submitValue)
+        request({ ...apis.house.updateTaSalesBatch, urlData: {id: salesBatchId},data: submitValue, }).then((data) => {
+          message.info("保存成功")
+          // cancelPage()
+        }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+    
+  return (
+    <>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      <SalesBatchHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
+    </>
+  );
+}
+
+export default Base

estateagents-admin-manager/src/pages/house/house/edit/components/house.jsx

@@ -0,0 +1,322 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } 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';
+import BlockSelect from '../../../../../components/HouseSelect/BlockSelect'
+import UnitSelect from '../../../../../components/HouseSelect/UnitSelect'
+import FloorSelect from '../../../../../components/HouseSelect/FloorSelect'
+import RoomSelect from '../../../../../components/HouseSelect/RoomSelect'
+import ApartmentSelect from '../../../../../components/HouseSelect/ApartmentSelect';
+import styles from '../../../../style/GoodsList.less';
+import EditIcon from '@/components/EditIcon';
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function House(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+  const [viable, setViable] = useState(false)
+  const [houseIdList, setHouseIdList] = useState([])
+  const [selectedRowKeys, setSelectedRowKeys] = useState([])
+
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taHousingResources, params: { ...params, salesBatchId: props.salesBatchId, buildingId: props.buildingId } }).then(res => {
+      console.log(res, "resresres")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10 })
+  }
+
+  // 分页
+  function changePageNum(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const rowSelection = {
+    selectedRowKeys,
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+      setSelectedRowKeys(selectedRowKeys)
+      setHouseIdList(selectedRows)
+    },
+  };
+
+  function showEdi(e) {
+    props.onSuccess(e);
+  }
+
+  //打开model
+  function showAparement() {
+    if (houseIdList.length < 1) {
+      openNotificationWithIcon('error', '请先选择需要改变的房源')
+      return
+    }
+    setViable(true)
+  }
+
+  function handleCancel() {
+    setViable(false)
+  }
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+
+        getList({ pageNumber: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // model提交事件
+  const handleSubmitApartMent = e => {
+    props.form.validateFields((err, values) => {
+      // if (!err) {
+      if (!values.apartmentIdSelected) {
+        openNotificationWithIcon('error', '请选择户型')
+        return
+      }
+      request({ ...apis.house.changeApartment, data: { apartmentId: values.apartmentIdSelected, houseIdList } }).then(res => {
+        setViable(false)
+        setSelectedRowKeys([])
+        setHouseIdList([])
+        getList({ pageNumber: data.current, pageSize: 10 })
+        openNotificationWithIcon('success', '操作成功')
+      }).catch(err => {
+        openNotificationWithIcon('error', err.message)
+      })
+      // }
+    });
+  }
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteHouseResource(record) {
+    Modal.confirm({
+      title: '确定将所选房删除?',
+      content: '如果只是不想让用户看到房源，请修改发布状态为否，删除房源会导致大量关联数据异常。若房源有预选记录或认筹记录则无法删除，请先删除预选记录。',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.house.houseDelete, urlData: { id: record.houseId } }).then(res => {
+          getList({ pageNumber: 1, pageSize: 10 })
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() { },
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+    },
+    {
+      title: '房源',
+      render: (x, row) => <><span>{row.termName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
+    },
+    // {
+    //   title: '期/区',
+    //   dataIndex: 'termName',
+    //   key: 'termName',
+    // },
+    // {
+    //   title: '楼栋',
+    //   dataIndex: 'blockName',
+    //   key: 'blockName',
+    // },
+    // {
+    //   title: '单元',
+    //   dataIndex: 'unitName',
+    //   key: 'unitName',
+    // },
+    // {
+    //   title: '层',
+    //   dataIndex: 'floorName',
+    //   key: 'floorName',
+    // },
+    // {
+    //   title: '房号',
+    //   dataIndex: 'roomName',
+    //   key: 'roomName',
+    // },
+    {
+      title: '价格（万元）',
+      dataIndex: 'price',
+      key: 'price',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    // {
+    //   title: '预选基础热度',
+    //   dataIndex: 'heat',
+    //   key: 'heat',
+    // },
+    // {
+    //   title: '预选实际热度',
+    //   dataIndex: 'realHeat',
+    //   key: 'realHeat',
+    //   render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "preselection",houseId: row.houseId})}>{row.realHeat}</span></>,
+    // },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+    },
+    {
+      title: '最后修改人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+    },
+    {
+      title: '最后修改时间',
+      dataIndex: 'updateDate',
+      key: 'updateDate',
+      render: (x, row) => <><span>{row.updateDate != null ? `${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <div style={{ marginRight: '16px' }} onClick={() => showEdi({ type: "add", houseId: record.houseId })}> <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></div>
+            <div onClick={() => deleteHouseResource(record)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></div>
+          </div>
+        </>
+      ),
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <div align="right" style={{ marginTop: '-52px', marginBottom: '20px' }}><Button onClick={() => router.go(-1)}>返回</Button></div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('termName')(
+            <Input placeholder="请输入期/区" />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('blockName')(
+            <Input placeholder="请输入楼栋" />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('unitName')(
+            <Input placeholder="请输入单元" />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('floorName')(
+            <Input placeholder="请输入层" />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('roomName')(
+            <Input placeholder="请输入房号" />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('apartmentId')(
+            <ApartmentSelect buildingId={props.buildingId} />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select placeholder="发布状态" style={{ width: '120px' }}>
+              <Option value="0">否</Option>
+              <Option value="1">是</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('houseId')(
+            <Input placeholder="请输入房源编号" />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="danger" onClick={() => showEdi({ type: "add", houseId: '' })} style={{ marginTop: '20px' }}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi({ type: "batch" })} style={{ marginLeft: '18px' }}>批量导入房源</Button>
+      <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px' }}>批量修改对应户型</Button>
+
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ defaultCurrent: 1, current: data.current, total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px' }} rowKey={r => r.houseId} />
+
+      <Modal
+        title="批量修改对应户型"
+        width={400}
+        destroyOnClose="true"
+        footer={null}
+        visible={viable}
+        onOk={() => this.handleOk()}
+        onCancel={e => handleCancel(e)}
+      >
+        <Form onSubmit={e => handleSubmitApartMent(e)}>
+          <Form.Item label="将所选房源对应户型信息修改为" >
+            {getFieldDecorator('apartmentIdSelected')(
+              <ApartmentSelect buildingId={props.buildingId} />
+            )}
+          </Form.Item>
+          <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => handleCancel()}>取消</Button>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'House' })(House);
+export default WrappedHeader

estateagents-admin-manager/src/pages/house/house/edit/index.jsx

@@ -0,0 +1,95 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import { router } from 'umi';
+
+import Base from './components/base'
+import HouseTab from './components/houseTab'
+import Poster from './components/poster'
+import Share from './components/share'
+import ShareRecord from './components/shareRecord'
+import VisitRecord from './components/visitRecord'
+
+
+const { Option } = Select
+const { TabPane } = Tabs;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+function EditHouse(props) {
+  const {salesBatchId} = props.location.query.id;
+  console.log(props.location.query.id)
+  const [tab, setTab] = useState('base')
+  const [salesBatchData, setSalesBatchData] = useState({ salesBatchId: undefined })
+  const [houseId, setHouseId] = useState('')
+
+  function tabsCallback(e) {
+    setTab(e.target.value)
+  }
+
+  // building 回调
+  function buildingOnSuccess(e) {
+    setBuildingData(e)
+  }
+
+  function housTabChange(e) {
+    setHouseId(e.houseId)
+    setTab('preselectionRecord')
+  }
+
+  const batchId = salesBatchData.salesBatchId || (props.location.query && props.location.query.id)
+
+  return (
+    <>
+      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+        <Radio.Button value="base">销售批次信息</Radio.Button>
+        <Radio.Button value="house">房源信息</Radio.Button>
+        <Radio.Button value="poster">海报设置</Radio.Button>
+        <Radio.Button value="share">分享设置</Radio.Button>
+        {/* <Radio.Button value="preselectionImg">预选热度图</Radio.Button> */}
+        {/* <Radio.Button value="preselectionRecord">预选记录</Radio.Button> */}
+        {/* <Radio.Button value="identifyingChips">认筹单</Radio.Button> */}
+        {/* <Radio.Button value="pay">缴费单</Radio.Button> */}
+        {/* <Radio.Button value="refund">退费单</Radio.Button> */}
+        <Radio.Button value="shareRecord">分享记录</Radio.Button>
+        <Radio.Button value="visitRecord">分享访问记录</Radio.Button>
+      </Radio.Group>
+      <div style={{ marginTop: '20px' }}>
+        { (tab === 'base' && <Base salesBatchId={{ batchId }} onSuccess={e => buildingOnSuccess(e)}/>)} 
+        { (tab === 'house' && <HouseTab salesBatchId={props.location.query.id} buildingId={props.location.query.buildingId} onSuccess={e => housTabChange(e)}/>)}
+        { (tab === 'poster' && <Poster salesBatchId={{ batchId }}/>)}
+        { (tab === 'share' && <Share salesBatchId={{ batchId }}/>)}
+        { (tab === 'preselectionImg' && <PreselectionImg salesBatchId={batchId} />)}
+        { (tab === 'preselectionRecord' && <PreselectionRecord houseId={houseId} buildingId={props.location.query.buildingId} salesBatchId={{ batchId }}/>)}
+        { (tab === 'identifyingChips' && <IdentifyingChips houseId={houseId} buildingId={props.location.query.buildingId} salesBatchId={{ batchId }}/>)}
+        { (tab === 'pay' && <PaymentChips salesBatchId={{ batchId }}/>)}
+        { (tab === 'refund' && <Refund salesBatchId={{ batchId }}/>)}
+        { (tab === 'shareRecord' && <ShareRecord salesBatchId={{ batchId }}/>)}
+        { (tab === 'visitRecord' && <VisitRecord salesBatchId={{ batchId }}/>)}
+      </div>
+    </>
+  )
+}
+
+const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
+
+export default WrappedEditHouseForm