Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

config/config.js

@@ -265,6 +265,11 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
+                {
+                  path: '/news/list/editNewsList',
+                  name: '',
+                  component: './news/list/editNewsList',
+                },
               ],
             },
             {
@@ -289,6 +294,36 @@ export default {
                 },
               ],
             },
+
+            {
+              path: '/staff',
+              name: '员工管理',
+              component: '../layouts/BlankLayout',
+              routes: [
+                {
+                  path: '/staff/StaffList',
+                  name: '员工列表',
+                  component: './staff/list/StaffList',
+                },
+                {
+                  path: '/staff/editStaff',
+                  name: '',
+                  component: './staff/list/editStaff',
+                },
+             
+                {
+                  path: '/staff/RoleList',
+                  name: '角色管理',
+                  component: './staff/list/RoleList',
+                },
+                {
+                  path: '/staff/editRole',
+                  name: '',
+                  component: './staff/list/editRole',
+                },
+             
+              ],
+            },
             {
               component: './404',
             },
@@ -352,7 +387,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://192.168.0.11:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/SelectButton/NewTypeSelect.jsx

@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const NewsTypeSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/taNewsType',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择类型" onChange={props.onChange}>
+          {data.map(type => (
+            <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default NewsTypeSelect
+

src/pages/building/type/edi.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Button, Row, Col, Form, Alert } from 'antd';
+import { Input, Button, Row, Col, Form, Alert, notification } from 'antd';
 import router from 'umi/router';
 import Styles from './style.less';
 import request from '../../../utils/request';
@@ -40,6 +40,14 @@ function body(props) {
     })
   }
 
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
   function submitData(dataSources) {
     if (id !== '') {
       // 修改
@@ -51,25 +59,11 @@ function body(props) {
     dataSources.createDate = new Date()
     request({ ...apis.buildingType.add, data: { ...dataSources } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message="操作成功"
-        type="success"
-        showIcon
-      />
+      this.openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={ err }
-        type="err"
-        showIcon
-      />
+      this.openNotificationWithIcon('error', err)
     })
   }
 

src/pages/channel/addChannel.jsx

@@ -17,21 +17,21 @@ const header = props => {
   //   addChannel({ pageNum: 1, pageSize: 10 })
   // }, [])
 
-  function addChannel(params) {
-      request({
-        url: '/api/admin/channel',
-        method: 'POST',
-        data: { ...params },
-    // eslint-disable-next-line no-shadow
+  function addChannel (params) {
+    request({
+      url: '/api/admin/channel',
+      method: 'POST',
+      data: { ...params },
+      // eslint-disable-next-line no-shadow
     }).then(data => {
-        console.log(data)
-        setData(data)
-         // eslint-disable-next-line no-unused-expressions
-         router.go(-1)
+      console.log(data)
+      setData(data)
+      // eslint-disable-next-line no-unused-expressions
+      router.go(-1)
     })
   }
 
-  function handleSubmit(e) {
+  function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -48,12 +48,12 @@ const header = props => {
   const { getFieldDecorator } = props.form;
 
   return (
-  <>
-        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="渠道名称">
           {getFieldDecorator('channelName', {
             rules: [{ required: true, message: '请输入渠道名称' }],
-          })(<Input className={channels.inpuit} / >)}
+          })(<Input className={channels.inpuit} />)}
         </Form.Item>
         <Form.Item label="联系人">
           {getFieldDecorator('channelContact', {
@@ -73,13 +73,13 @@ const header = props => {
           <Button type="primary" htmlType="submit">
             保存
           </Button>
-          <Button className={channels.formButton} onClick = {() => router.go(-1)} type="primary" htmlType="submit">
+          <Button className={channels.formButton} onClick={() => router.go(-1)} type="primary" htmlType="submit">
             取消
           </Button>
         </Form.Item>
       </Form>
-  </>
-)
+    </>
+  )
 }
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);

src/pages/channel/brokerList.jsx

@@ -27,22 +27,6 @@ const menu = (
     </Menu.Item>
   </Menu>
 );
-// const dataSource = [
-//   {
-//     key: '1',
-//     img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-//     name: '123',
-//     age: 32,
-//     address: '西湖区湖底公园1号',
-//   },
-//   {
-//     key: '2',
-//     img: '',
-//     age: 42,
-//     address: '西湖区湖底公园1号',
-//   },
-// ];
-
 const columns = [
   {
     title: '头像',

src/pages/channel/channelList.jsx

@@ -74,7 +74,6 @@ const columns = [
     dataIndex: 'agentsInvite',
     key: 'agentsInvite',
     align: 'center',
-    // render: () => <a>Delete</a>,
   },
   {
     title: '操作',

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+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';
@@ -31,6 +31,7 @@ class ModalAttribution extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData.realtyConsultant)
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -65,34 +66,42 @@ class ModalAttribution extends React.Component {
     })
   }
 
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
    // 分页
   onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
   // 提交
-  submitGm() {
+  submitGm(record) {
     const { url, method } = apis.customer.recommendEdit
     const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
 
     // 网路请求
-    request({ url: tempUrl, method, data: { ...this.state.visibleData } }).then(res => {
+    request({ url: tempUrl, method, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+      this.openNotificationWithIcon('error', err)
     })
   }
 
   render() {
     const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
       {
         title: '姓名',
         dataIndex: 'name',
@@ -118,7 +127,7 @@ class ModalAttribution extends React.Component {
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <><Button className={Styles.SubmitButton} onClick={() => this.submitGm()}>确定</Button></>,
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant !== record.personId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
       },
     ]
     return (

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

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

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+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';
@@ -31,7 +31,6 @@ class ModalIntegralRecord extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData)
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -49,6 +48,14 @@ class ModalIntegralRecord extends React.Component {
     this.setState({ visibleData: { visible: false, customerId: '' } })
   }
 
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
   getList(params) {
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -62,15 +69,7 @@ class ModalIntegralRecord extends React.Component {
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+      this.openNotificationWithIcon('error', err)
     })
   }
 

src/pages/customer/customerlist/index.jsx

@@ -7,6 +7,7 @@ import Styles from './style.less';
 
 import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
+import ChangeStatus from './components/changeStatus'
 
 
 const { Option } = Select;
@@ -39,6 +40,11 @@ function body(props) {
   const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
   // 积分记录 ============= end
 
+  // 变更状态 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
+  // 变更状态 ============= end
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -61,8 +67,17 @@ function body(props) {
     })
   }
 
+  function displayNone() {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+  }
+
   // 提交事件
   function handleSubmit(e) {
+    displayNone()
+
+
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -85,6 +100,8 @@ function body(props) {
 
   // 私客/公客切换
   function radioButtonHandleSizeChange(e) {
+    displayNone()
+
     const { value } = e.target
     setCustomerType(value)
     getList({ pageNumber: 1, pageSize: 10, customerType: value })
@@ -93,14 +110,22 @@ function body(props) {
   // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
   // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
 
-function showGM(record) {
+  function showGM(record) {
     setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
     setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
     setRecordVisibleData({ visible: true, customerId: record.customerId })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+  }
+
+  function showStatus(record) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
 
   const columns = [
@@ -156,7 +181,7 @@ function showGM(record) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link">变更状态</Button>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showStatus(record)}>变更状态</Button>
           &nbsp;&nbsp;
           <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showGM(record)}>调整归属</Button>
           <br/>
@@ -214,7 +239,7 @@ function showGM(record) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+          <Button type="danger" htmlType="submit" >
             搜索
           </Button>
         </Form.Item>
@@ -233,6 +258,9 @@ function showGM(record) {
 
         {/* 积分记录 */}
         <IntegralRecord visibleData={recordVisibleData} />
+
+        {/* 变更状态 */}
+        <ChangeStatus visibleData={statusVisibleData} />
     </>
   );
 }

src/pages/customer/independentList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -11,6 +11,132 @@ const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
 
+class ModalTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList(params) {
+    console.log('this.state.visibleData', this.state.visibleData)
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    // 网路请求
+    const { url, method } = apis.customer.recommend
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(customerId)
+    // 网路请求
+    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '头像',
+        // eslint-disable-next-line jsx-a11y/alt-text
+        render: (text, 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',
+      },
+      {
+        title: '状态',
+        // eslint-disable-next-line consistent-return
+        render: (text, records) => {
+                                    if (records.status === 1) { return '报备' }
+                                    if (records.status === 2) { return '到访' }
+                                    if (records.status === 3) { return '认购' }
+                                    if (records.status === 4) { return '签约' }
+                                    if (records.verifyStatus === 1) { return '待审核' }
+                                    if (records.verifyStatus === 2) { return '审核同意' }
+                                    if (records.verifyStatus === 3) { return '签约' }
+                                  },
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="推荐客户"
+            destroyOnClose="true"
+            width={900}
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
 /**
  *
  *
@@ -54,12 +180,16 @@ function body(props) {
       }
     });
   }
-
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
+  function gM(row) {
+    setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+  }
 
   // 分页
   function onChange(pageNum) {
@@ -123,7 +253,7 @@ function body(props) {
               &nbsp;&nbsp;&nbsp;&nbsp;
               <sapn style={{ color: 'rgba(239,39,58,1)' }}>邀请经纪人</sapn>
               &nbsp;&nbsp;&nbsp;&nbsp;
-              <sapn style={{ color: 'rgba(239,39,58,1)' }}>推荐客户</sapn>
+              <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</sapn>
             </>
           }
         </>
@@ -158,6 +288,8 @@ function body(props) {
       </Form>
 
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+            {/* 调整归属 */}
+        <ModalTable visibleData={gVisibleData} />
     </>
   );
 }

src/pages/news/list/NewsList.jsx

@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
 import moment from 'moment';
+import router from 'umi/router';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 
 
 const { Option } = Select;
@@ -19,7 +21,53 @@ const tempDate = [{ code: 's101' }]
  */
 function CartBody(props) {
   const { data } = props
-  console.log(props);
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taNews',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        cancelPage();
+    })
+  }
+
+  //删除资讯
+  const changeNewsListStatus = (newsId) => () => {
+    Modal.confirm({
+      title: '确认删除该资讯？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({
+          url: '/api/admin/taNews/' + newsId,
+          method: 'DELETE',
+          // data: { ...row },
+        }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+        })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (newsId) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        newsId
+      },
+    });
+  }
+
   return (
           <Card
             hoverable
@@ -30,14 +78,14 @@ function CartBody(props) {
             <p className={Styles.cardText}>
               <span className={Styles.title}>资讯类型</span>
               <span >：{ data.newsType.newsTypeName }</span>
-              <span className={Styles.ediText}>
+              <span className={Styles.ediText} onClick={toEditList(data.newsId)}>
                 编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
               </span>
             </p>
             <p className={Styles.cardText}>
               <span className={Styles.title}>状态</span>
-              <span >：{ data.status == 0 ? "已发布" : "未发布" }</span>
+              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>阅读数量</span>
@@ -45,7 +93,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>转发数量</span>
-              <span className={ Styles.address }>：{ data.shareNum }</span>
+              <span>：{ data.shareNum }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>点赞数量</span>     
@@ -66,7 +114,7 @@ function CartBody(props) {
               </span>
               <span style={{
                 color: '#FF4A4A', position: 'absolute', right: '0',
-              }} >
+              }} onClick={changeNewsListStatus(data.newsId)}>
                 删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
@@ -122,6 +170,17 @@ function body(props) {
     });
   }
 
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
@@ -165,9 +224,8 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <NewsTypeSelect />,
           )}
         </Form.Item>       
         <Form.Item>
@@ -184,7 +242,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton}>
+      <Button type="primary" className={Styles.addButton} onClick={toEditList()}>
         新增
       </Button>
 

src/pages/news/list/editNewsList.jsx

@@ -0,0 +1,148 @@
+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 styles from '../../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getDynamicData(newsId);
+    },[])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({
+        url: '/api/admin/taNews/' + newsId,
+        method: 'GET',
+        params: { newsId },
+    }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  const Basic = (props) => {
+    const fields = [
+      {
+        label: '意向项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          {required: true, message: '请选择所属项目'},
+        ]
+      },
+      {
+        label: '资讯图片',
+        name: 'newsImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.newsImg,
+      },
+      {
+        label: '资讯标题',
+        name: 'newsName',
+        type: FieldTypes.Text,
+        value: dynamicData.newsName,
+        rules: [
+          {required: true, message: '请输入资讯标题'},
+        ]
+      },
+      {
+        label: '资讯类型',
+        name: 'newsTypeId',
+        render: <NewsTypeSelect />,
+        value: dynamicData.newsTypeId,
+        rules: [
+          {required: true, message: '请选择资讯类型'},
+        ]
+      },
+      {
+        label: '资讯详情',
+        name: 'desc',
+        render: <Wangedit />,
+        value: dynamicData.desc,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      let {...submitValue} = val
+      if(dynamicId){
+        submitValue.dynamicId = dynamicId
+        request({
+          url: '/api/admin/buildingDynamic/update',
+          method: 'PUT',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/taNews',
+          method: 'POST',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+    
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+  
+  const Poster = (props) => {
+   return <div>Poster</div>
+  }
+ 
+  const Share = (props) => {
+    return <div>Share</div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+    </div>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/type/NewsType.jsx

@@ -45,7 +45,7 @@ function header(props) {
   }
 
 
-  // 跳转到编辑咨询
+  // 跳转到编辑资讯
   const toEditNews = (id) => () => {
     router.push({
       pathname: '/news/type/editNews',

src/pages/staff/components/Tagss.jsx

@@ -0,0 +1,83 @@
+import React from 'react';
+import { Tag, Input, Tooltip, Icon } from 'antd';
+import Styles from './style.less';
+
+ class Tagss extends React.Component {
+  state = {
+    tags: [ 'Tag 2', 'Tag 3'],
+    inputVisible: false,
+    inputValue: '',
+  };
+
+  handleClose = removedTag => {
+    const tags = this.state.tags.filter(tag => tag !== removedTag);
+    console.log(tags);
+    this.setState({ tags });
+  };
+
+  showInput = () => {
+    this.setState({ inputVisible: true }, () => this.input.focus());
+  };
+
+  handleInputChange = e => {
+    this.setState({ inputValue: e.target.value });
+  };
+
+  handleInputConfirm = () => {
+    const { inputValue } = this.state;
+    let { tags } = this.state;
+    if (inputValue && tags.indexOf(inputValue) === -1) {
+      tags = [...tags, inputValue];
+    }
+    console.log(tags);
+    this.setState({
+      tags,
+      inputVisible: false,
+      inputValue: '',
+    });
+  };
+
+  saveInputRef = input => (this.input = input);
+
+  render() {
+    const { tags, inputVisible, inputValue } = this.state;
+    return (
+      <div>
+        {tags.map((tag, index) => {
+          const isLongTag = tag.length > 20;
+          const tagElem = (
+            <Tag className = {Styles.tagss} key={tag} closable = {true} onClose={() => this.handleClose(tag)}>
+              {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+            </Tag>
+          );
+          return isLongTag ? (
+            <Tooltip title={tag} key={tag}>
+              {tagElem}
+            </Tooltip>
+          ) : (
+            tagElem
+          );
+        })}
+        {inputVisible && (
+          <Input className = {Styles.tagss}
+            ref={this.saveInputRef}
+            // type="text"
+            // size="small"
+            // style={{ width: 78 }}
+            value={inputValue}
+            onChange={this.handleInputChange}
+            onBlur={this.handleInputConfirm}
+            onPressEnter={this.handleInputConfirm}
+          />
+        )}
+        {!inputVisible && (
+          <Tag className = {Styles.tagss} onClick={this.showInput} >
+            <Icon type="plus" /> 新建
+          </Tag>
+        )}
+      </div>
+    );
+  }
+}
+
+export default Tagss;

src/pages/staff/components/style.less

@@ -0,0 +1,24 @@
+.tagss{
+  width: 150px;
+  height: 32px;
+  
+font-size:14px;
+
+font-weight:400;
+color:rgba(153,153,153,1);
+
+
+padding: 4px 11px;
+
+color: rgba(0, 0, 0, 0.65);
+
+
+
+line-height: 1.5;
+
+background-color: #fff;
+
+
+
+border: 1px solid #d9d9d9;
+}

src/pages/staff/list/RoleList.jsx

@@ -0,0 +1,101 @@
+
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import { Card, Avatar } from 'antd';
+import request from '../../../utils/request'
+import Styles from './style.less';
+
+
+function confirm() {
+  Modal.confirm({
+    title: '确认停用该角色？',
+    okText: '确认',
+    cancelText: '取消',
+    onOk() {
+      console.log('OK');
+    },
+    onCancel() {
+      console.log('Cancel');
+    },
+  });
+
+}
+function toEditRole() {
+  router.push({
+    pathname: '/staff/editRole',
+    query: {
+      a: 'b',
+    },
+  });
+}
+
+
+const dataSource = [
+  {
+    name: '置业顾问',
+    status: '1',//显示停用
+  },
+  {
+    name: '置业经理',
+    status: '1',//停用
+  },
+];
+
+const columns = [
+  // {
+  //   title: '商品图片',
+  //   dataIndex: 'img',
+  //   key: 'img',
+  //   align: 'center',
+
+  //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+  // },
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+    render: text => <a>{text}</a>,
+  },
+
+  {
+    title: '操作  ',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center',
+
+    render: () => <>
+      <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>停用
+      <Icon type="stop" className={styles.shoppingCart} style={{fontSize:14}}/>
+      </span>
+      <span style={{ color: '#FF925C' }} onClick={toEditRole}>编辑
+      <Icon type="form" className={styles.edit} />
+      </span>
+    </>,
+
+  },
+];
+
+
+const header = (props) => {
+
+
+
+
+  return (
+    <>
+      <Button type="danger" className={styles.addBtn} onClick={toEditRole}>新增</Button>
+      <div className={Styles.roletext}>
+
+        <Table dataSource={dataSource} columns={columns} />
+      </div>
+    </>
+
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/staff/list/StaffList.jsx

@@ -0,0 +1,279 @@
+
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import { Card, Avatar } from 'antd';
+import request from '../../../utils/request'
+import Styles from './style.less';
+
+const { Meta } = Card;
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+//标签颜色
+const colors = {
+  金牌顾问: '#E34B59',
+  销售冠军: '#E8747E',
+  优选顾问: '#EEC37E',
+  人气顾问: '#FDDA9F',
+}
+// 提交事件
+function handleSubmit (e, props) {
+  e.preventDefault();
+  props.form.validateFields((err, values) => {
+    if (!err) {
+      console.log('提交数据: ', values)
+    }
+  });
+}
+// Change 事件
+function handleSelectChange (props) {
+  console.log(props)
+}
+
+// 分页
+function onChange (pageNumber) {
+  console.log('Page: ', pageNumber);
+}
+// 跳转到编辑商品
+function toEditStaff () {
+  router.push({
+    pathname: '/staff/editStaff',
+    // query: {
+    //   a: 'b',
+    // },
+  });
+}
+function confirm () {
+  Modal.confirm({
+    title: '确认停用该角色？',
+    okText: '确认',
+    cancelText: '取消',
+    onOk () {
+      console.log('OK');
+    },
+    onCancel () {
+      console.log('Cancel');
+    },
+  });
+
+}
+/**
+ *
+ *
+ * 
+ */
+
+// 假数据
+const tempData = [
+  {
+    name: '吴媛',
+    status: '1',// 启用
+    tel: '133 333 222',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问', '销售冠军'],
+  },
+  {
+    name: '吴媛',
+    status: '1',// 启用
+    tel: '133 333 333',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问', '销售冠军'],
+  },
+  {
+    name: '吴媛',
+    status: '1',// 启用
+    tel: '133 333 444',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问', '销售冠军'],
+  },
+  {
+    name: '吴媛',
+    status: '1',// 启用
+    tel: '133 333 555',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问', '销售冠军'],
+  },
+  {
+    name: '吴媛',
+    status: '0',
+    tel: '133 333 555',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问', '销售冠军'],
+  },
+  {
+    name: '吴媛',
+    status: '1',// 启用
+    tel: '133 333 555',
+    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
+    labels: ['金牌顾问'],
+  },
+
+
+
+]
+
+
+/**
+ *卡片
+ *
+ * @returns
+ */
+function CartBody (props) {
+  const { data } = props
+
+  return (
+
+    <Card className={Styles.card}>
+      <div>
+
+        <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
+        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff}>
+          编辑
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+        </span>
+        <span className={Styles.ediText} style={{ marginLeft: '50px' }} onClick={confirm}>
+          停用
+                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+        </span>
+
+      </div>
+      <div>
+
+        <span>
+          {
+            data.labels.map((item, index) => {
+              const color = colors[item];
+              console.log(color, '------');
+              return <Tag className={Styles.cardTag}  color = {color}>{item}</Tag>
+            })
+          }
+        </span>
+        {/* {
+           data.label.map((item, index) => (
+              
+                <Tag className={Styles.cardTag}>{item}</Tag>
+          
+            ))
+            } */}
+
+        <p className={Styles.cardText} style={{ width: '300px' }}>
+          <span>姓名:{data.name}</span>
+
+          <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
+
+        </p>
+        <p className={Styles.cardText} style={{ width: '300px' }}>
+          <span>电话:{data.tel}</span>
+        </p>
+      </div>
+
+    </Card>
+  )
+}
+
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  // useEffect(() => {
+  //   request({
+  //       url: '/api/admin/iBuildingDynamicList',
+  //       method: 'GET',
+  //       params: {pageNum: 1,pageSize: 10},
+  //   }).then((data) => {
+  //       console.log(data)
+  //       setData(data)
+  //   })
+  // })
+
+  // const getList = (e) => {
+  //   request({
+  //       url: '/api/xxx',
+  //       method: 'GET',
+  //       params: {},
+  //   }).then((data) => {
+  //       setData(data)
+  //   })
+  // }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <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('goodState')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value="1">启用</Option>
+              <Option value="0">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('isMain')(
+            <Select style={{ width: '180px' }} placeholder="请选择" onChange={handleSelectChange}>
+              <Option value="1">职业顾问</Option>
+              <Option value="0">其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="标签"
+            />,
+          )}
+        </Form.Item>
+
+
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="danger" className={styles.addBtn} onClick={toEditStaff}>新增</Button>
+
+      <Row style={{ padding: ' 0 10px' }}>
+        {
+          tempData.map((item, index) => (
+            <Col span={6}>
+              <CartBody data={item} />
+            </Col>
+          ))
+        }
+      </Row>
+
+      {/* <Table dataSource={data.records} columns={columns} /> */}
+      {/* 分页  */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/staff/list/channelList.less

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

src/pages/staff/list/editRole.jsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import { Form, Input, Button, Icon, Select } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+function header(props) {
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+     <div>编辑角色</div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/staff/list/editStaff.jsx

@@ -0,0 +1,135 @@
+import React, { useState } from 'react';
+
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import channels from './channelList.less';
+
+import Tagss from '../components/Tagss.jsx';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = (props) => {
+
+  const fields = [
+    {
+      label: '公司',
+      name: 'staffCompany',
+      type: FieldTypes.Text,
+      placeholder: '请输入公司名称',
+      value: ''
+    },
+    {
+      label: '部门',
+      name: 'staffDepartment',
+      type: FieldTypes.Text,
+      placeholder: '请输入部门',
+      value: ''
+    },
+    {
+      label: '职位',
+      name: 'staffPosition',
+      type: FieldTypes.Text,
+      placeholder: '请输入职位',
+      value: ''
+    },
+    {
+      label: '电话',
+      name: 'staffTel',
+      type: FieldTypes.Text,
+      placeholder: '请输入电话号码',
+      value: ''
+      // rules: [
+      //   { message: '请输入电话号码'}
+      // ]
+    },
+    {
+      label: '标签',
+      name: 'staffTag',
+      render: 
+      <Tagss/>
+     
+   
+    },
+    {
+      label: '地址',
+      name: 'staffAddress',
+      type: FieldTypes.Text,
+      placeholder: '请输入地址',
+      value: ''
+
+    },
+    {
+      label: '授权项目',
+      name: 'staffProject',
+      type: FieldTypes.Select,
+      placeholder: '请选择',
+      value: ''
+    },
+
+    // {
+    //   label: '授权项目',
+    //   name: 'staffProject',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请选择'
+    // },
+
+    {
+      label: '图片',
+      name: 'staffImage',
+      type: FieldTypes.ImageUploader,
+      extra: '建议图片大小 640 * 640',
+      value: ''
+    },
+
+
+    {
+      label: '简介',
+      name: 'staffIntroduction',
+      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
+      value: ''
+
+    },
+    {
+      label: '状态',
+      name: 'staffstate',
+      render: <Radio.Group>
+        <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
+      </Radio.Group>,
+      value: 'b'
+    },
+
+  ]
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+  }
+  return <XForm onSubmit={handleSubmit} fields={fields} offset={8}></XForm>
+
+
+
+
+}
+
+
+
+export default Edit
+
+
+
+
+
+
+
+
+

src/pages/staff/list/style.less

@@ -0,0 +1,90 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+
+.addButton {
+  // background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+
+.card {
+  width: 348px;
+  height: 244px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-bottom: 40px;
+
+}
+
+.cardText {
+
+  height: 28px;
+  font-size: 20px;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  line-height: 28px;
+  margin-top: 10px;
+  margin-bottom: 0;
+
+}
+
+.cardItem {
+  font-size: 18px;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+
+.ediText {
+  width: 36px;
+  height: 25px;
+  font-size: 18px;
+
+  font-weight: 400;
+  color: rgba(255, 146, 92, 1);
+  line-height: 25px;
+
+}
+
+.cardTag {
+  width: 48px;
+  height: 18px;
+  font-size: 10px;
+  // background: #fdce22;
+  border-radius: 4px;
+  color: #ffffff;
+  line-height: 14px;
+  margin-top: 10px;
+  padding: 1px 3px;
+}
+
+.title {
+  display: inline-block;
+  width: 84px;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify
+}
+
+
+.roletext {
+  font-size: 20px;
+
+  font-weight: 400;
+  color: rgba(51, 51, 51, 1);
+  line-height: 28px;
+}

src/services/apis.js

@@ -92,5 +92,9 @@ export default {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/id`,
     },
+    recommend: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/id`,
+    },
   },
 }