fix

config/routes.js

@@ -94,15 +94,20 @@ export default [
               {
                 path: '/customer/customer/list',
                 name: '客户列表',
-                component: './customer/customer/index',
+                component: './customer/Customer/index',
               },
-
-
               {
-                path: '/customer/customerlist/list',
-                name: '客户列表old',
-                component: './customer/customerlist/index copy.jsx',
+                path: '/customer/customerlist/privateCustomerDetail',
+                name: '私客详情',
+                hideInMenu: true,
+                component: './customer/Customer/PrivateCustomer/CustomerDetail',
               },
+
+              // {
+              //   path: '/customer/customerlist/list',
+              //   name: '客户列表old',
+              //   component: './customer/customerlist/index copy.jsx',
+              // },
               {
                 path: '/customer/customerlist/customerDetail',
                 name: '私客详情',
@@ -120,8 +125,73 @@ export default [
                 hideInMenu: true,
                 component: './customer/customerlist/publicCustomerDetail',
               },
+               {
+                path: '/customer/recommend/list',
+                name: '推荐记录',
+                component: './customer/Recommend',
+              },
+              {
+                path: '/customer/recommend/audit',
+                name: '客户审核',
+                hideInMenu: true,
+                component: './customer/Recommend/audit',
+              },
+            ],
+          },
+
+
+          {
+            path: '/carouselFigure',
+            name: '资源位管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/carouselFigure/carouselFigureList',
+                name: '轮播图',
+                component: './carouselFigure/carouselFigureList',
+              },
+              {
+                path: '/carouselFigure/editCarousel',
+                name: '轮播图编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editCarousel',
+              },
+              {
+                path: '/carouselFigure/advertisingList',
+                name: '开屏广告',
+                component: './carouselFigure/advertisingList',
+              },
+              {
+                path: '/carouselFigure/editAdvertising',
+                name: '开屏广告编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editAdvertising',
+              },
+              {
+                path: '/carouselFigure/propagandaList',
+                name: '宣传位',
+                component: './carouselFigure/propagandaList',
+              },
+              {
+                path: '/carouselFigure/propaganda',
+                name: '宣传位编辑',
+                hideInMenu: true,
+                component: './carouselFigure/propaganda',
+              },
+              {
+                path: '/carouselFigure/customImg/list',
+                name: '其他',
+                component: './carouselFigure/customImg/list',
+              },
+              {
+                path: '/carouselFigure/customImg/edit',
+                name: '其他编辑',
+                hideInMenu: true,
+                component: './carouselFigure/customImg/edit',
+              },
             ],
           },
+         
           {
             component: './404',
           },

package.json

@@ -31,11 +31,6 @@
     "tsc": "tsc",
     "ui": "umi ui"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run lint-staged"
-    }
-  },
   "lint-staged": {
     "**/*.less": "stylelint --syntax less",
     "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
@@ -70,7 +65,8 @@
     "umi-plugin-antd-theme": "^1.0.1",
     "umi-plugin-pro-block": "^1.3.2",
     "umi-plugin-react": "^1.9.5",
-    "umi-request": "^1.0.8"
+    "umi-request": "^1.0.8",
+    "wangeditor": "^4.7.1"
   },
   "devDependencies": {
     "@ant-design/pro-cli": "^1.0.18",

src/components/QueryTable/index.jsx

@@ -4,6 +4,7 @@ import TableList from '@/components/TableList'
 
 export default React.forwardRef((props, ref) => {
   const tableRef = useRef()
+  const searchRef = useRef()
   const [searchData, setSearchData] = useState({})
   const {api, searchFields, params, onPageChange, ...leftProps} = props
   const handleSearch = (data) => setSearchData(data)
@@ -14,11 +15,13 @@ export default React.forwardRef((props, ref) => {
         tableRef.current.reload()
       }
     },
+    getSearchData: searchData,
   }))
 
   return (
     <>
       <Search
+      ref={searchRef}
         fields={searchFields}
         onSearch={handleSearch}
         onReset={handleSearch}

src/components/TableList/index.jsx

@@ -12,7 +12,7 @@ export default React.forwardRef((props, ref) => {
   const [pageTotal, setPageTotal] = useState(0)
   const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10 })
 
-  const { api, params, onPageChange, ...tableProps } = props
+  const { api,urlData, params, onPageChange, ...tableProps } = props
 
   // 更新分页
   const updatePage = useCallback(
@@ -40,7 +40,7 @@ export default React.forwardRef((props, ref) => {
         pageNum: pageConfig.current,
         pageSize: pageConfig.pageSize,
       }
-      request({...api, params: queryParams }).then((res) => {
+      request({...api, urlData:urlData||undefined, params: queryParams }).then((res) => {
         const {total, records = []} = res
         setLoading(false)
         setList(records)

src/components/Wangedit/Wangedit.jsx

@@ -0,0 +1,109 @@
+import React from 'react';
+import E from 'wangeditor';
+import { fetch, apis } from '../../utils/request';
+
+/**
+ * @param {*} props
+ * @returns
+ */
+class Wangedit extends React.Component {
+  constructor(props, context) {
+    super(props, context);
+    this.state = {
+      html: undefined,
+      contenteditable: props.contenteditable == false ? false : true
+    }
+    this.editor = undefined;
+  }
+
+  render() {
+    return (
+      <div ref="editorElem" style={{ textAlign: 'left' }}>
+      </div>
+    );
+  }
+
+  componentDidMount() {
+    const elem = this.refs.editorElem
+    this.editor = new E(elem)
+    // 使用 onchange 函数监听内容的变化
+    this.editor.customConfig.onchange = html => {
+      this.setState({ html })
+
+      if (typeof this.props.onChange === 'function') {
+        this.props.onChange(html)
+      }
+    }
+    this.editor.customConfig.zIndex = 100
+    this.editor.customConfig.uploadImgMaxLength = 1
+    this.editor.customConfig.customUploadImg = function (files, insert) {
+      if (!files.length) return
+      
+      const data = new FormData()
+      data.append('file', files[0])
+
+      fetch(apis.image.upload)({data}).then(insert)
+    }
+    this.editor.customConfig.menus = [
+      'head',  // 标题
+      'bold',  // 粗体
+      'fontSize',  // 字号
+      'fontName',  // 字体
+      'italic',  // 斜体
+      'underline',  // 下划线
+      'strikeThrough',  // 删除线
+      'foreColor',  // 文字颜色
+      'backColor',  // 背景颜色
+      'list',  // 列表
+      'justify',  // 对齐方式
+      'quote',  // 引用
+      'image',  // 插入图片
+      'undo',  // 撤销
+      'redo'  // 重复
+    ]
+    
+    // 过滤 word 字符
+    this.editor.customConfig.pasteFilterStyle = false
+    this.editor.customConfig.pasteTextHandle = function(content) {
+      const regs = [
+        /<!--\[if [\s\S]*?endif\]-->/ig,
+        /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
+        /<[a-zA-Z0-9]+\:[^>]+\/>/ig,
+        /<style>[\s\S]*?<\/style>/ig,
+        new RegExp('\u2029', 'ig'),     // 替换word分隔符 序号 8233
+      ]
+
+      return regs.reduce((acc, reg) => {
+        return acc.replace(reg, '')
+      }, content)
+    }
+
+    this.editor.create()
+    this.editor.$textElem.attr('contenteditable',this.state.contenteditable);
+    this.editor.customConfig.uploadImgShowBase64 = true
+    this.editor.txt.html(this.props.value)
+  }
+
+  componentDidUpdate(props, state) {
+    if (this.props.value && !state.html) {
+      if (this.editor) {
+        this.editor.txt.html(this.props.value)
+      }
+    }
+  }
+
+  /**
+   *增加这个 shouldComponentUpdate 生命函数
+    处理自动聚焦到富文本上
+   *
+   * @param {*} nextProps
+   * @returns
+   * @memberof Wangedit
+   */
+  shouldComponentUpdate(nextProps) {
+    return nextProps.value !== this.editor.txt.html()
+  }
+}
+
+export default Wangedit
+

src/pages/carouselFigure/LiveGroup.jsx

@@ -0,0 +1,124 @@
+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 getGroupList = fetch(apis.taliveActivity.taLiveActivity)
+
+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.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        source: 2,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+       const getGroupTitle = val => {
+        return (data.records.filter(x => x.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+      }
+      const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+      updateGroup(buildingId ? undefined : value);
+
+      // updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        source: 2,
+        liveActivityTitle: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      // const getGroupTitle = val => {
+      //   return (data.records.filter(x => x.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+      // }
+      // const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'liveActivityTitle',
+      key: 'liveActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.liveActivityId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+             <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.liveActivityId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SalesBatchGroup.jsx

@@ -0,0 +1,110 @@
+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 getGroupList = fetch(apis.house.taSalesBatch)
+
+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.salesBatchId == val)[0] || {}).salesBatchName || '请选择销售批次'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        salesBatchName: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.salesBatchId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+       <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.salesBatchId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectActivity.jsx

@@ -0,0 +1,114 @@
+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 getActivities = fetch(apis.activity.listSelected)
+const { Search } = Input;
+
+export default (props) => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [activity, setActivity] = useState({ dynamicId: undefined, title: '请选择活动' })
+  const getActTitle = val => ((list.filter(x => x.dynamicId === val)[0]) || {}).title || '请选择活动'
+  const setAct = val => setActivity({ dynamicId: val, title: getActTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      setAct(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== activity.dynamicId) {
+    setAct(value);
+  }
+  const searchActivity =(e)=>{
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name:e
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+
+  let chooseVal = value
+
+  const handleChange = val => chooseVal = val
+
+  const setData = val => {
+    setAct(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'dynamicId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'name',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.dynamicId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{activity.title}</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.dynamicId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+
+  );
+}

src/pages/carouselFigure/SelectGroup.jsx

@@ -0,0 +1,110 @@
+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 getGroupList = fetch(apis.groupActivity.EffectiveList)
+
+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.groupActivityId == val)[0] || {}).activityName || '请选择拼团'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'activityName',
+      key: 'groupActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+         <Navigate onClick={() => setData(record.groupActivityId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div><Navigate onClick={() => setVisible(true)} >{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

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>
+  );
+}

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>
+  )
+}

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>
+  );
+}

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>
+  );
+}

