bug

src/pages/activity/dataRecord/index.jsx

@@ -46,6 +46,7 @@ const DataRecord = props => {
     return <>
         <div>
             <div>
+                <span>{data.activityName || '0'}</span>
                 <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
                 <Modal
                     title="指标说明（数据会存在一定时间延迟）"

src/pages/channel/independentList/index.jsx

@@ -24,11 +24,11 @@ class ModalTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -37,16 +37,16 @@ class ModalTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList (params) {
+  getList(params) {
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -70,7 +70,7 @@ class ModalTable extends React.Component {
   }
 
   // 分页
-  onChange (pageNum) {
+  onChange(pageNum) {
     props.form.validateFields((err, values) => {
       if (!err) {
         getList({ pageNumber: pageNum, pageSize: 5, ...values })
@@ -78,7 +78,7 @@ class ModalTable extends React.Component {
     });
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
@@ -89,7 +89,7 @@ class ModalTable extends React.Component {
         title: '用户名',
         dataIndex: 'name',
         key: 'name',
-        render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
+        // render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -111,20 +111,20 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
+        render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
       },
       {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
           console.log("retrun", records)
-      //     if (records.status === 1) { return '报备' }
-      // if (records.status === 2) { return '推荐' }
-      // if (records.status === 3) { return '认购' }
-      // if (records.status === 4) { return '签约' }
-      // if (records.verifyStatus === 1) { return '待审核' }
-      // if (records.verifyStatus === 2) { return '审核同意' }
-      // if (records.verifyStatus === 3) { return '签约' }
+          //     if (records.status === 1) { return '报备' }
+          // if (records.status === 2) { return '推荐' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
           // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
           // if (records.status === 2) { return '到访' }
           // if (records.status === 3) { return '认购' }
@@ -132,7 +132,12 @@ class ModalTable extends React.Component {
           // if (records.verifyStatus === 1) { return '待审核' }
           // if (records.verifyStatus === 2) { return '审核同意' }
           // if (records.verifyStatus === 3) { return '签约' }
-          if (records.status === 1) { if(records.verifyStatus === 0) {return '待审核'} if(records.verifyStatus === 1) {return '报备'} if(records.verifyStatus === 2) {return '审核不通过'}  }
+          if (records.status === 1) {
+            if (records.verifyStatus === 0) { return '待审核' }
+            if (records.verifyStatus === 1) {
+              if (records.reportRecommendStatus === 1) { return '报备' }
+              if (records.reportRecommendStatus === 2) { return '推荐' }}
+            if (records.verifyStatus === 2) { return '审核驳回' } }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
@@ -172,13 +177,13 @@ class InviteTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
-    
+  componentDidMount() {
+
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { customerId } = this.props.visibleData
-    
+
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -187,18 +192,18 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
-  getList (params) {
+  getList(params) {
     const { id } = params
     console.log(id)
     if (id === '' || id === undefined) {
@@ -208,16 +213,16 @@ class InviteTable extends React.Component {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-    
+
     })
   }
 
   // 分页
-  onChange (pageNum) {
+  onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
@@ -231,7 +236,7 @@ class InviteTable extends React.Component {
         dataIndex: 'nickname',
         key: 'nickname',
         align: 'center',
-      render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
+        render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -271,7 +276,7 @@ class InviteTable extends React.Component {
  * @param {*} props
  * @returns
  */
-function body (props) {
+function body(props) {
   const { getFieldDecorator, getFieldsValue } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -283,7 +288,7 @@ function body (props) {
   }, [])
 
 
-  function openNotificationWithIcon (type, message) {
+  function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
       description:
@@ -291,7 +296,7 @@ function body (props) {
     });
   }
 
-  function getList (params) {
+  function getList(params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
@@ -301,7 +306,7 @@ function body (props) {
   }
 
   // 提交事件
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -314,24 +319,24 @@ function body (props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
-  function handleSelectChange (e) {
+  function handleSelectChange(e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
-  function gM (row) {
+  function gM(row) {
     setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGInviteData({ visible: false })
   }
 
-  function Invite (row) {
+  function Invite(row) {
     setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGVisibleData({ visible: false })
   }
 
   // 分页
-  function onChange (pageNum) {
+  function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
@@ -339,11 +344,11 @@ function body (props) {
   /**
     * 重置搜索
     */
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
   }
 
-  function toAudit (cuurentId) {
+  function toAudit(cuurentId) {
     router.push({
       pathname: '/customer/recommendCustomer/audit',
       query: {
@@ -352,7 +357,7 @@ function body (props) {
     })
   }
 
-  function exportIndependen () {
+  function exportIndependen() {
     const fieldsValue = getFieldsValue()
     console.log('fieldsValue', fieldsValue)
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob', params: { ...fieldsValue } })
@@ -363,7 +368,7 @@ function body (props) {
       })
   }
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -387,7 +392,7 @@ function body (props) {
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
-      render: (_, record) => <><span>{ record.name || record.nickname }</span></>,
+      render: (_, record) => <><span>{record.name || record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -411,7 +416,7 @@ function body (props) {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
-      render: (_, record) => <><span>{record.channelName }</span></>,
+      render: (_, record) => <><span>{record.channelName}</span></>,
     },
     {
       title: '操作',
@@ -451,16 +456,16 @@ function body (props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-      <Form.Item>
+        <Form.Item>
           {getFieldDecorator('channelId')(
-           <ChannelSelect />
-          //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
-          //   <option value="">全部</option>
-          //   {data.channelNmae.map(Item =>
-          //     <Option value={Item.channelId}> {Item.channelName} </Option>,
-          //   )}
-      
-          // </Select>,
+            <ChannelSelect />
+            //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
+            //   <option value="">全部</option>
+            //   {data.channelNmae.map(Item =>
+            //     <Option value={Item.channelId}> {Item.channelName} </Option>,
+            //   )}
+
+            // </Select>,
           )}
         </Form.Item>
         <Form.Item>

src/pages/channel/recommendClients.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select,Avatar } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Avatar } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -52,14 +52,14 @@ const columns = [
     // key: 'img',
     align: 'center',
 
-    render: (text, record) =>  <Avatar shape="square"   src={record.picture} size={64} icon="user" /> ,
+    render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
   },
   {
     title: '用户姓名',
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    render:  (text, record) => <div>{record.name}</div> ,
+    render: (text, record) => <div>{record.name}</div>,
   },
   {
     title: '电话',
@@ -72,7 +72,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, record) => <span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span>
+    render: (text, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>
   },
   {
     title: '意向项目',
@@ -85,7 +85,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
+    render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
   },
   {
     title: '状态',
@@ -94,13 +94,13 @@ const columns = [
     align: 'center',
     // eslint-disable-next-line consistent-return
     render: (text, records) => {
-          //    if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
-          // if (records.status === 2) { return '到访' }
-          // if (records.status === 3) { return '认购' }
-          // if (records.status === 4) { return '签约' }
-          // if (records.verifyStatus === 1) { return '待审核' }
-          // if (records.verifyStatus === 2) { return '审核同意' }
-          // if (records.verifyStatus === 3) { return '签约' }
+      //    if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+      // if (records.status === 2) { return '到访' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { return '待审核' }
+      // if (records.verifyStatus === 2) { return '审核同意' }
+      // if (records.verifyStatus === 3) { return '签约' }
       // if (records.status === 1) { return '报备' }
       // if (records.status === 2) { return '推荐' }
       // if (records.status === 3) { return '认购' }
@@ -108,10 +108,15 @@ const columns = [
       // if (records.verifyStatus === 1) { return '待审核' }
       // if (records.verifyStatus === 2) { return '审核同意' }
       // if (records.verifyStatus === 3) { return '签约' }
-      if (records.status === 1) { if(records.verifyStatus === 0) {return '待审核'} if(records.verifyStatus === 1) {return '报备'} if(records.verifyStatus === 2) {return '审核不通过'}  }
-          if (records.status === 2) { return '到访' }
-          if (records.status === 3) { return '认购' }
-          if (records.status === 4) { return '签约' }
+      if (records.status === 1) {
+        if (records.verifyStatus === 0) { return '待审核' }
+        if (records.verifyStatus === 1) {
+          if (records.reportRecommendStatus === 1) { return '报备' }
+          if (records.reportRecommendStatus === 2) { return '推荐' }}
+        if (records.verifyStatus === 2) { return '审核驳回' } }
+      if (records.status === 2) { return '到访' }
+      if (records.status === 3) { return '认购' }
+      if (records.status === 4) { return '签约' }
     },
   },
 ];
@@ -119,7 +124,7 @@ const columns = [
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({})
-//   const [page, changePage] = useState({})
+  //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getListRecommend({ pageNumber: 1, pageSize: 10 })
@@ -140,23 +145,23 @@ const header = props => {
   function getListRecommend(params) {
     request({ ...apis.channelList.getListRecommend, urlData: { id: props.location.query.id }, params: { ...params } }).then((data) => {
       setData(data)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
 
 
-   // 分页
- function onChange(pageNum) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      getListRecommend({ pageNumber: pageNum, pageSize: 9 })
-    }
-return (
-  <>
-  <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
-  </>
-)
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getListRecommend({ pageNumber: pageNum, pageSize: 9 })
+  }
+  return (
+    <>
+      <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    </>
+  )
 }
 
 function handleMenuClick(e) {