src/pages/carouselFigure/advertisingList.jsx

@@ -0,0 +1,286 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } 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 SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editAdvertising',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)}><img src={image} className={styles.imgSmall} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '报名活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力活动' : contentType === 'group' ? '拼团活动' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '在线选房' : contentType === 'live' ? '直播活动' : '无'}</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.advert.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架' : '上架'} type={row.status === 1 ? 'down' : 'up'}  onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)}/>
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="activity">报名活动</Option>
+              <Option value="help">助力活动</Option>
+              <Option value="group">拼团活动</Option>
+              <Option value="h5">H5活动</Option>
+              <Option value="live">直播活动</Option>
+              <Option value="salesBatch">在线选房</Option>
+              <Option value="nothing">无</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="index">首页</Option>
+              <Option value="building">项目</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.advert.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.advert.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/carouselFigure/carouselFigureList.jsx

@@ -0,0 +1,284 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } 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 SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑页面
+  const toEditCarouse = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editCarousel',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.extendContent.publish" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'down' : 'up'} text={row.status === 1 ? '下架' : '上架'} onClick={changeStatus(row)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditCarouse(row.contentId)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+          }).catch((err) => {
+            console.log(err)
+            row.status = 0
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+          }).catch((err) => {
+            console.log(err)
+            row.status = 1
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
+              {/* <Option value="other">其他</Option> */}
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">积分商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.extendContent.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.extendContent.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList" />
+      <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

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);

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

src/pages/carouselFigure/editAdvertising.jsx

@@ -0,0 +1,426 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { FieldTypes, createForm } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit';
+import SelectActivity from './SelectActivity';
+import SelectNews from './SelectNews';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectH5 from './SelectH5';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const createEditor = () => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId = ''
+  let isHaveActive = false
+  let isCanChoose = true
+  let isHavePosition = false
+  let islet = true
+
+  const setExtraData = (data) => {
+    if (data.isHaveActive !== undefined) {
+      isHaveActive = data.isHaveActive
+      if (!isHaveActive) {
+        // data.contentType=null
+        data.buildingId = null
+      }
+    }
+    islet = isHaveActive
+    if (data.showPosition == 'index') {
+      isHavePosition = true;
+    } else {
+      isHavePosition = false;
+    }
+
+    // if (data.contentType == 'h5' || data.contentType=='live') {
+    //   isHaveActive = true;
+    // } else {
+    //   isHaveActive = false;
+    // }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    cityId = data.cityId
+    // console.log(data.buildingId, ' data.buildingId')
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = data => {
+    console.log(data, "data.buildingIddata.buildingId2")
+    islet = data.isHaveActive
+
+    if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
+      isHaveActive = false
+    } else {
+      isHaveActive = true
+    }
+    // if (!isHaveActivea && data.contentType === 'h5') {
+    //   // data.contentType=null
+    //   data.buildingId = null
+    // }
+
+    // if (data.isHaveActive !== undefined) {
+    //   isHaveActive = data.isHaveActive
+    //   if (!isHaveActive) {
+    //     // data.contentType=null
+    //     data.buildingId = null
+    //   }
+    // }
+    if (data.showPosition == 'index') {
+      isHavePosition = true;
+    } else {
+      isHavePosition = false;
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    console.log(data.buildingId, ' data.buildingId')
+    buildingId = data.buildingId
+  }
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+    // const [tab, changeTab] = useState('basic')
+    const contentId = props.location.query.contentId
+    const [data, setData] = useState({})
+    const formRef = useRef(null);
+
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then((data) => {
+        setExtraData1(data)
+        setData(data)
+      })
+    }
+    useEffect(() => {
+      if (contentId) {
+        isCanChoose = false
+        getDetail(contentId);
+      } else {
+        isCanChoose = true
+      }
+    }, [])
+
+    const cancelPage = () => {
+      isCanChoose = true
+      router.push({
+        pathname: '/carouselFigure/advertisingList',
+      });
+    }
+
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value: isHaveActive,
+        hidden: () => !isCanChoose,
+        props: {
+          onChange: () => {
+            const type = formRef.current.props.form.getFieldValue('contentType')
+            if (formRef.current && (type !== 'live' && type !== 'h5')) {
+              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
+              formRef.current.props.form.resetFields(['contentType', []]);
+            }
+          },
+        },
+        rules: [
+          { required: true, message: '是否城市活动' },
+        ],
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        value: isHaveActive,
+        dict: [{
+          label: '首页',
+          value: 'index',
+        },
+        {
+          label: '项目',
+          value: 'building',
+        }],
+        value: data.showPosition,
+        rules: [
+          { required: true, message: '请选择发布位置' },
+        ],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive && isHavePosition,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ],
+      },
+      {
+        label: '展示城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => !isHavePosition || isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
+      {
+        label: '开屏广告',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
+        rules: [
+          { required: true, message: '请上传图片' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [{
+          label: 'H5活动详情',
+          value: 'h5',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        hidden: true,
+        value: data.title,
+        rules: [
+          { required: true, message: '请输入标题' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        hidden: () => !isHaveActive,
+        type: FieldTypes.Select,
+        dict: [{
+          label: '报名活动详情',
+          value: 'activity'
+        },
+        {
+          label: '项目详情',
+          value: 'project'
+        },
+        {
+          label: '资讯详情',
+          value: 'news'
+        },
+        {
+          label: '拼团活动详情',
+          value: 'group'
+        },
+        {
+          label: '助力活动详情',
+          value: 'help'
+        },
+        {
+          label: 'H5活动详情',
+          value: 'h5',
+        },
+        {
+          label: '在线选房详情',
+          value: 'salesBatch',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '发布H5活动',
+        name: 'targetId',
+        render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
+        hidden: () => !h5Visible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布H5' },
+        ],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布活动' },
+        ],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布资讯' },
+        ],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [
+          { required: true, message: '请选择发布内容' },
+        ],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布助力' },
+        ],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布拼团' },
+        ],
+      },
+      {
+        label: '发布销售批次',
+        name: 'targetId',
+        render: <SalesBatchGroup buildingId={() => buildingId} />,
+        hidden: () => !salesBatchVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布销售批次' },
+        ],
+      },
+      {
+        label: '发布直播活动',
+        name: 'targetId',
+        render: <LiveGroup buildingId={() => islet ? buildingId : ''} />,
+        hidden: () => !liveVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布直播活动' },
+        ],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "上架",
+          value: 1
+        },
+        {
+          label: "下架",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+
+    const handleSubmit = val => {
+      val.showType = 'screen'
+      if (!isHaveActive && val.targetId) {
+        if (!val.contentType) {
+          val.contentType = 'h5'
+        }
+      }
+      if (!isHaveActive && !val.targetId) {
+        val.contentType = ''
+      }
+      if (contentId) {
+        request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val, }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val, }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+
+    return (
+      <XForm wrappedComponentRef={formRef} onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+    );
+  }
+}
+
+export default createEditor()

src/pages/carouselFigure/editCarousel.jsx

@@ -0,0 +1,393 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } 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 BuildSelect from '../../components/SelectButton/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { createForm, FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+import SelectNews from './SelectNews';
+import SelectActivity from './SelectActivity';
+import SelectH5 from './SelectH5';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = props => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId=''
+  let locationType = false
+  let isHaveActive=false
+  let isCanChoose=true
+
+  const setExtraData = (data) => {
+    console.log(data, 'data');
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        // data.contentType=null
+        data.buildingId=null
+      }
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    cityId=data.cityId
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
+  }
+
+  const setExtraData1 = (data) => {
+     if((data.contentType=='h5'  && data.buildingId == null) || data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
+        isHaveActive=false
+     }else{
+        isHaveActive=true
+     }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    h5Visible = data.contentType === 'h5';
+    console.log(locationType, 'locationType');
+  }
+
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+      setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return props => {
+    const [tab, changeTab] = useState('basic')
+    const { contentId } = props.location.query
+    const [data, setData] = useState({})
+
+    if (contentId) {
+      isCanChoose=false
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      useEffect(() => {
+        getDetail(contentId);
+      }, [])
+
+      // 查询列表
+      const getDetail = contentId => {
+        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+            console.log(data)
+            setExtraData1(data)
+            setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
+    }
+
+    const cancelPage = () => {
+      router.push({
+        pathname: '/carouselFigure/carouselFigureList',
+      });
+    }
+
+      const fields = [
+        {
+          label: '是否关联项目',
+          name: 'isHaveActive',
+          type: FieldTypes.Switch,
+          value:isHaveActive,
+          hidden: () => !isCanChoose,
+          rules: [
+            { required: true,message: '是否城市活动' },
+          ],
+        },
+        {
+          label: '所属项目',
+          name: 'buildingId',
+          render: <BuildSelect />,
+          hidden: () => !isHaveActive,
+          value: data.buildingId,
+          rules: [
+            { required: true, message: '请选择所属项目' },
+          ],
+        },
+        {
+          label: '展示城市',
+          name: 'cityId',
+          render: <CitySelect />,
+          hidden: () => isHaveActive,
+          value: data.cityId,
+          rules: [
+            { required: true, message: '请选择展示城市' },
+          ],
+        },
+        {
+          label: '发布位置',
+          name: 'showPosition',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '积分商城',
+            value: 'mall',
+          }],
+          value: data.showPosition,
+          rules: [
+            { required: true, message: '请选择发布位置' },
+          ],
+        },
+        {
+          label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
+          name: 'image',
+          type: FieldTypes.ImageUploader,
+          value: data.image,
+          help: () => (locationType ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
+          rules: [
+            { required: true, message: '请上传轮播图' },
+          ],
+        },
+        {
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          hidden: () => isHaveActive,
+          dict: [{
+            label: 'h5',
+            value: 'h5',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          }],
+          value: data.contentType,
+          rules: [
+            { required: true, message: '请选择类型' },
+          ],
+        },
+        {
+          label: '标题',
+          name: 'title',
+          type: FieldTypes.Text,
+          value: data.title,
+          hidden: true,
+          rules: [
+            { required: true, message: '请输入标题' },
+          ],
+        },
+        {
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
+          dict: [{
+            label: '常规活动',
+            value: 'activity',
+          },
+          {
+            label: '项目',
+            value: 'project',
+          },
+          {
+            label: '资讯',
+            value: 'news',
+          },
+          // {
+          //   label: '其他',
+          //   value: 'other',
+          // },
+          {
+            label: '拼团',
+            value: 'group',
+          },
+          {
+            label: '助力',
+            value: 'help',
+          },
+          {
+            label: 'h5',
+            value: 'h5',
+          },
+          {
+            label: '销售批次详情',
+            value: 'salesBatch',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          }],
+          value: data.contentType,
+          rules: [
+            { required: true, message: '请选择类型' },
+          ],
+        },
+        {
+          label: '发布活动',
+          name: 'targetId',
+          render: <SelectActivity buildingId={() => buildingId} />,
+          hidden: () => !activityVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布活动' },
+          ],
+        },
+        {
+          label: '是否发布H5',
+          name: 'targetId',
+          render: <SelectH5 buildingId={() => buildingId}/>,
+          hidden: () => !h5Visible,
+          value: data.targetId,
+          rules: [
+            { required: false, message: '请选择发布H5' },
+          ],
+        },
+        {
+          label: '发布资讯',
+          name: 'targetId',
+          render: <SelectNews buildingId={() => buildingId} />,
+          hidden: () => !newsVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布资讯' },
+          ],
+        },
+        {
+          label: '发布内容',
+          name: 'content',
+          render: <Wangedit />,
+          value: data.content,
+          hidden: () => !contentVisible,
+          rules: [
+            { required: true, message: '请输入发布内容' },
+          ],
+        },
+        {
+          label: '发布助力',
+          name: 'targetId',
+          render: <SelectHelp buildingId={() => buildingId} />,
+          hidden: () => !helpVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布助力' },
+          ],
+        },
+        {
+          label: '发布拼团',
+          name: 'targetId',
+          render: <SelectGroup buildingId={() => buildingId} />,
+          hidden: () => !groupVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布拼团' },
+          ],
+        },
+        {
+          label: '发布销售批次',
+          name: 'targetId',
+          render: <SalesBatchGroup buildingId={() => buildingId} />,
+          hidden: () => !salesBatchVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布销售批次' },
+          ],
+        },
+        {
+          label: '发布直播活动',
+          name: 'targetId',
+          render: <LiveGroup buildingId={() => buildingId} />,
+          hidden: () => !liveVisible,
+          value: data.targetId, 
+          rules: [
+            { required: true, message: '请选择发布直播活动' },
+          ],
+        },
+        {
+          label: '状态',
+          name: 'status',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '上架',
+            value: 1,
+          },
+          {
+            label: '下架',
+            value: 0,
+          }],
+          value: data.status != null ? data.status : 1,
+        },
+        {
+          label: '权重',
+          name: 'orderNo',
+          type: FieldTypes.Number,
+          value: data.orderNo,
+          help: "数值越大越靠前",
+        },
+      ]
+
+      const handleSubmit = val => {
+        console.log(val,"232323")
+        val.showType = 'banner'
+        if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+        }
+        if(!isHaveActive&&!val.targetId){
+          val.contentType=''
+        }
+        if (contentId) {
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    );
+  }
+ }
+
+
+export default Edit()

src/pages/carouselFigure/propaganda.jsx

@@ -0,0 +1,361 @@
+import React, { useState, useEffect } from 'react';
+import { Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { FieldTypes, createForm } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit';
+import SelectActivity from './SelectActivity';
+import SelectNews from './SelectNews';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectH5 from './SelectH5';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const createEditor = () => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId = ''
+  let isHaveActive=false
+  let isCanChoose=true
+
+  const setExtraData = (data) => {
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        // data.contentType=null
+        data.buildingId=null
+      }
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+    cityId=data.cityId
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = (data) => {
+    console.log(data.buildingId,"data.buildingIddata.buildingId3")
+    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
+       isHaveActive=false
+    }else{
+       isHaveActive=true
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+    buildingId = data.buildingId
+  }
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+      setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+    const [ tab, changeTab ] = useState('basic')
+    const contentId = props.location.query.contentId
+    const [ data, setData ] = useState({})
+
+    if(contentId){
+      isCanChoose=false
+      useEffect(() => {
+        getDetail(contentId);
+      },[])
+
+      // 查询列表
+      const getDetail = (contentId) => {
+        request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
+          setExtraData1(data)
+          setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
+    }
+
+    const cancelPage = () =>{
+      router.push({
+        pathname: '/carouselFigure/propagandaList',
+      });
+    }
+
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ],
+      },
+      {
+        label: '所属城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
+      {
+        label: '主图',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: '建议图片尺寸：750*188px，比例4:1,格式：jpg，用于：首页宣传位',
+        rules: [
+          { required: true, message: '请上传图片' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [{
+          label: 'h5',
+          value: 'h5',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        hidden: true,
+        value: data.title,
+        rules: [
+          { required: true, message: '请输入标题' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        hidden: () => !isHaveActive,
+        type: FieldTypes.Select,
+        dict: [{
+          label: '常规活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '拼团',
+          value: 'group'
+        },
+        {
+          label: '助力',
+          value: 'help'
+        },
+        {
+          label: 'h5',
+          value: 'h5',
+        },
+        {
+          label: '销售批次详情',
+          value: 'salesBatch',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布活动' },
+        ],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布资讯' },
+        ],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [
+          { required: true, message: '请选择发布内容' },
+        ],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布助力' },
+        ],
+      },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5 buildingId={() => buildingId}/>,
+        hidden: () => !h5Visible,
+        value: data.targetId,
+        rules: [
+          { required: false, message: '请选择发布H5' },
+        ],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布拼团' },
+        ],
+      },
+      {
+        label: '发布销售批次',
+        name: 'targetId',
+        render: <SalesBatchGroup buildingId={() => buildingId} />,
+        hidden: () => !salesBatchVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布销售批次' },
+        ],
+      },
+      {
+        label: '发布直播活动',
+        name: 'targetId',
+        render: <LiveGroup buildingId={() => buildingId} />,
+        hidden: () => !liveVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布直播活动' },
+        ],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "上架",
+          value: 1
+        },
+        {
+          label: "下架",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+      {
+        label: '权重',
+        name: 'orderNo',
+        type: FieldTypes.Number,
+        value: data.orderNo,
+        help: "数值越大越靠前",
+      },
+    ]
+
+    const handleSubmit = val => {
+      console.log(val,"valvalval")
+      val.showType = 'propaganda'
+      if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+      }
+      if(!isHaveActive&&!val.targetId){
+        val.contentType=''
+      }
+      if(contentId){
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+    );
+   }
+ }
+
+export default createEditor()

src/pages/carouselFigure/propagandaList.jsx

@@ -0,0 +1,284 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import withActions from '@/components/ActionList';
+import Navigate from '@/components/Navigate';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/propaganda',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)} ><img src={image} className={styles.propaganda} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.propaganda.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架': '上架'} type={row.status === 1 ? 'down': 'up'} onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        {/* <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item> */}
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.advert.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.propaganda.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

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

@@ -0,0 +1,248 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination, Button } from 'antd';
+
+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 CustomerDetail(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' })(CustomerDetail);
+
+export default WrappedHeader;

src/pages/customer/Customer/PrivateCustomer/components/Attribution.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { Button, Modal, notification } from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TableList from '@/components/TableList';
+
+const Attribution = props => {
+  console.log(props, 'props');
+
+  const { visible, data } = props.modelProps || {};
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  // 提交
+  function submitGm(record) {
+    // 网路请求
+    request({
+      ...apis.customer.recommendEdit,
+      urlData: { id: data.customerId },
+      data: { customerId: data.customerId, realtyConsultant: record.userId },
+    })
+      .then(res => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel();
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('error', err);
+      });
+  }
+
+  const columns = [
+    {
+      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',
+      render: (_, record) => (
+        <>
+          {data.realtyConsultant != record.userId && (
+            <Button type="primary" onClick={() => submitGm(record)}>
+              确定
+            </Button>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Modal
+        title="变更状态"
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <TableList
+            rowKey="userId"
+            api={apis.customer.buildingConsultant}
+            params={{ buildingId: data.buildingId }}
+            columns={columns}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default Attribution;

src/pages/customer/Customer/PrivateCustomer/components/ChangeStatus.jsx

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

src/pages/customer/Customer/PrivateCustomer/components/IntegralRecord.jsx

@@ -0,0 +1,149 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Card, Modal, notification, Table } from 'antd';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Styles from '../../style.less';
+
+/**
+ * 积分记录
+ *
+ * @param {*} props
+ * @returns
+ */
+const IntegralRecord = props => {
+  const { visible, data } = props.modelProps || {};
+
+  const [tableData, setTableData] = useState({});
+  const [totalPoints, setTotalPoints] = useState();
+const [loading,setLoading] = useState(false)
+  function getList(params) {
+    const { personId } = data || {};
+    if (personId === '' || personId === undefined) {
+      return;
+    }
+
+    console.log(personId, 'customerId');
+    // 网路请求
+    setLoading(true);
+    request({
+      ...apis.customer.taPointsRecords,
+      urlData: { id: personId },
+      params: { ...params },
+    })
+      .then(res => {
+        console.log(res, 'res');
+        setTableData(res.result);
+        setTotalPoints(res.totalPoints);
+        setLoading(false);
+      })
+      .catch(err => {
+        this.openNotificationWithIcon('error', err);
+        setLoading(false);
+      });
+  }
+
+  useEffect(() => {
+    if (visible) {
+      getList({ pageNumber: 1, pageSize: 5 });
+    }else{
+      setTableData({})
+    }
+  }, [visible]);
+
+  // 分页
+  function onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
+  }
+
+  // 积分类型
+  function 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
+  // }
+
+  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>{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) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
+    },
+  ];
+  return (
+    <>
+      <Modal
+        title={'当前可用积分：' + (totalPoints || 0)}
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <Table
+            dataSource={tableData.records}
+            columns={columns}
+            loading={loading}
+            pagination={{
+              pageSize: tableData.pageSize,
+              total: tableData.total,
+              onChange: e => onChange(e),
+            }}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default IntegralRecord;

src/pages/customer/Customer/PrivateCustomer/components/Recommend.jsx

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

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

@@ -1,22 +1,30 @@
 import React, { useState, useMemo, useRef } from 'react';
-import { Avatar, Button } from 'antd';
+import { Avatar, Button, message } from 'antd';
+import router from 'umi/router';
 import QueryTable from '@/components/QueryTable';
 import apis from '@/services/apis';
+import request from '@/utils/request';
 import withActions from '@/components/ActionList';
 import AuthButton from '@/components/AuthButton';
 import Styles from '../style.less';
 import ChangeStatus from './components/ChangeStatus';
+import Attribution from './components/Attribution';
+import IntegralRecord from './components/IntegralRecord';
+import Recommend from './components/Recommend';
+import getSearchFields from './searchFields';
 
 const actionList = {
   changeStatus: 'changeStatus', // 变更状态
+  attribution: 'attribution', //调整归属
+  integralRecord: 'integralRecord', //积分记录
+  recommend: 'recommend', //推荐客户
 };
 
 const PrivateCustomer = () => {
   const ref = useRef();
 
-  const [showModel, SetShowModel] = useState({
-    // changeStatus: { visible: true, data: {} },
-  });
+  const [showModel, SetShowModel] = useState({});
+  const [exportLoding, setExportLoding] = useState(false);
 
   const handShowModel = (record, actionType) => {
     SetShowModel({
@@ -26,6 +34,16 @@ const PrivateCustomer = () => {
       },
     });
   };
+
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/privateCustomerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+
   const columns = useMemo(() => {
     return [
       {
@@ -135,6 +153,10 @@ const PrivateCustomer = () => {
         align: 'center',
         width: '20%',
         render: withActions((_, record) => [
+          <Button className={Styles.text} type="link" onClick={() => toCustomerDateil(record)}>
+            查看详情
+          </Button>,
+          // <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button
               className={Styles.text}
@@ -146,13 +168,21 @@ const PrivateCustomer = () => {
           </AuthButton>,
 
           <AuthButton name="admin.customer.recommend.belong" noRight={null}>
-            <Button className={Styles.text} type="link" onClick={() => showGM(record)}>
+            <Button
+              className={Styles.text}
+              type="link"
+              onClick={() => handShowModel(record, actionList.attribution)}
+            >
               调整归属
             </Button>
           </AuthButton>,
 
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
-            <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>
+            <Button
+              className={Styles.text}
+              type="link"
+              onClick={() => handShowModel(record, actionList.integralRecord)}
+            >
               积分记录
             </Button>
           </AuthButton>,
@@ -161,7 +191,7 @@ const PrivateCustomer = () => {
             <Button
               className={Styles.text}
               type="link"
-              onClick={() => showRecommend(record.personId)}
+              onClick={() => handShowModel(record, actionList.recommend)}
             >
               推荐客户
             </Button>
@@ -171,19 +201,55 @@ const PrivateCustomer = () => {
     ];
   }, []);
 
-  const searchFields = [
-    {
-      name: 'name',
-      label: '姓名',
-      placeholder: '请输入姓名',
+  //导出
+  function exportCustomer() {
+    console.log(ref.current, 'ref');
+    setExportLoding(true);
+
+    request({
+      ...apis.customer.customerRecommendExport,
+      responseType: 'blob',
+      params: ref.current.getSearchData,
+    })
+      .then(response => {
+        download(response);
+        setExportLoding(false);
+      })
+      .catch(() => {
+        message.err('连接超时');
+        setExportLoding(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();
+  }
+
+  const searchFields = useMemo(getSearchFields, []);
+
   //操作成功请求数据
   const handleCancel = () => {
-    SetShowModel({})
+    SetShowModel({});
     ref.current.reload();
   };
 
+  const actionRender = () => {
+    
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
+        导出
+      </Button>
+    );
+  };
   return (
     <>
       <QueryTable
@@ -195,7 +261,7 @@ const PrivateCustomer = () => {
           customerType: 'private',
         }}
         columns={columns}
-        //   actionRender={actionRender}
+        actionRender={actionRender}
         //   onPageChange={(pg) => setPage(pg)}
       />
 
@@ -204,6 +270,24 @@ const PrivateCustomer = () => {
         handleCancel={handleCancel}
         onCancel={() => SetShowModel({})}
       ></ChangeStatus>
+
+      <Attribution
+        modelProps={showModel[actionList.attribution]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
+
+      <IntegralRecord
+        modelProps={showModel[actionList.integralRecord]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
+
+      <Recommend
+        modelProps={showModel[actionList.recommend]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
     </>
   );
 };

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

@@ -0,0 +1,49 @@
+import WxDictSelect from '@/components/SelectButton/WxDictSelect'
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+
+export default () => [
+  {
+    name: 'buildingId',
+    label: '项目',
+    placeholder: '请选择项目',
+    render: () => <BuildSelect style={{width: 160}} />
+  },
+  {
+    name: 'consultName',
+    label: '置业顾问',
+    placeholder: '请输入置业顾问',
+  },
+  {
+    name: 'consultTel',
+    label: '置业顾问电话',
+    placeholder: '请输入置业顾问电话',
+  },
+  {
+    name: 'status',
+    label: '状态',
+    placeholder: '请选择状态',
+    type: 'select',
+    options: [
+      {label: '报备', value: 1},
+      {label: '到访', value: 2},
+      {label: '认筹', value: 3},
+      {label: '签约', value: 4}
+    ]
+  },
+  {
+    name: 'name',
+    label: '姓名',
+    placeholder: '请输入姓名',
+  },
+  {
+    name: 'tel',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+  {
+    name: 'sceneType',
+    label: '用户来源',
+    // placeholder: '请选择城市',
+    render: () => <WxDictSelect style={{width: 160}} />
+  },
+]

src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx

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

src/pages/customer/Customer/PublicCustomer/components/Attribution.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { Button, Modal, notification } from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TableList from '@/components/TableList';
+
+const Attribution = props => {
+  console.log(props, 'props');
+
+  const { visible, data } = props.modelProps || {};
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  // 提交
+  function submitGm(record) {
+    // 网路请求
+    request({
+      ...apis.customer.recommendEdit,
+      urlData: { id: data.customerId },
+      data: { customerId: data.customerId, realtyConsultant: record.userId },
+    })
+      .then(res => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel();
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('error', err);
+      });
+  }
+
+  const columns = [
+    {
+      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',
+      render: (_, record) => (
+        <>
+          {data.realtyConsultant != record.userId && (
+            <Button type="primary" onClick={() => submitGm(record)}>
+              确定
+            </Button>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Modal
+        title="变更状态"
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <TableList
+            rowKey="userId"
+            api={apis.customer.buildingConsultant}
+            params={{ buildingId: data.buildingId }}
+            columns={columns}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default Attribution;

src/pages/customer/Customer/PublicCustomer/components/BatchAssistConsultant.jsx

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

src/pages/customer/Customer/PublicCustomer/components/ChangeStatus.jsx

@@ -0,0 +1,77 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Button,
+  Radio,
+  Modal,
+  notification,
+} from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+
+const ChangeStatus = props => {
+  console.log(props, 'props');
+
+  const [value, setValue] = useState();
+
+  const { visible, data } = props.modelProps || {};
+
+  useEffect(() => {
+    console.log(data, 'data');
+    setValue(data?.status);
+  }, [data]);
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+const  submitButton = () => {
+    // 网路请求
+    request({
+      ...apis.customer.recommendEdit,
+      urlData: { id: data.customerId },
+      data: { customerId: data.customerId, status: value },
+    })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel()
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('error', err);
+      });
+  };
+
+  return (
+    <>
+      <Modal
+        title="变更状态"
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <>
+            <Radio.Group value={value} onChange={e => setValue(e.target.value)}>
+              <Radio value={1}>客户报备</Radio>
+              <Radio value={2}>客户到访</Radio>
+              <Radio value={3}>客户认购</Radio>
+              <Radio value={4}>客户签约</Radio>
+            </Radio.Group>
+            <Button type="primary" onClick={submitButton}>
+              确定
+            </Button>
+          </>
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default ChangeStatus;

src/pages/customer/Customer/PublicCustomer/components/IntegralRecord.jsx

@@ -0,0 +1,140 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Card, Modal, notification, Table } from 'antd';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Styles from '../../style.less';
+
+/**
+ * 积分记录
+ *
+ * @param {*} props
+ * @returns
+ */
+const IntegralRecord = props => {
+  const { visible, data } = props.modelProps || {};
+
+  const [tableData, setTableData] = useState({});
+  const [totalPoints, setTotalPoints] = useState();
+const [loading,setLoading] = useState(false)
+  function getList(params) {
+    const { personId } = data || {};
+    if (personId === '' || personId === undefined) {
+      return;
+    }
+
+    console.log(personId, 'customerId');
+    // 网路请求
+    setLoading(true);
+    request({
+      ...apis.customer.taPointsRecords,
+      urlData: { id: personId },
+      params: { ...params },
+    })
+      .then(res => {
+        console.log(res, 'res');
+        setTableData(res.result);
+        setTotalPoints(res.totalPoints);
+        setLoading(false);
+      })
+      .catch(err => {
+        this.openNotificationWithIcon('error', err);
+        setLoading(false);
+      });
+  }
+
+  useEffect(() => {
+    if (visible) {
+      getList({ pageNumber: 1, pageSize: 5 });
+    }else{
+      setTableData({})
+    }
+  }, [visible]);
+
+  // 分页
+  function onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
+  }
+
+  // 积分类型
+  function 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 '未知类型';
+    }
+  }
+
+
+
+  const columns = [
+    {
+      title: '序号',
+      dataIndex: 'index',
+      key: 'index',
+      render: (_text, _record, index) => <span>{index + 1}</span>,
+    },
+    {
+      title: '积分类型',
+      dataIndex: 'changeType',
+      key: 'changeType',
+      render: (_, record) => <span>{showChangeType(record.changeType)}</span>,
+    },
+    {
+      title: '积分变化',
+      dataIndex: 'pointsAmount',
+      key: 'pointsAmount',
+    },
+    {
+      title: '发生时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (createDate) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
+    },
+  ];
+  return (
+    <>
+      <Modal
+        title={'当前可用积分：' + (totalPoints || 0)}
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <Table
+            dataSource={tableData.records}
+            columns={columns}
+            loading={loading}
+            pagination={{
+              pageSize: tableData.pageSize,
+              total: tableData.total,
+              onChange: e => onChange(e),
+            }}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default IntegralRecord;

src/pages/customer/Customer/PublicCustomer/components/Recommend.jsx

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

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

@@ -0,0 +1,281 @@
+import React, { useState, useMemo, useRef } from 'react';
+import { Avatar, Button,message } from 'antd';
+import router from 'umi/router';
+import QueryTable from '@/components/QueryTable';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import withActions from '@/components/ActionList';
+import AuthButton from '@/components/AuthButton';
+import Styles from '../style.less';
+import IntegralRecord from './components/IntegralRecord';
+import Recommend from './components/Recommend';
+import AssistConsultant from './components/assistConsultant';
+import getSearchFields from './searchFields';
+
+const actionList = {
+  integralRecord: 'integralRecord', //积分记录
+  recommend: 'recommend', //推荐客户
+  assistConsultant: 'assistConsultant', //分配置业顾问
+};
+
+const PublicCustomer = () => {
+  const ref = useRef();
+
+  const [showModel, SetShowModel] = useState({
+    // changeStatus: { visible: true, data: {} },
+  });
+  const [exportLoding, setExportLoding] = useState(false);
+   // 选中的公客信息
+   const [personInfo, setPersonInfo] = useState([])
+
+   const [selectedRowKeys, setSelectedRowKeys] = useState([])
+
+  const handShowModel = (record, actionType) => {
+    SetShowModel({
+      [actionList[actionType]]: {
+        visible: true,
+        data: record,
+      },
+    });
+  };
+
+  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('选中的公客存在于不同项目中，请分开进行分配置业顾问操作');
+    }
+    handShowModel({
+      customerId: personInfo, buildingId: personInfo[0].buildingId
+    }, actionList.assistConsultant)
+    //   SetShowModel({
+    //     [actionList[actionType]]: {
+    //       visible: true,
+    //       data: record,
+    //     },
+    //   });
+    // };
+    // setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId })
+  }
+
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/privateCustomerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+
+  //导出
+  function exportCustomer() {
+    console.log(ref.current, 'ref');
+    setExportLoding(true);
+
+    request({
+      ...apis.customer.customerRecommendExport,
+      responseType: 'blob',
+      params: ref.current.getSearchData,
+    })
+      .then(response => {
+        download(response);
+        setExportLoding(false);
+      })
+      .catch(() => {
+        message.err('连接超时');
+        setExportLoding(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();
+  }
+
+  const columns = useMemo(() => {
+    return [
+      {
+        title: '头像',
+        dataIndex: 'picture',
+        key: 'picture',
+        align: 'center',
+        width: '10%',
+        render: (_, record) => (
+          <Avatar
+            shape="square"
+            style={{ color: 'blue' }}
+            src={record.picture}
+            size={64}
+            icon="user"
+          />
+        ),
+      },
+      {
+        title: '姓名',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+        width: '20%',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+        width: '20%',
+      },
+      {
+        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: 'sharePersonName',
+        key: 'sharePersonName',
+        align: 'center',
+        width: '20%',
+      },
+      {
+        title: '操作',
+        dataIndex: 'customerId',
+        key: 'customerId',
+        align: 'center',
+       
+        render: withActions((_, record) => [
+          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+            <Button
+              className={Styles.text}
+              type="link"
+              onClick={() => handShowModel(record, actionList.integralRecord)}
+            >
+              积分记录
+            </Button>
+          </AuthButton>,
+
+          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+            <Button
+              className={Styles.text}
+              type="link"
+              onClick={() => handShowModel(record, actionList.recommend)}
+            >
+              推荐客户
+            </Button>
+          </AuthButton>,
+
+          <AuthButton name="admin.customer.assign" noRight={null}>
+            <Button
+              className={Styles.text}
+              type="link"
+              onClick={() => handShowModel(record, actionList.assistConsultant)}
+            >
+              分配置业顾问
+            </Button>
+          </AuthButton>,
+        ]),
+      },
+    ];
+  }, []);
+
+  const searchFields = useMemo(getSearchFields, []);
+
+  //操作成功请求数据
+  const handleCancel = () => {
+    SetShowModel({});
+    ref.current.reload();
+  };
+
+  const actionRender = () => {
+    return (
+      <>
+      <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
+          导出
+        </Button>
+        <AuthButton name="admin.customer.import" noRight={null}>
+          <Button
+            type="primary"
+            onClick={() => batchAssistConsultant()}
+            style={{ marginLeft: '20px' }}
+          >
+            批量分配置业顾问
+          </Button>
+        </AuthButton>
+        
+      </>
+    );
+  };
+
+  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))                             // 去掉未选的数据
+      setPersonInfo(newSelectedRows)
+    },
+  };
+
+  return (
+    <>
+      <QueryTable
+        ref={ref}
+        rowSelection={rowSelection}
+        rowKey="customerId"
+        api={apis.customer.customerRecommend}
+        searchFields={searchFields}
+        params={{
+          customerType: 'public',
+        }}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
+      <IntegralRecord
+        modelProps={showModel[actionList.integralRecord]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
+
+      <Recommend
+        modelProps={showModel[actionList.recommend]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
+
+      <AssistConsultant
+        modelProps={showModel[actionList.assistConsultant]}
+        handleCancel={handleCancel}
+        onCancel={() => SetShowModel({})}
+      />
+    </>
+  );
+};
+
+export default PublicCustomer;

src/pages/customer/Customer/PublicCustomer/searchFields.js

@@ -0,0 +1,21 @@
+import WxDictSelect from '@/components/SelectButton/WxDictSelect'
+
+export default () => [
+  {
+    name: 'name',
+    label: '用户名',
+    placeholder: '请输入用户名',
+  },
+  {
+    name: 'tel',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+  {
+    name: 'sceneType',
+    label: '用户来源',
+    // placeholder: '请选择城市',
+    render: () => <WxDictSelect style={{width: 160}} />
+  },
+]
+

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

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

src/pages/customer/Customer/index.jsx

@@ -1,13 +1,25 @@
 import React, { useState } from 'react';
-import { Radio } from 'antd';
+import { Card, Radio, Tabs } from 'antd';
 import PrivateCustomer from './PrivateCustomer';
+import PublicCustomer from './PublicCustomer';
+
+const { TabPane } = Tabs;
 
 const Customer = () => {
   const [customerType, setCustomerType] = useState('private');
 
   return (
-    <>
-      <div style={{ margin: '20px 0' }}>
+    <Card>
+      <Tabs defaultActiveKey="private" type="card">
+        <TabPane tab="私客" key="1">
+          <PrivateCustomer></PrivateCustomer>
+        </TabPane>
+        <TabPane tab="公客" key="2">
+        <PublicCustomer></PublicCustomer>
+        </TabPane>
+      
+      </Tabs>
+      {/* <div style={{ margin: '20px 0' }}> 
         <Radio.Group
           value={customerType}
           onChange={e => {
@@ -21,8 +33,8 @@ const Customer = () => {
       </div>
       <div>
         <PrivateCustomer></PrivateCustomer>
-      </div>
-    </>
+      </div> */}
+    </Card>
   );
 };
 

src/pages/customer/Recommend/audit.jsx

@@ -0,0 +1,237 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
+import ImageUpload from '../../../components/XForm/ImageUpload';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
+
+import Attribution from './components/attribution'
+
+const { TextArea } = Input;
+
+const tailFormItemLayout = {
+  labelCol: {
+    xs: { span: 20 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 20 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ picture: '' })
+
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if(res){
+        props.form.setFieldsValue({...res,reportDate:moment(res.reportDate)})
+      }
+    
+    })
+  }
+
+  function submitDate(params) {
+    // props.form.setFieldsValue(res)
+    console.log(params, 'params')
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 显示选择置业顾问的窗口
+  function showConsultant() {
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant'), buildingId: props.form.getFieldValue('buildingId') })
+  }
+
+  // 关闭选择置业顾问的窗口
+  function closeConsultant() {
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+  }
+
+  // 选择置业顾问弹窗
+  function consultantSuccess(e) {
+    console.log(e)
+    props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
+  }
+
+  return (
+    <Card>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+        <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="项目ID" style={{ display: 'none' }}>
+          {getFieldDecorator('buildingId')(
+            <Input
+              placeholder="项目ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="归属人" style={{ display: 'none' }}>
+          {getFieldDecorator('realtyConsultant')(
+            <Input
+              placeholder="归属人"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="意向项目：">
+          {getFieldDecorator('intention')(
+            <Input
+              placeholder="意向项目"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户照片">
+          {getFieldDecorator('picture')(
+            <ImageUpload value={dataSource.picture} />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(
+            <Input placeholder="客户电话" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="到访人数">
+          {getFieldDecorator('visiteNum')(
+            <Input placeholder="到访人数" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户描述">
+          {getFieldDecorator('describe')(
+            <TextArea placeholder="客户描述" rows={10} />,
+          )}
+        </Form.Item>
+        <Form.Item label="物业类型">
+          {getFieldDecorator('realtyManageType')(
+            <Input placeholder="物业类型" />,
+          )}
+        </Form.Item>
+        <Form.Item label="需求类型">
+          {getFieldDecorator('demandType')(
+            <Input placeholder="需求类型" />,
+          )}
+        </Form.Item>
+        <Form.Item label="价格区间">
+          {getFieldDecorator('priceRange')(
+            <Input placeholder="价格区间" />,
+          )}
+        </Form.Item>
+        <Form.Item label="报备日期">
+          {getFieldDecorator('reportDate')(
+            <DatePicker showTime placeholder="报备日期" />,
+          )}
+        </Form.Item>
+        {/* <Form.Item label="状态">
+          {getFieldDecorator('verifyStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value={0}>未通过</Option>
+              <Option value={1}>已通过</Option>
+              <Option value={2}>已驳回</Option>
+            </Select>,
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
+        </Form.Item> */}
+        <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
+            审核通过
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            驳回
+          </Button>
+        </Form.Item>
+      </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
+    </Card>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

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

@@ -0,0 +1,151 @@
+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';
+
+
+
+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) {
+    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) {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(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) {
+
+    console.log('传递之前：', record)
+    this.handleCancel()
+    this.props.onSuccess({ realtyConsultant: record.userId, name: record.userName })
+
+
+    // // 网路请求
+    // request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   this.openNotificationWithIcon('success', '操作成功')
+    //   this.handleCancel()
+    //   this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
+    // }).catch(err => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   // this.openNotificationWithIcon('error', err)
+    // })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
+      {
+        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={{ pageSize: 5,total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/Recommend/index.jsx

@@ -0,0 +1,187 @@
+import React, { useState } from 'react';
+import {  Avatar, Button } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import QueryTable from '@/components/QueryTable'
+import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function Recommend(props) {
+  const [exportLoding,setExportLoding] = useState(false)
+
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/customer/recommend/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+  }
+
+
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    setExportLoding(true)
+    request({
+      ...apis.customer.customerRecommendRecommenderExport,
+      responseType: 'blob',
+    }).then(response => {
+      console.log('exportRecommendCustomer: ', 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()
+    setExportLoding(false)
+  }
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'intention',
+      key: 'intention',
+    },
+    {
+      title: '推荐人',
+      dataIndex: 'consultantName',
+      key: 'consultantName',
+      render: (_, record) => <><span>{(record.recommendName !== null ? record.recommendName : '') + " " + (record.recommendTel !== null ? record.recommendTel : '')}</span></>,
+    },
+    {
+      title: '推荐时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'verifyStatus',
+      key: 'verifyStatus',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待审核' : record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      render: (_, record) => (
+        <><span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span>
+          {/* {
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+            </AuthButton>
+          } */}
+        </>
+      ),
+    },
+  ]
+
+  // const searchFields = [
+  //   {
+  //     name: 'sceneType',
+  //     label: '用户来源',
+  //     placeholder: '请选择用户来源',
+  //     render: () => <WxDictSelect style={{width: 160}} />
+  //   },
+  // ]
+ const searchFields=[
+     {
+      name: 'buildingId',
+      label: '用户来源',
+      placeholder: '请选择用户来源',
+      render: () => <BuildingSelect style={{width: 160}} />
+    },
+  {
+    name: 'name',
+    label: '姓名',
+    placeholder: '请输入姓名',
+  },
+  {
+    name: 'tel',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+  {
+    name: 'verifyStatus',
+    label: '状态',
+    placeholder: '请选择状态',
+    type: 'select',
+    options: [
+      {label: '未通过', value: 0},
+      {label: '已通过', value: 1},
+      {label: '已驳回', value: 2}
+    ]
+  },
+ ]
+
+ const actionRender = () => {
+    
+  return (
+    <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      导出
+    </Button>
+  );
+};
+
+  return (
+    <>
+      <QueryTable
+          rowKey="recommendCustomer"
+          api={apis.customer.recommender}
+          searchFields={searchFields}
+          columns={columns}
+          actionRender={actionRender}
+        />
+    
+    </>
+  );
+}
+
+export default Recommend

src/pages/customer/drift/index.jsx

@@ -1,78 +1,30 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Table, Avatar, Alert, Select, Button } from 'antd';
-
-import request from '../../../utils/request';
+import React from 'react';
+import { Avatar } from 'antd';
 import apis from '../../../services/apis';
-import Styles from './style.less'
 import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import QueryTable from '@/components/QueryTable'
 
 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',
+      align: 'center',
       render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
+      align: 'center',
     },
     {
       title: '性别',
       dataIndex: 'gender',
       key: 'gender',
+      align: 'center',
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
     },
@@ -80,36 +32,32 @@ function costomerDrift(props) {
       title: '用户来源',
       dataIndex: 'sceneAlias',
       key: 'sceneAlias',
+      align: 'center',
       render: (_, record) => <><span>{ record.sceneAlias ? record.sceneAlias : '其他'}</span></>,
     },
   ];
-  
+
+ const searchFields = [
+  {
+    name: 'sceneType',
+    label: '用户来源',
+    placeholder: '请选择用户来源',
+    render: () => <WxDictSelect style={{width: 160}} />
+  },
+]
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('sceneType')(
-            <WxDictSelect />,
-          )}
-        </Form.Item>
+      <QueryTable
+          rowKey="personId"
+          api={apis.customer.drift}
+          searchFields={searchFields}
+          columns={columns}
+        />
 
-        <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
+export default costomerDrift

src/pages/customer/visiting/index.jsx

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

src/pages/recommend/recommendCustomer/audit.jsx

@@ -0,0 +1,238 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
+import ImageUpload from '../../../components/XForm/ImageUpload';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
+
+import Attribution from './components/attribution'
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const { TextArea } = Input;
+
+const tailFormItemLayout = {
+  labelCol: {
+    xs: { span: 20 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 20 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ picture: '' })
+
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
+      res.reportDate = moment(res.reportDate)
+      props.form.setFieldsValue(res)
+    })
+  }
+
+  function submitDate(params) {
+    // props.form.setFieldsValue(res)
+    console.log(params, 'params')
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 显示选择置业顾问的窗口
+  function showConsultant() {
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant'), buildingId: props.form.getFieldValue('buildingId') })
+  }
+
+  // 关闭选择置业顾问的窗口
+  function closeConsultant() {
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+  }
+
+  // 选择置业顾问弹窗
+  function consultantSuccess(e) {
+    console.log(e)
+    props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
+  }
+
+  return (
+    <>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+        <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="项目ID" style={{ display: 'none' }}>
+          {getFieldDecorator('buildingId')(
+            <Input
+              placeholder="项目ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="归属人" style={{ display: 'none' }}>
+          {getFieldDecorator('realtyConsultant')(
+            <Input
+              placeholder="归属人"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="意向项目：">
+          {getFieldDecorator('intention')(
+            <Input
+              placeholder="意向项目"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户照片">
+          {getFieldDecorator('picture')(
+            <ImageUpload value={dataSource.picture} />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(
+            <Input placeholder="客户电话" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="到访人数">
+          {getFieldDecorator('visiteNum')(
+            <Input placeholder="到访人数" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户描述">
+          {getFieldDecorator('describe')(
+            <TextArea placeholder="客户描述" rows={10} />,
+          )}
+        </Form.Item>
+        <Form.Item label="物业类型">
+          {getFieldDecorator('realtyManageType')(
+            <Input placeholder="物业类型" />,
+          )}
+        </Form.Item>
+        <Form.Item label="需求类型">
+          {getFieldDecorator('demandType')(
+            <Input placeholder="需求类型" />,
+          )}
+        </Form.Item>
+        <Form.Item label="价格区间">
+          {getFieldDecorator('priceRange')(
+            <Input placeholder="价格区间" />,
+          )}
+        </Form.Item>
+        <Form.Item label="报备日期">
+          {getFieldDecorator('reportDate')(
+            <DatePicker showTime placeholder="报备日期" />,
+          )}
+        </Form.Item>
+        {/* <Form.Item label="状态">
+          {getFieldDecorator('verifyStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value={0}>未通过</Option>
+              <Option value={1}>已通过</Option>
+              <Option value={2}>已驳回</Option>
+            </Select>,
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
+        </Form.Item> */}
+        <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
+            审核通过
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            驳回
+          </Button>
+        </Form.Item>
+      </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/recommend/recommendCustomer/components/attribution.jsx

@@ -0,0 +1,151 @@
+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) {
+    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) {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(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) {
+
+    console.log('传递之前：', record)
+    this.handleCancel()
+    this.props.onSuccess({ realtyConsultant: record.userId, name: record.userName })
+
+
+    // // 网路请求
+    // request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   this.openNotificationWithIcon('success', '操作成功')
+    //   this.handleCancel()
+    //   this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
+    // }).catch(err => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   // this.openNotificationWithIcon('error', err)
+    // })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
+      {
+        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={{ pageSize: 5,total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/recommend/recommendCustomer/index.jsx

@@ -0,0 +1,252 @@
+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 { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = 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: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNumber: 1, pageSize: 10 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.customer.recommender, params: { ...params } }).then(res => {
+      setDataSource(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) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/recommend/recommendCustomer/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+  }
+
+
+  /**
+    * 重置搜索
+    */
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    request({
+      ...apis.customer.customerRecommendRecommenderExport,
+      responseType: 'blob',
+    }).then(response => {
+      console.log('exportRecommendCustomer: ', 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: 'picture',
+      key: 'picture',
+      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'intention',
+      key: 'intention',
+    },
+    {
+      title: '推荐人',
+      dataIndex: 'consultantName',
+      key: 'consultantName',
+      render: (_, record) => <><span>{(record.recommendName !== null ? record.recommendName : '') + " " + (record.recommendTel !== null ? record.recommendTel : '')}</span></>,
+    },
+    {
+      title: '推荐时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'verifyStatus',
+      key: 'verifyStatus',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待审核' : record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      render: (_, record) => (
+        <>
+          {
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+            </AuthButton>
+          }
+        </>
+      ),
+    },
+  ]
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex' }}>
+        <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>
+          {getFieldDecorator('consultName')(
+            <Input placeholder="推荐人" />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('consultTel')(
+            <Input placeholder="推荐人电话" />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('verifyStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value={0}>未通过</Option>
+              <Option value={1}>已通过</Option>
+              <Option value={2}>已驳回</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildingSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.recommend.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+              </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      {/* style={{float:'right',margin:'20px 0'}} */}
+      <div style={{ textAlign: 'right', padding: '10px 0' }}>
+        <AuthButton name="admin.recommend.import" noRight={null} >
+          <Button type="primary" onClick={() => exportRecommendCustomer()}>
+            导出
+        </Button>
+        </AuthButton>
+      </div>
+      <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/recommend/recommendCustomer/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;
+}

src/pages/recommend/recommendCustomer/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{
+  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;
+}
+

src/pages/recommend/recommendCustomer/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;
+}

src/pages/style/GoodsList.less

@@ -0,0 +1,48 @@
+.addBtn {
+  padding: 0 40px;
+  height: 36px;
+  margin: 30px 0;
+}
+
+.touxiang {
+  width: 93px;
+  height: 93px;
+}
+
+.imgPerfect {
+  width: 120px;
+  height: 40px;
+}
+
+.imgIndex {
+  width: 150px;
+  height: 92.7px;
+}
+
+.imgSmall {
+  width: 128px;
+  height: 192px;
+}
+
+.propaganda {
+  width: 240px;
+  height: 60px;
+}
+
+.ant-table-column-title {
+  font-weight: 600;
+}
+
+.shoppingCart {
+  // color: #dcdcdc;
+  color: #bebebe;
+  margin-left: 6px;
+  font-size: 16px;
+}
+
+.edit {
+  // color: #dcdcdc;
+  color: #bebebe;
+  margin-left: 6px;
+  font-size: 15px;
+}