Merge branch 'v3.5' into v3.5.1

config/routes.js

@@ -292,7 +292,7 @@ export default [
               },
               {
                 path: '/activity/helpActivity/edithelpActivity',
-                name: '新增',
+                name: '编辑',
                 hideInMenu: true,
                 component: './activity/helpActivity/edithelpActivity',
               },
@@ -424,12 +424,6 @@ export default [
                 hideInMenu: true,
                 component: './system/document/audit',
               },
-              {
-                path: '/system/document/see',
-                name: '客户资料查看',
-                hideInMenu: true,
-                component: './system/document/see',
-              },
             ],
           },
           {

package.json

@@ -77,6 +77,7 @@
     "@types/history": "^4.7.2",
     "@types/jest": "^24.0.13",
     "@types/lodash": "^4.14.133",
+    "@types/qrcode.react": "^0.9.0",
     "@types/qs": "^6.5.3",
     "@types/react": "^16.8.19",
     "@types/react-document-title": "^2.0.3",

src/components/SelectButton/BuildSelect.jsx

@@ -22,21 +22,25 @@ function usePrevious(props) {
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
   const [ value, setValue ] = useState('')
-  const preProps = usePrevious(props)
+  // const preProps = usePrevious(props)
 
-  if ((!preProps || !preProps.value) && props.value && !value) {
+  // if ((!preProps) && props.value != value) {
+  //   setValue(props.value)
+  // }
+
+  useEffect(() => {
     setValue(props.value)
-  }
+  }, [props.value])
 
   useEffect(() => {
     getCityList();
   },[])
 
   const getCityList = (e) => {
-    request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
+    request({ ...apis.building.getList, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
         // 默认选中第一个
-        if ((!preProps || !preProps.one) && props.one === 'true') {
+        if (props.checkFirst) {
           setValue(data.records[0].buildingId)
           props.onChange(data.records[0].buildingId)
         }
@@ -51,7 +55,7 @@ const BuildingSelect = (props) => {
   return (
       <Select
       showSearch
-      value={props.value}
+      value={value}
       style={{ width: '180px' }} 
       placeholder="请选择项目" 
       onChange={handleChange}
@@ -65,4 +69,3 @@ const BuildingSelect = (props) => {
   )
 }
 export default BuildingSelect
-

src/components/Wangedit/Wangedit.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import E from 'wangeditor'
+import E from 'wangeditor';
+import { fetch, apis } from '../../utils/request';
 
 /**
  * @param {*} props
@@ -33,7 +34,33 @@ class Wangedit extends React.Component {
       }
     }
     this.editor.customConfig.zIndex = 100
-    this.editor.customConfig.uploadImgShowBase64 = true   
+    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'  // 重复
+    ]
+
     this.editor.create()
     this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)
@@ -46,6 +73,18 @@ class Wangedit extends React.Component {
       }
     }
   }
+
+  /**
+   *增加这个 shouldComponentUpdate 生命函数
+    处理自动聚焦到富文本上
+   *
+   * @param {*} nextProps
+   * @returns
+   * @memberof Wangedit
+   */
+  shouldComponentUpdate(nextProps) {
+    return nextProps.value !== this.editor.txt.html()
+  }
 }
 
 export default Wangedit

src/components/XForm/FileUpload.jsx

@@ -0,0 +1,57 @@
+import React, { useState, useEffect } from 'react'
+import { Upload, Button, Icon } from 'antd';
+import { uploaderProps } from '../../utils/upload';
+
+function fileUpload(props) {
+
+  const { value } = props
+  console.log('fileUploadProps： ', props)
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [defaultFileList, setDefaultFileList] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    setDefaultValue()
+  }, [props.value]);
+
+
+  function getFileList() {
+    return (value || []).map((img, inx) => ({ uid: inx, url: img, name: img.substring(img.lastIndexOf('/') + 1, img.length), status: 'done' }))
+  }
+
+  function setDefaultValue() {
+    if (!value) {
+      return;
+    }
+
+    setDefaultFileList(getFileList())
+  }
+
+  function onFileChange({ file, fileList }) {
+    setDefaultFileList(fileList)
+    if (file.status === 'uploading') {
+      return
+    }
+
+    if (file.status === 'done') {
+      props.onChange([].concat(file.response))
+    }
+  }
+
+  return (
+    <>
+      <Upload
+        { ...uploaderProps }
+        {...props}
+        onChange={onFileChange}
+        fileList={defaultFileList}
+      >
+        <Button>
+          <Icon type="upload" /> {props.label}
+        </Button>
+      </Upload>
+    </>
+  )
+}
+
+export default fileUpload

src/pages/Welcome.jsx

@@ -11,8 +11,11 @@ const welcome = (props) => {
 
   const [data, setData] = useState([])
 
+  const [checkData, setCheckData] = useState([])
+
   useEffect(() => {
     getIndexEcharts()
+    getBuildingReports()
   }, [])
 
   function getIndexEcharts(params) {
@@ -24,35 +27,48 @@ const welcome = (props) => {
       console.log(data, '11111')
     })
   }
+
+  function getBuildingReports() {
+    request({ ...apis.system.taBuildingReports, }).then((data) => {
+      setCheckData((data.records || []).map((x) => x.reportCode))
+    })
+  }
+
   return (
     <>
       <div style={{ display: 'flex', marginBottom: '33px' }}>
-        <div style={{
-          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-          boxShadow: '0px  0.106rem 14px -15px rgba(241,43,62,1)',
-          borderRadius: '12px', width: '32%', marginRight: '2%'
-        }}>
-          <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
-          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
-        </div>
-        <div style={{
-          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-          boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
-          borderRadius: '12px', width: '32%', marginRight: '2%'
-        }}>
-          <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
-          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
-        </div>
-        <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
-          textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-          boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
-          borderRadius: '12px', width: '32%',
-        }}>
-          <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0',cursor: 'pointer' }}>最近7天新增 </span>
-          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
-        </div>
+        {checkData.includes('total_number_of_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(241,43,62,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
+          </div>
+        }
+        {checkData.includes('total_number_of_registered_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
+          </div>
+        }
+        {checkData.includes('number_of_new_users') &&
+          <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
+            borderRadius: '12px', width: '32%',
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0',cursor: 'pointer' }}>最近7天新增 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
+          </div>
+        }
       </div>
-      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} ></IndexEcharts>
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} checkData={checkData}></IndexEcharts>
     </>
   )
 

src/pages/activity/ActivityList.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
+import styles from '../style/GoodsList.less';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
@@ -16,23 +16,24 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
-//   const [page, changePage] = useState({})
+  //   const [page, changePage] = useState({})
+  const [time, setTime] = useState('')
 
- // 查询列表
- const getList = params => {
-  request({ ...apis.activity.list, params: { ...params } }).then(data => {
+  // 查询列表
+  const getList = params => {
+    request({ ...apis.activity.list, params: { ...params } }).then(data => {
       console.log(data)
       setData(data)
-  })
-}
+    })
+  }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
   }, [])
 
-// 跳转到编辑商品
-const toEditGoods = dynamicId => () => {
+  // 跳转到编辑商品
+  const toEditGoods = dynamicId => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
@@ -41,6 +42,23 @@ const toEditGoods = dynamicId => () => {
     });
   }
 
+  const newQrcode = row => {
+    const x = new XMLHttpRequest();
+    const resourceUrl = row.qrCode
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response)
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none'
+      a.download = '活动二维码.png';
+      a.click();
+    }
+    x.send();
+  }
+
+
   /**
    *
    *
@@ -53,44 +71,64 @@ const toEditGoods = dynamicId => () => {
       dataIndex: 'title',
       key: 'title',
       align: 'center',
+      // width: '15%',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>{row.title}</div></>,
+      // width: '300px',
+      // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
+// text-overflow: ellipsis; /*以省略号...显示*/
+// white-space: nowrap;
     },
     {
       title: '活动时间',
       dataIndex: 'startDate',
       key: 'startDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+      // width: '15%',
+      // width: '20%',
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
     },
     {
       title: '已参加人数',
       dataIndex: 'count',
       key: 'count',
       align: 'center',
+      // width: '10%',
+      // width: '6%',
     },
     {
       title: '阅读量',
       dataIndex: 'pvNum',
       key: 'pvNum',
       align: 'center',
+      // width: '10%',
     },
     {
       title: '转发量',
       dataIndex: 'shareNum',
       key: 'shareNum',
       align: 'center',
+      // width: '10%',
     },
     {
       title: '收藏数',
       dataIndex: 'saveNum',
       key: 'saveNum',
       align: 'center',
+      // width: '10%',
     },
     {
-      title: '状态',
+      title: '报名状态',
       dataIndex: 'activityStatus',
       key: 'activityStatus',
       align: 'center',
-      render: activityStatus => <><span>{activityStatus == 0 ? "进行中" : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
+      // width: '10%',
+      render: activityStatus => <><span>{activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
+    },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
     },
     {
       title: '操作',
@@ -100,111 +138,125 @@ const toEditGoods = dynamicId => () => {
       render: (x, row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+          {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' ? '报名记录' : ''}{ (row.isEnlist==1)  && <Icon type="snippets" className={styles.shoppingCart} />}</span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.isEnlist == 1 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
+            {row.activityStatus === 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消添加标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
+      {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
         </>
-      )
+      ),
     },
   ];
-
   const getSignList = dynamicId => {
-      router.push({
-          pathname: '/activity/SignList',
-          query: {
-              dynamicId,
-          },
-        });
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
   }
 
   const finishDynamic = row => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: "" } }).then(data => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10 })
-              }).catch(err => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-  }
-
-//   置顶
-  const topDynamic = row => () => {
-      const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then(data => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
           console.log(data)
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
-      }).catch(err => {
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+        }).catch(err => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
+        })
+      },
+    });
+  }
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1)
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
-  
+
   const sendOrPublicDynamic = row => {
-      if (row.status === 1) {
-          cancelDynamic(row)
-      } else {
-          sendDynamic(row)
-      }
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
   }
-  
+
   // 取消活动
   const cancelDynamic = row => {
-      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
-      }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
-  
-  //发布活动
+
+  // 发布活动
   const sendDynamic = row => {
-      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-      }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
-  
+
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
+        if (time) {
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+        } else {
+          values.time = null
+        }
+        
         getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  // 重置搜索
+  function handleReset () {
     props.form.resetFields();
+    setTime('')
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  // 时间回调
+  function timeOnChange(date, dateString) {
+    console.log(date, dateString)
+    setTime(date)
   }
 
 
@@ -212,7 +264,9 @@ const handleSubmit = (e, props) => {
   return (
 
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      {/* style={{ display: 'none' }} */}
+      <div id="qrcode"></div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
             <SelectCity />,
@@ -233,7 +287,7 @@ const handleSubmit = (e, props) => {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('time')(
-            <DatePicker />
+            <DatePicker onChange={timeOnChange}/>,
           )}
         </Form.Item>
         <Form.Item>
@@ -249,16 +303,16 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={(e) => changePageNum(e)} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
       </div>
     </>
   )

src/pages/activity/SignList.jsx

@@ -41,7 +41,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>
+    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>,
   },
   {
     title: '推广人',
@@ -55,20 +55,32 @@ const columns = [
     key: 'orgName',
     align: 'center',
   },
+  {
+    title: '状态',
+    dataIndex: 'isCheckin',
+    key: 'isCheckin',
+    align: 'center',
+    render: (x, row) => <><span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span></>,
+  },
 ];
 
 
 
-const header = (props) => {
-  const [ data, setData ] = useState({list: {}})
+const header = props => {
+  const [data, setData] = useState({list: {}})
 //   const [page, changePage] = useState({})
+// 存入导入数据的值
+const { getFieldDecorator, getFieldsValue } = props.form
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getSignList({pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId });
-  },[])
+    // eslint-disable-next-line no-use-before-define
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }, [])
 
   // 查询列表
-  const getSignList = (params) => {
-    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
+  const getSignList = params => {
+    // eslint-disable-next-line no-shadow
+    request({ ...apis.activity.signList, params: { ...params } }).then(data => {
         console.log(data)
         setData(data)
     })
@@ -83,13 +95,81 @@ const header = (props) => {
       pathname: '/activity/ActivityList',
     });
   }
+    // 提交事件
+// eslint-disable-next-line no-shadow
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId, isCheckin: values.isCheckin, name: values.name, phone: values.phone })
+    });
+  }
+   // 重置搜索
+   function handleReset() {
+    props.form.resetFields();
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId })
+  }
+ // eslint-disable-next-line class-methods-use-this
+ function exportHelp() {
+  const fieldsValue = getFieldsValue()
+  console.log('fieldsValue', fieldsValue)
+    request({ ...apis.activity.getTaActivityDynamicEnlistExport, params: { ...fieldsValue, dynamicId: props.location.query.dynamicId } })
+      .then(data => {
+        if (!data) {
+          return
+        }
+        const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '助力者记录.xlsx')
+        document.body.append(link)
+        link.click()
+      }).catch(() => {
+
+      })
+  }
 
   return (
     <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('isCheckin')(
+            <Select style={{ width: '180px' }} placeholder="签到状态">
+              <Option value="0">未签到</Option>
+              <Option value="1">已签到</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="用户姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <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>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
+      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/activity/drainage/Detail.jsx

@@ -7,13 +7,14 @@ import moment from 'moment';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import { SSL_OP_SSLEAY_080_CLIENT_DH_BUG } from 'constants';
-
+import AuthButton from '../../../components/AuthButton';
+import { timeout } from 'q';
 
 
 const data = []
 
 const header = (props) => {
-  const drainageId = props.location.query.drainageId
+  const { drainageId, name } = props.location.query
 
 
   const [datas, setDatas] = useState([])
@@ -21,8 +22,7 @@ const header = (props) => {
   const [columns, setColumns] = useState([])
   const [startDate, setStartDate] = useState('')
   const [endDate, setEndDate] = useState('')
-  const [total,setTotal] = useState({})
-  let daterange = []
+  const [total, setTotal] = useState({})
   // let content = {}
   useEffect(() => {
 
@@ -33,20 +33,19 @@ const header = (props) => {
   function gettaDrainageRecord (params) {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
       // setDatas(data) 
-      console.log(data.total, '3333333333333')
-      if(data.total!=0){
-      setTotal(data)
-      // console.log(data.total, '3333333333333')
-     
-      setDatas(tableData(data.records))
-      // content = data.records[0]
-      console.log('json: ', eval('(' + data.records[0].content + ')'))
-      setContent(eval('(' + data.records[0].content + ')'))
-      setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
-    }
-    else{
-      message.info('数据为空')
-    }
+      console.log(data, '3333333333333')
+      if (data.total != 0) {
+        setTotal(data)
+        setDatas(tableData(data.records))
+        // content = data.records[0]
+        console.log('json: ', eval('(' + data.records[0].content + ')'))
+        setContent(eval('(' + data.records[0].content + ')'))
+        setColumns(tableTitle(data.records))
+      }
+      else {
+        setDatas([])
+        message.info('数据为空')
+      }
 
 
 
@@ -56,11 +55,13 @@ const header = (props) => {
     })
   }
   function tableData (data) {
-    console.log('data', data)
+    console.log('tabledata', data)
     return data.map((row, inx) => {
       return eval('(' + row.content + ')').reduce((acc, col) => {
         const r = {
+
           key: inx + 1,
+          createDate: row.createDate,
           [`${col.key}`]: col.value,
           ...acc,
         }
@@ -71,39 +72,51 @@ const header = (props) => {
   }
 
   function tableTitle (data) {
-    return data.map((item) => {
+    tableTitle = eval('(' + data[0].content + ')')
+    const cols = [{
+      title: "提交时间",
+      dataIndex: "createDate",
+      key: "createDate",
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    }]
+    return cols.concat(tableTitle.map((item) => {
       const col = {
         title: item.label,
         dataIndex: item.key,
         key: item.key
       }
       return col
-    })
+    }))
   }
+  // function datalist () {
 
+  //   gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
+  // }
 
-  function datalist() {
-
-    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate)  })
-  }
-
-  function fromTime(str) {
+  function fromTime (str) {
     return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
   }
 
-  function onChangetime(dates, dateStrings) {
- 
+  function Time (str) {
+    return str === '' ? null : `${moment(str).format('YYYY-MM-DD')}`
+  }
+  // 2019-10-30T11:04:49
+  function onChangetime (dates, dateStrings) {
+    console.log(dateStrings[1])
     setEndDate(dateStrings[1])
     setStartDate(dateStrings[0])
-    
+
   }
 
   const changePageNum = pageNumber => {
-    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10 ,drainageId: drainageId, startTime: fromTime(startDate) ,endTime: fromTime(endDate)})
-}
-  function excelPort(){
+    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
+  }
+
+
+  function excelPort () {
     // const fieldsValue = getFieldsValue()
-    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate) }  })
+
+    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -126,31 +139,54 @@ const header = (props) => {
     link.click()
   }
 
+  function handleReset (e) {
+    console.log(e)
+    props.form.resetFields();
+    setEndDate('')
+    setStartDate('')
+  }
+
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
+  }
+
   const { RangePicker } = DatePicker;
+  const { getFieldDecorator } = props.form
   return (
     <>
-
-<RangePicker
-          style={{ width: '400px' }}
-          // 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}
-        />
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
-          搜索
-      </Button>
-    
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item label="提交时间">
+        {getFieldDecorator('time')(
+            <RangePicker showTime format="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>
       <div>
-        {/* H5项目名称 */}
-        {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px',marginBottom: '30px' }} onClick={excelPort}>导出数据</Button>
-        <Table columns={columns} dataSource={datas}  pagination={false} />
+        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>
+            H5项目：{name}
+          </div>
+          {/* H5项目名称 style={{ float: 'right', margin: '20px 0', zIndex: 1 }} */}
+          <AuthButton name="admin.taDrainageRecord.export.get" noRight={null}>
+            <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px', zIndex: 1 }} onClick={excelPort}>导出数据</Button>
+          </AuthButton>
+        </div>
+        <Table columns={columns} dataSource={datas} pagination={false} />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} />
-      </div>
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current} />
+        </div>
       </div>
 
 
@@ -159,6 +195,6 @@ const header = (props) => {
     </>
   )
 }
+const WrappedHeader = Form.create({ name: 'header' })(header);
 
-
-export default header
+export default WrappedHeader

src/pages/activity/drainage/DrainageList.jsx

@@ -7,32 +7,18 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
+import AuthButton from '../../../components/AuthButton';
 
-const toEditList = (drainageId) => () => {
-  console.log(drainageId,'12344567')
+const toEditList = (row) => () => {
   router.push({
     pathname: '/activity/drainage/Detail',
     query: {
-      drainageId
+      drainageId: row.drainageId,
+      name: row.name,
     },
   });
 }
 
-
-
-const data = [
-
-  {
-    Id: '1',
-    name: 'zls',
-    // StartTime:'',
-    // EndTime:'',
-    number: 33,
-  }
-
-
-];
-
 const header = (props) => {
   // const [data, setData] = useState({ data: [] })
   const [datas, setDatas] = useState([])//表格数据
@@ -47,11 +33,11 @@ const header = (props) => {
       visible: false,
       confirmLoading: false,
     })
-    
+
   }, [])
 
   function gettaDrainage (params) {
-    request({ ...apis.activity.taDrainage, params: params  }).then((data) => {
+    request({ ...apis.activity.taDrainage, params: params }).then((data) => {
       setDatas(data)
       console.log(data.records, '_213_')
     }).catch((err) => {
@@ -65,18 +51,18 @@ const header = (props) => {
       title: '确认删除该引流？',
       okText: '确认',
       cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }).then((data) => {
+      onOk () {
+        request({ ...apis.activity.deletetaDrainage, urlData: { id: drainageIid }, }).then((data) => {
           message.info('操作成功！')
           gettaDrainage({ pageNum: 1, pageSize: 10 })
         }).catch((err) => {
-          console.log('111111',err)
-          message.info(err.msg || err.message)
+          console.log('111111', err)
+          // message.info(err.msg || err.message)
         })
       }
     });
   }
-  
+
   const columns = [
     {
       title: 'H5项目编号',
@@ -89,14 +75,18 @@ const header = (props) => {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+      render: (text, datas) => <>
+
+        <div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div>
+
+      </>
     },
     {
       title: 'appid',
       dataIndex: 'appid',
       key: 'appid',
       align: 'center',
-      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>, 
     },
     {
       title: 'secret',
@@ -112,7 +102,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{ row.createDate && moment(row.createDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.createDate && moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </>
       ),
     },
@@ -123,7 +113,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{ row.endDate && moment(row.endDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.endDate && moment(row.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </>
       ),
     },
@@ -140,75 +130,66 @@ const header = (props) => {
       align: 'center',
       render: (text, datas) => (
         <>
-          <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas.drainageId)}>
-            查看详情
+          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas)}>
+              查看详情
             </span>
-  
-          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
-            删除
+          </AuthButton>
+          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
+            <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
+              删除
             </span>
+          </AuthButton >
         </>
       ),
     },
   ];
   const Forms = props => {
-   
-    console.log(date,'---------------')
-    console.log(formsdate,'---------------')
-    console.log(formsdate,'22222222')
-    const fields = [
-      {
-        label: 'H5项目名称',
-        name: 'name',
-        type: FieldTypes.Text,
-        placeholder:"请输入H5项目名称",
-        value: formsdate.name,
-
-      },
-      {
-        label: '截止时间',
-        name: 'endDate',
-        type: FieldTypes.DatePicker,
-        value:formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
-        // render: <DatePicker placeholder="截止时间" value= {formsdate.endDate} />,
-      },
 
+    console.log(date, '---------------')
+    console.log(formsdate.name, '---------------')
+    console.log(formsdate, '22222222')
 
-    ]
 
-    const handleSubmit = val => {
-      console.log(date,'111---------------')
-    console.log(formsdate,'111---------------')
-    console.log(formsdate,'11122222222')
-      // data: { ...submitValue }
-
-      console.log(formsdate.drainageId,'9999999999999')
-      if (formsdate.drainageId) {
-        // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val}).then((data) => {
-          message.info('操作成功！')
-          // gettaDrainage({ pageNum: 1, pageSize: 10 })
-        }).catch((err) => {
-          console.log('111111',err)
-          message.info(err.msg || err.message)
-        })
-       
-      } else {
-
-     
-
-        request({ ...apis.activity.addtaDrainage, data: val }).then((data) => {
-          message.info("保存成功")
-          console.log(data, '22222')
-          
-        }).catch((err) => {
-          message.error(err.msg || err.message)
-        })
+    const { formsDate } = props
+    useEffect(() => {
+      if (formsDate) {
+        props.form.setFieldsValue({ name: formsdate.name, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
       }
-      setDate({
-        visible: false,
+    }, [formsDate])
+
+
+    const handleSubmit = e => {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          if (formsDate.drainageId) {
+            // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
+            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then((data) => {
+              message.info('操作成功！')
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              console.log('111111', err)
+              message.info(err.msg || err.message)
+            })
+
+          } else {
+
+            request({ ...apis.activity.addtaDrainage, data: values }).then((data) => {
+              message.info("操作成功")
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              message.error(err.msg || err.message)
+            })
+          }
+        }
       });
-      gettaDrainage({ pageNum: 1, pageSize: 10 })
     }
 
     const handleCancel = val => {
@@ -217,47 +198,111 @@ const header = (props) => {
       });
     }
 
-    return <XForm onSubmit={handleSubmit} onCancel={handleCancel}  fields={fields}></XForm>
-    
-  }
+    const tailFormItemLayout = {
+      wrapperCol: {
+        xs: {
+          span: 24,
+          offset: 0,
+        },
+        sm: {
+          span: 16,
+          offset: 8,
+        },
+      },
+    };
+
+    const formItemLayout = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+    };
 
+    const { getFieldDecorator } = props.form;
+    {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
+
+    return <Form {...formItemLayout} onSubmit={handleSubmit}>
+
+
+      <Form.Item label="H5项目名称">
+        {getFieldDecorator('name')(
+          <Input
+            placeholder="请输入H5项目名称"
+          />,
+        )}
+      </Form.Item>
+      <Form.Item label="截止时间">
+        {getFieldDecorator('endDate')(
+          <DatePicker
+          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+          // placeholder={formsdate.endDate}
+          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          />,
+        )}
+      </Form.Item>
+      <Form.Item {...tailFormItemLayout}>
+        <AuthButton name="admin.taDrainage.id.put" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
+            确定
+    </Button>
+        </AuthButton>
+        <Button style={{ marginLeft: 8 }} onClick={handleCancel}>
+          取消
+      </Button>
+      </Form.Item>
+    </Form>
+
+  }
+  const Formss = Form.create({ name: 'Forms' })(Forms);
 
 
 
   //重置搜索
   function handleReset () {
     props.form.resetFields();
+    gettaDrainage({ pageNum: 1, pageSize: 10 })
   }
 
-  
+
 
   function addshowModal (datas) {
 
     // alert(datas.drainageId)
-console.log(datas,'22222222')
+    console.log(datas, '22222222')
     setFormsDate({
-      drainageId:datas.drainageId,
-      name:datas.name,
-      endDate:datas.endDate,
+      drainageId: datas.drainageId,
+      name: datas.name,
+      endDate: datas.endDate,
     })
-    console.log(formsdate,'22222222')
+    console.log(formsdate, '22222222')
     setDate({
       visible: true,
+      title: "修改H5项目"
     });
+
+
+    console.log('form :', props.form)
+
+
   };
   function showModal () {
     setFormsDate({
-      drainageId:'',
-      name:'',
-      endDate:'',
+      drainageId: '',
+      name: '',
+      endDate: '',
     })
     setDate({
       visible: true,
+      title: '新建H5项目'
     });
   };
   const changePageNum = pageNumber => {
     gettaDrainage({ pageNum: pageNumber, pageSize: 10 })
-}
+  }
 
   function handleOk () {
 
@@ -280,7 +325,7 @@ console.log(datas,'22222222')
       visible: false,
     });
   };
-  function handleSubmit(e) {
+  function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log('values', values)
@@ -292,7 +337,7 @@ console.log(datas,'22222222')
   }
 
   const { getFieldDecorator } = props.form;
-  const { visible, confirmLoading, ModalText } = date;
+  const { visible, confirmLoading, ModalText, title } = date;
   return (
     <>
       <div>
@@ -315,7 +360,7 @@ console.log(datas,'22222222')
               />,
             )}
           </Form.Item>
-          <Form.Item>
+          <Form.Item >
             <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
               搜索
           </Button>
@@ -324,23 +369,24 @@ console.log(datas,'22222222')
             </Button>
           </Form.Item>
         </Form>
-        {/* <AuthButton name="admin.buildingDynamic.add.post" noRight={null}> */}
-        <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
-
+        <AuthButton name="admin.taDrainage.add.post" noRight={null}>
+          <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
+        </AuthButton>
         <Modal
-          title="新建H5项目"
+          title={title}
+
           visible={visible}
           //  onOk={handleOk}
           confirmLoading={confirmLoading}
           onCancel={handleCancel}
           footer={null}
         >
-          <Forms />
+          <Formss formsDate={formsdate} />
         </Modal>
-        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList"/>
+        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} />
-      </div>
+          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
+        </div>
       </div>
     </>
   )

src/pages/activity/editActivity.jsx

@@ -366,6 +366,7 @@ const Edit = props => {
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -140,7 +140,7 @@ const Edit = props => {
       submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
       if (groupActivityId) {
-        submitValue.groupActicityId = groupActivityId
+        submitValue.groupActivityId = groupActivityId
         request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
@@ -334,6 +334,7 @@ const Edit = props => {
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/activity/groupActivity/helpRecord.jsx

@@ -32,7 +32,6 @@ class InviteTable extends React.Component {
 
   componentDidUpdate (preProps, preState) {
     const { groupActivityId } = this.props.visibleData
-    console.log("groupActivityId",this.props.visibleData);
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -110,6 +109,7 @@ class InviteTable extends React.Component {
         dataIndex: 'createTime',
         key: 'createTime',
         align: 'center',
+        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
       },
     ]
     return (
@@ -123,7 +123,7 @@ class InviteTable extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <Button type="primary" onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          <Button type="primary" name="admin.taShareChildRecord.export.get" noRight={null} onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
             导出
           </Button>
 
@@ -143,7 +143,7 @@ class Verifier extends React.Component {
     super(props);
     this.state = {
       groupActivityId: { id: '' },
-      visibleData: { visible: false, groupActivityId: '' },
+      visibleData: { visible: false, groupActivityId: '', recordId: '' },
     }
   }
 
@@ -161,24 +161,19 @@ class Verifier extends React.Component {
   }
 
   // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
   handleOk () {
-    // this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
   handleCancel () {
-    // this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
-    // this.props.onCancel();
     this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
   }
 
    getVerCodeList (params) {
     request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
-      // eslint-disable-next-line no-undef
       message.info('核销成功')
+      this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
     }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
       <Alert
         style={{
           marginBottom: 24,
@@ -190,15 +185,14 @@ class Verifier extends React.Component {
     })
   }
 
-  // eslint-disable-next-line class-methods-use-this
   verify(e) {
-    this.setState({ visibleData: { visible: true, groupActivityId: this.props.visibleData.groupActivityId, verificationCode: e.target.value } })
+    this.setState({ visibleData: { visible: true, groupActivityId: this.props.visibleData.groupActivityId, verificationCode: e.target.value, recordId: this.state.visibleData.recordId } })
   }
 
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
-    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode })
-    this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
+    console.log("asdasdasdasd",this.state.visibleData);
+    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId})
   }
 
   render () {
@@ -213,8 +207,8 @@ class Verifier extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
+          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }} onClick={() => this.verification()}><span style={{color:'white'}}>立即核销</span></Button>
           </div>
         </Modal>
       </>
@@ -231,7 +225,7 @@ class Verifier extends React.Component {
 function body(props) {
   const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId : '', recordId:'',  groupStatus: ''})
 
-  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '' })
+  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: ''})
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
@@ -280,6 +274,7 @@ function body(props) {
     console.log(params);
     // 网路请求
     request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
+      console.log("process");
       setDataSource(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -295,7 +290,7 @@ function body(props) {
   }
 
   function displayNone() {
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false})
   }
 
   // 提交事件
@@ -306,7 +301,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        getList({ pageNum: 1, pageSize: 10, groupStatus, ...values })
+        getList({ pageNum: 1, pageSize: 10, groupStatus, ...values, groupActivityId })
       }
     });
   }
@@ -339,7 +334,7 @@ function body(props) {
 
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, groupStatus })
+    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId:groupActivityId })
   }
 
   function toCustomerDateil(record) {
@@ -381,17 +376,14 @@ function helpRecord(row) {
   // eslint-disable-next-line max-len
   setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId})
 }
- // 核销
+ // 打开核销
  function shareRecordVerify(row) {
-// 关闭助力记录弹框
-// eslint-disable-next-line max-len
-  setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0})
-  // eslint-disable-next-line max-len
+  setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId})
   setGInviteData({ visible: false, groupActivityId: row.groupActivityId})
  }
 
  function onSuccess(e) {
-  setVerifierData({ visible: false, groupActivityId: '', groupStatus: 0})
+  setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
   getList({ pageNumber: 1, pageSize: 10, ...e});
  }
 
@@ -403,25 +395,26 @@ function helpRecord(row) {
 
   const publicColumns = [
     {
-      title: '拼团者',
+      title: '开团者',
       dataIndex: 'nickname',
       key: 'nickname',
       align: 'center',
       width: '15%',
     },
     {
-      title: '拼团者手机号',
+      title: '开团者手机号',
       dataIndex: 'phone',
       key: 'phone',
       align: 'center',
       width: '10%',
     },
     {
-      title: '拼团时间',
+      title: '开团时间',
       dataIndex: 'createTime',
       key: 'createTime',
       align: 'center',
       width: '15%',
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
     },
     {
       title: '参团者',
@@ -429,7 +422,7 @@ function helpRecord(row) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.joinPeople}/{record.groupBuyPeople}</a>,
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
     },
   ]
 
@@ -440,24 +433,21 @@ function helpRecord(row) {
       key: 'nickname',
       align: 'center',
       width: '15%',
-      // render: (_, record) => <Avatar shape="square" src={groupStatus === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
-      title: '手机号',
+      title: '拼团者手机号',
       dataIndex: 'phone',
       key: 'phone',
       align: 'center',
       width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      // render: (_, record) => <><span>{groupStatus === 'helpSucceed' ? record.name : record.nickname}</span></>,
     },
     {
-      title: '发起时间',
+      title: '拼团时间',
       dataIndex: 'createTime',
       key: 'createTime',
       align: 'center',
       width: '10%',
-      // eslint-disable-next-line no-nested-ternary
+      render: (x, row) => <><span>{row.createTime ?`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
     },
     {
         title: '成团时间',
@@ -465,7 +455,7 @@ function helpRecord(row) {
         key: 'endTime',
         align: 'center',
         width: '10%',
-        // eslint-disable-next-line no-nested-ternary
+        render: (x, row) => <><span>{row.endTime ?`${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
     },
     {
       title: '核销状态',
@@ -488,7 +478,7 @@ function helpRecord(row) {
       render: (x, row) => (
         <>
           {row.verificationStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
+          <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
           </AuthButton>
         }
@@ -525,12 +515,12 @@ function helpRecord(row) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 
       <div style={{ margin: '20px 0' }}>
-        <AuthButton name="admin.customer.recommend.get" noRight={null}>
+        <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
           <Radio.Group value={groupStatus} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
             <Radio.Button value="0">拼团成功</Radio.Button>
             <Radio.Button value="1">进行中</Radio.Button>

src/pages/activity/groupActivity/list.jsx

@@ -14,25 +14,25 @@ const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-      console.log(params);
+    console.log(params);
     request({ ...apis.groupActivity.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到拼团活动新增
-const toEditActivity = (groupActivityId) => () => {
+
+  // 跳转到拼团活动新增
+  const toEditActivity = (groupActivityId) => () => {
     router.push({
       pathname: '/activity/groupActivity/editGroupActivity',
       query: {
@@ -40,14 +40,14 @@ const toEditActivity = (groupActivityId) => () => {
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
+
   const columns = [
     {
       title: '活动标题',
@@ -63,15 +63,15 @@ const toEditActivity = (groupActivityId) => () => {
       render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
     },
     {
-        title: '所需积分',
-        dataIndex: 'integral',
-        key: 'integral',
-        align: 'center',
-      },
+      title: '所需积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center',
+    },
     {
       title: '已参与人数',
-      dataIndex: 'joinPeople',
-      key: 'joinPeople',
+      dataIndex: 'participateNum',
+      key: 'participateNum',
       align: 'center',
     },
     {
@@ -79,7 +79,7 @@ const toEditActivity = (groupActivityId) => () => {
       dataIndex: 'groupBuyPeople',
       key: 'groupBuyPeople',
       align: 'center',
-    },  
+    },
     {
       title: '状态',
       dataIndex: 'activityStatus',
@@ -99,114 +99,129 @@ const toEditActivity = (groupActivityId) => () => {
       render: (x, row) => (
         <>
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
-        
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActicityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton> }
+            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
+          }
+          {row.activityStatus === 0 &&
+            <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            </AuthButton>
+          }
+          {row.activityStatus === 0 &&
+            <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>}
 
           {row.activityStatus === 1 &&
-           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActicityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton>
+            <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            </AuthButton>
+          }
+          {row.activityStatus === 1 &&
+            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            </AuthButton>
+          }
+          {row.activityStatus === 1 &&
+            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
           }
 
           {row.activityStatus === 2 &&
-        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActicityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton>
+            <AuthButton><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
+          }
+          {row.activityStatus === 2 &&
+            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
           }
         </>
       ),
     },
   ];
   const getSignList = groupActivityId => {
-      router.push({
-          pathname: '/activity/groupActivity/helpRecord',
-          query: {
-            groupActivityId,
-          },
-        });
+    router.push({
+      pathname: '/activity/groupActivity/helpRecord',
+      query: {
+        groupActivityId,
+      },
+    });
   }
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10 })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-  }
-  
-  //结束活动
-  const endGroupActivity = (row) => () => {
-      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActicityId} }).then((data) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
-      }).catch((err) => {
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+        }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
+        })
+      },
+    });
+  }
+
+  //结束活动
+  const endGroupActivity = (row) => () => {
+    request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
 
   //置顶
   const topGroupActivity = (row, weight) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, weight: weight } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, weight: weight } }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
     }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
+      console.log(err)
+      message.info(err.msg || err.message)
     })
   }
 
   //首页推荐
   const recommendGroupActivity = (row, code) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, sort: row.sort } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
     }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
+      console.log(err)
+      message.info(err.msg || err.message)
     })
   }
-    
+
   //发布活动
   const sendDynamic = (row) => {
-      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-      }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then((data) => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
-  
+
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -216,9 +231,10 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset () {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
 
@@ -259,16 +275,16 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+      <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -81,8 +81,13 @@ const header = props => {
         }
 
         // 判断助力人数不得超过200
-        if (values.helpNum > 200) {
-          message.error('限制助力人数不能超过200')
+        if (values.personNum > 200) {
+          message.error('助力邀请人数不能超过200')
+          return
+        }
+          // 助力邀请人数>0
+        if (values.personNum <= 0) {
+          message.error('助力邀请人数大于0')
           return
         }
 
@@ -92,10 +97,6 @@ const header = props => {
           message.error('限制助力次数必须大于0')
           return
         }
-        if (values.personNum <= 0) {
-          message.error('助力邀请人数大于0')
-          return
-        }
       }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime
@@ -453,6 +454,7 @@ const Edit = props => {
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -32,7 +32,6 @@ class InviteTable extends React.Component {
 
   componentDidUpdate (preProps, preState) {
     const { helpId } = this.state.visibleData
-
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -43,14 +42,19 @@ class InviteTable extends React.Component {
   // eslint-disable-next-line react/sort-comp
   handleOk () {
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel () {
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   getList (params) {
+    if (params.helpRecordInitiateId === '') {
+      return
+    }
     request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
@@ -68,7 +72,6 @@ class InviteTable extends React.Component {
 
   // eslint-disable-next-line class-methods-use-this
   exportHelp() {
-    console.log('this.state.25252464122', this.state.visibleData)
     request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
       .then(data => {
         if (!data) {
@@ -113,6 +116,7 @@ class InviteTable extends React.Component {
         dataIndex: 'createDate',
         key: 'createDate',
         align: 'center',
+        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
       },
     ]
     return (
@@ -124,10 +128,10 @@ class InviteTable extends React.Component {
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
 
-      <Button type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
           <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
@@ -167,12 +171,13 @@ class Verifier extends React.Component {
   // eslint-disable-next-line react/sort-comp
   handleOk () {
     this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-    
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    console.log('核销关闭');
+    // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    this.props.onCancel()
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -180,6 +185,7 @@ class Verifier extends React.Component {
     request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
       // eslint-disable-next-line no-undef
       message.info('核销成功')
+      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -201,7 +207,6 @@ class Verifier extends React.Component {
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
-    this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
   }
 
   render () {
@@ -214,10 +219,10 @@ class Verifier extends React.Component {
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
-          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={(e) => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
+          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
+           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
           </div>
         </Modal>
       </>
@@ -287,7 +292,7 @@ function body(props) {
 
   // 提交事件
   function handleSubmit(e) {
-    displayNone()
+    // displayNone()
 
 
     e.preventDefault();
@@ -314,7 +319,7 @@ function body(props) {
   function radioButtonHandleSizeChange(e) {
     setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
     setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
-    displayNone()
+    // displayNone()
 
     const { value } = e.target
     setCustomerType(value)
@@ -376,9 +381,18 @@ function helpRecord(row) {
  function onSuccess(e) {
    console.log('回调：', e)
    getList(e)
-     // 核销
-   setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+    
+   // 关闭
+   onCancel()
  }
+
+ function onCancel(e) {
+  // 核销
+  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+  // 助力者
+  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+ }
+
  // 返回到首页
  function returList(params) {
   router.push({
@@ -407,6 +421,7 @@ function helpRecord(row) {
       key: 'createDate',
       align: 'center',
       width: '15%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '助力者',
@@ -442,6 +457,7 @@ function helpRecord(row) {
       key: 'createDate',
       align: 'center',
       width: '10%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
       // eslint-disable-next-line no-nested-ternary
     },
     {
@@ -460,7 +476,7 @@ function helpRecord(row) {
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
       render: (text, records) => {
-        if (records.verificationStatus === 0) { return '未核销' }
+        if (records.verificationStatus === 0 || records.verificationStatus === null) { return '未核销' }
         if (records.verificationStatus === 1) { return '已核销' }
       },
     },
@@ -504,7 +520,7 @@ function helpRecord(row) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 
@@ -519,10 +535,10 @@ function helpRecord(row) {
       </div>
       {customerType === 'helpSucceed' ?
         <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+        <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
       }
-        <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
-       <InviteTable visibleData={gInviteData} />  
+        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
+       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
     </>
   );
 }

src/pages/activity/helpActivity/list.jsx

@@ -92,28 +92,37 @@ const toEditGoods = (helpActivityId) => () => {
       render: (x, row) => (
         <>
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
-        
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          <AuthButton name="admin.helpRecord.get">
+             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}}   className={styles.shoppingCart} /></span>
+          </AuthButton>}
+          {row.activityStatus === 0 &&
+          <AuthButton name="admin.top.update.post" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton> }
 
           {row.activityStatus === 1 &&
-           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                      {/* <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span> */}
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{color:'#bebebe'}} className={styles.edit} /></span>
+          </AuthButton>
+          }
+          {row.activityStatus === 1 &&
+           <AuthButton name="admin.top.update.post" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
             </AuthButton>
           }
 
           {row.activityStatus === 2 &&
-        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          <AuthButton name="admin.helpRecord.get" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}} className={styles.shoppingCart} /></span>
+          </AuthButton>
+          }
+           {row.activityStatus === 2 &&
+        <AuthButton name="admin.top.update.post" noRight={null}>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
         </AuthButton>
           }
         </>
@@ -138,7 +147,7 @@ const toEditGoods = (helpActivityId) => () => {
               request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10 })
+                  getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
               }).catch((err) => {
                   console.log(err)
                   message.info(err.msg || err.message)
@@ -152,7 +161,7 @@ const toEditGoods = (helpActivityId) => () => {
       request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
       }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
@@ -171,7 +180,7 @@ const toEditGoods = (helpActivityId) => () => {
   const cancelDynamic = (row) => {
       request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
       }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
@@ -182,7 +191,7 @@ const toEditGoods = (helpActivityId) => () => {
   const sendDynamic = (row) => {
       request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
       }).catch(err => {
           console.log(err)
           message.info(err.msg || err.message)
@@ -190,7 +199,7 @@ const toEditGoods = (helpActivityId) => () => {
   }
   
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -266,11 +275,11 @@ const handleSubmit = (e, props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+        <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/building/list/add/components/amap.jsx

@@ -4,23 +4,29 @@ import { Map, Marker } from 'react-amap';
 import styles from '../amap.less'
 
 class Amap extends React.Component {
+
   constructor(props) {
     super(props);
+    this.state = {
+      markerPosition: { longitude: 120, latitude: 35 },
+    }
     // 高德地图 Marker 实例
     this.markerInstance = undefined
     // 高德地图 Map 实例
     this.mapInstance = undefined
+
     this.amapEvents = {
       created: mapInstance => {
         console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
-        console.log(mapInstance.getZoom());
+        console.log('缩放级别：', mapInstance.getZoom());
         this.mapInstance = mapInstance
+        
 
         AMap.plugin(['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.CitySearch'], () => {
           // 实例化Autocomplete
           const autoOptions = {
             // city 限定城市，默认全国
-            city: '全国',
+            // city: '025',
             // input 为绑定输入提示功能的input的DOM ID
             input: 'amapInput',
           }
@@ -28,7 +34,7 @@ class Amap extends React.Component {
           // 无需再手动执行search方法，autoComplete会根据传入input对应的DOM动态触发search
 
           const placeSearch = new AMap.PlaceSearch({
-            city: '南京',
+            // city: '南京',
             map: mapInstance,
           })
 
@@ -54,6 +60,8 @@ class Amap extends React.Component {
                 // document.getElementById('info').innerHTML = '您当前所在城市：'+cityinfo;
                 // 地图显示当前城市
                 mapInstance.setBounds(citybounds);
+                // 需要在设置坐标成功后，重新设置 缩放级别
+                // mapInstance.setZoom(15)
               }
             }
           })
@@ -75,20 +83,31 @@ class Amap extends React.Component {
         this.markerInstance = markerInstance
       },
     }
-    this.markerPosition = { longitude: 120, latitude: 30 };
+    // this.markerPosition = { longitude: 120, latitude: 30 };
   }
 
-  render() {
+  componentDidUpdate(prevProps) {
     const { value } = this.props
-    if (value) {
-     // this.markerInstance.setPosition(value.split(','))
+    if (this.props.value !== prevProps.value) {
+      if (value) {
+        const temp = value.split(',')
+        this.setState({ markerPosition: { longitude: temp[1], latitude: temp[0] } }, () => {
+          if (this.mapInstance) {
+            // 需要在设置坐标成功后，重新设置 缩放级别
+            this.mapInstance.setZoom(15)
+          }
+        })
+      }
     }
+  }
 
+  render() {
     return (
       <>
         <div style={{ width: '100%', height: '400px', position: 'relative' }}>
-          <Map events={this.amapEvents} amapkey="f0d1d4f82432504003ebf46e5e36ff03">
-            <Marker position={this.markerPosition} events={this.markerEvents} />
+          {/* zoom={15} 设置后，无效，不知道什么原因，必须手动设置 */}
+          <Map plugins={['ToolBar']} events={this.amapEvents} amapkey="f0d1d4f82432504003ebf46e5e36ff03" center={this.state.markerPosition}>
+            <Marker position={this.state.markerPosition} events={this.markerEvents} />
           </Map>
           {
           <div className={styles.infoBox}>

src/pages/building/list/add/components/base.jsx

@@ -12,6 +12,7 @@ import TagGroup from './tags'
 import Amap from './amap'
 import BudildingProjectType from './buildingProjectType'
 import SelectCity from '../../../../../components/SelectButton/CitySelect'
+import FileUpload from '@/components/XForm/FileUpload';
 
 const { Option } = Select
 const { TabPane } = Tabs;
@@ -40,14 +41,15 @@ function openNotificationWithIcon(type, message) {
 function AddBuilding(props) {
   const { getFieldDecorator } = props.form;
 
+  console.log('props.building: ', props.building)
   if (props.building.buildingId !== undefined) {
     const { buildingId } = props.building
-    if (buildingId !== '') {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      useEffect(() => {
+     // eslint-disable-next-line react-hooks/rules-of-hooks
+     useEffect(() => {
+      if (buildingId !== '') {
         getById(buildingId)
-      }, [])
-    }
+      }
+    }, [])
   }
 
    // 获取详情信息
@@ -65,7 +67,13 @@ function AddBuilding(props) {
       }
 
       res.avatarImage = res.buildingImg.map(item => item.url)
+      res.listImage = res.buildingListImg.map(item => item.url)
+      res.mapCoordinate = res.coordinate
+      if (res.videoUrl) {
+        res.videoUrl = [].concat(res.videoUrl)
+      }
       props.form.setFieldsValue(res)
+      props.onSuccess(res)
     })
   }
 
@@ -83,40 +91,63 @@ function AddBuilding(props) {
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
+    // 列表图
+    data.listImg = data.listImage && data.listImage.map((item, index) => ({ imgType: 'list', url: item, orderNo: index + 1 }))
+    data.videoUrl = data.videoUrl[0]
     if (data.tag) {
       data.tag = data.tag.map((item, _) => ({ tagName: item }))
     }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
-    request({ ...api, data: { ...data } }).then(() => {
+    request({ ...api, data: { ...data } }).then(res => {
       openNotificationWithIcon('success', '操作成功')
       // router.go(-1)
+      getById(res.buildingId)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
   }
 
+  // 视频文件上传前 回调
+  function fileUploadBeforeUpload(file, fileList) {
+    console.log(file, fileList)
+    return new Promise((resolve, reject) => {
+      if (file.type === 'video/mp4' || file.type === '.mp4') {
+          resolve(file)
+      } else {
+        openNotificationWithIcon('error', '项目视频，仅支持MP4格式')
+        reject()
+      }
+    })
+  }
+
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
-          <Form.Item label="项目Id"  style={{ display: 'none' }}>
+          <Form.Item label="项目Id" style={{ display: 'none' }}>
             {getFieldDecorator('buildingId')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="楼盘编号" >
-            {getFieldDecorator('code')(<Input />)}
+            {getFieldDecorator('code', {
+              rules: [{ required: true, message: '请输入楼盘编号' }],
+            })(<Input />)}
           </Form.Item>
           <Form.Item label="楼盘名称" >
-            {getFieldDecorator('buildingName')(<Input />)}
+            {getFieldDecorator('buildingName', {
+              rules: [{ required: true, message: '请输入楼盘名' }],
+            })(<Input />)}
           </Form.Item>
-          <Form.Item label="别名" >
+          {/* <Form.Item label="别名" >
             {getFieldDecorator('name')(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="项目类型">
-            {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
+            {getFieldDecorator('buildingProjectType', {
+              rules: [{ required: true, message: '请选择项目类型' }],
+            })(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" >
             {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
           </Form.Item>
-          <Form.Item label="开盘时间"  >
+          <Form.Item label="开盘时间" >
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
           <Form.Item label="电话" >
@@ -142,7 +173,9 @@ function AddBuilding(props) {
             )}
           </Form.Item>
           <Form.Item label="销售状态" >
-            {getFieldDecorator('marketStatus')(
+            {getFieldDecorator('marketStatus', {
+              rules: [{ required: true, message: '请选择销售状态' }],
+            })(
               <Select placeholder="销售状态" style={{ width: '1016px' }}>
                 <Option value="待定">待定</Option>
                 <Option value="在售">在售</Option>
@@ -157,21 +190,35 @@ function AddBuilding(props) {
               </Select>,
             )}
           </Form.Item>
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：1920*1080，比例16:9">
+            {getFieldDecorator('videoUrl')(
+              <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频"/>,
+            )}
+          </Form.Item>
           <Form.Item label="项目主图" help="建议图片尺寸：640px*360px">
-            {getFieldDecorator('avatarImage')(
+            {getFieldDecorator('avatarImage', {
+              rules: [{ required: true, message: '请选择项目主图' }],
+            })(
               <ImageListUpload />,
             )}
           </Form.Item>
-          <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
+          <Form.Item label="列表图" help="建议图片尺寸：640px*360px">
+            {getFieldDecorator('listImage', {
+              rules: [{ required: true, message: '请选择列表图' }],
+            })(
+              <ImageListUpload />,
+            )}
+          </Form.Item>
+          {/* <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
             {getFieldDecorator('mapImg')(
               <ImageUpload />,
             )}
-          </Form.Item>
-          <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
+          </Form.Item> */}
+          {/* <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
             {getFieldDecorator('poster')(
               <ImageUpload />,
             )}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="排序" >
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
@@ -179,7 +226,9 @@ function AddBuilding(props) {
             {getFieldDecorator('discount')(<Input />)}
           </Form.Item>
           <Form.Item label="首页推荐" >
-            {getFieldDecorator('isMain')(
+            {getFieldDecorator('isMain',{
+              initialValue: 1,
+            })(
             <Radio.Group>
               <Radio value={1}>是</Radio>
               <Radio value={2}>否</Radio>
@@ -187,21 +236,41 @@ function AddBuilding(props) {
             )}
           </Form.Item>
           <Form.Item label="所在城市" >
-            {getFieldDecorator('cityId')(
+            {getFieldDecorator('cityId', {
+              rules: [{ required: true, message: '请选择城市' }],
+            })(
               <SelectCity />,
             )}
           </Form.Item>
           <Form.Item label="楼盘区域" >
-            {getFieldDecorator('buildingArea')(<Input />)}
+            {getFieldDecorator('buildingArea', {
+              rules: [{ required: true, message: '请输入楼盘区域' }],
+            })(<Input />)}
           </Form.Item>
           <Form.Item label="项目地址" >
-            {getFieldDecorator('address')(<Input />)}
+            {getFieldDecorator('address', {
+              rules: [{ required: true, message: '请输入项目地址' }],
+            })(<Input />)}
           </Form.Item>
           <Form.Item label="项目坐标" >
-            {getFieldDecorator('coordinate')(<Input disabled />)}
+            {getFieldDecorator('coordinate', {
+              rules: [{ required: true, message: '请输入项目坐标' }],
+            })(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" >
-            {getFieldDecorator('coordinate')(<Amap />)}
+            {getFieldDecorator('mapCoordinate')(<Amap onChange={e => props.form.setFieldsValue({ coordinate: e })}/>)}
+          </Form.Item>
+          <Form.Item label="周边设施搜索范围" style={{ width: '2000px' }}>
+            {getFieldDecorator('mapScope', {
+              rules: [{ required: true, message: '请选择周边设施搜索范围' }],
+            })(
+              <Select placeholder="请选择周边设施搜索范围" style={{ width: '970px' }}>
+                <Option value={1000}>1公里</Option>
+                <Option value={3000}>3公里</Option>
+                <Option value={5000}>5公里</Option>
+                <Option value={10000}>10公里</Option>
+              </Select>,
+            )}
           </Form.Item>
           <Form.Item label="周边交通" >
             {getFieldDecorator('buildingTransport')(

src/pages/building/list/add/components/buildingImage.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal, Layout } from 'antd';
+
+const { Header, Footer, Sider, Content } = Layout;
+
+function BuildingImageModel() {
+  return (
+    <>
+      <span>效果图（10）</span>
+      <Button type="link">重命名</Button>
+      <Button type="link">删除相册</Button>
+    </>
+  )
+}
+
+
+function buildingImage() {
+  return (
+    <>
+      <Button type="primary">新增</Button>
+      <Layout>
+        <Content><BuildingImageModel /></Content>
+        <Content><BuildingImageModel /></Content>
+        <Content><BuildingImageModel /></Content>
+      </Layout>
+    </>
+  )
+}
+
+export default buildingImage

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -61,7 +61,7 @@ class TypeForm extends React.Component {
           position: 'relative',
           border: '1px solid #eee',
           borderRadius: '4px',
-          marginTop:'16px'
+          marginTop: '16px',
         }}>
 
           <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
@@ -140,6 +140,7 @@ class ProjectTypeBody extends React.Component {
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })
+    this.setState({ defaultCheckboxValue: updateProjectDate.map(item => item.buildingTypeId) })
   }
 
   onClose = e => {
@@ -239,7 +240,7 @@ class ProjectTypeBody extends React.Component {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
         >
-          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
         </Modal>
         <Row type="flex" justify="space-between">
           {

src/pages/building/list/add/components/imageSet.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -7,6 +7,8 @@ import Styles from '../style.less';
 import { router } from 'umi';
 import ModalImage from './modalImage';
 
+const { confirm } = Modal;
+
 
 const saleType = [
   {
@@ -82,13 +84,22 @@ function imageSet(props) {
    * @param {*} record
    */
   function deleteApartment(record) {
-    // 网路请求
-    request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
-      getList()
-      openNotificationWithIcon('error', '操作成功')
-    }).catch(err => {
-      openNotificationWithIcon('error', err.message)
-    })
+    confirm({
+      title: '确认删除当前数据?',
+      content: '确定后成功删除，点击取消则放弃当前操作',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
+          getList()
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() {},
+    });
   }
 
 
@@ -98,12 +109,6 @@ function imageSet(props) {
       dataIndex: 'apartmentName',
       key: 'apartmentName',
     },
-    {
-      title: '类型',
-      dataIndex: 'apartmentType',
-      key: 'apartmentType',
-      render: (_, record) => <span>{ record.apartmentType === 'apart' ? '户型' : '相册' }</span>,
-    },
     {
       title: '销售状态',
       dataIndex: 'marketStatus',
@@ -111,9 +116,16 @@ function imageSet(props) {
       render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
     },
     {
-      title: '备注',
-      dataIndex: 'remark',
-      key: 'remark',
+      title: '面积',
+      dataIndex: 'buildingArea',
+      key: 'buildingArea',
+      render: (buildingArea, _) => <span>{ `${buildingArea}m²` }</span>,
+    },
+    {
+      title: '套内面积',
+      dataIndex: 'insideArea',
+      key: 'insideArea',
+      render: (insideArea, _) => <span>{ `${insideArea}m²` }</span>,
     },
     {
       title: '创建时间',
@@ -141,7 +153,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={1} onSuccess={() => onModalChange()}/>
+      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
     </>
   )
 }

src/pages/building/list/add/components/modalImage.jsx

@@ -30,7 +30,7 @@ const formItemLayout = {
 const saleType = [
   {
     id: 1,
-    name: '待定',
+    name: '待售',
   },
   {
     id: 2,
@@ -162,19 +162,18 @@ class ModalImage extends React.Component {
               <Form.Item label="编号" style={{ display: 'none' }}>
                   {getFieldDecorator('apartmentId')(<Input />)}
               </Form.Item>
-              <Form.Item label="名称">
-                {getFieldDecorator('apartmentName')(<Input />)}
-              </Form.Item>
-              <Form.Item label="类型">
-                {getFieldDecorator('apartmentType')(
-                  <Select placeholder="类型">
-                    <Option value="apart">户型</Option>
-                    <Option value="photo">相册</Option>
-                  </Select>,
-                )}
+              <Form.Item label="户型名称">
+                {getFieldDecorator('apartmentName', {
+                  rules: [
+                    { required: true, message: '请填写户型名称' },
+                    { max: 10, message: '户型名称不超过10个字符' },
+                  ],
+                })(<Input placeholder="户型名称不超过10个字符"/>)}
               </Form.Item>
               <Form.Item label="销售状态">
-                {getFieldDecorator('marketStatus')(
+                {getFieldDecorator('marketStatus', {
+                  rules: [{ required: true, message: '请选择销售状态' }],
+                })(
                   <Select placeholder="销售状态">
                     {
                       saleType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
@@ -183,26 +182,21 @@ class ModalImage extends React.Component {
                 )}
               </Form.Item>
               <Form.Item label="图片">
-              {getFieldDecorator('img')(
+              {getFieldDecorator('img', {
+                  rules: [{ required: true, message: '请上传户型图片' }],
+              })(
                 <ImageListUpload />,
               )}
               </Form.Item>
-              <Form.Item label="面积">
-                {getFieldDecorator('buildingArea')(<Input />)}
-              </Form.Item>
-              <Form.Item label="套内面积">
-                {getFieldDecorator('insideArea')(<Input />)}
-              </Form.Item>
-              <Form.Item label="户型总价">
-                {getFieldDecorator('apartmentPrice')(<Input />)}
-              </Form.Item>
-              <Form.Item label="户型简介">
-                {getFieldDecorator('apartmentDescription')(
-                  <Wangedit />,
-                )}
+              <Form.Item label="面积" help="单位 ㎡">
+                {getFieldDecorator('buildingArea', {
+                  rules: [{ required: true, message: '请填写面积' }],
+                })(<Input type="number" />)}
               </Form.Item>
-              <Form.Item label="备注">
-                {getFieldDecorator('remark')(<TextArea rows={10} />)}
+              <Form.Item label="套内面积" help="单位 ㎡">
+                {getFieldDecorator('insideArea', {
+                  rules: [{ required: true, message: '请填写套内面积' }],
+                })(<Input type="number" />)}
               </Form.Item>
               <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
                 <Button type="primary" htmlType="submit">保存</Button>

src/pages/building/list/add/components/poster.jsx

@@ -71,6 +71,11 @@ const Poster = props => {
 
   const submitPoster = () => {
     if (buildingId) {
+      if (!imgValue) {
+        message.error('请选择海报图片')
+        return
+      }
+
       if (posterId) {
         request({
           ...apis.activity.updatePoster,
@@ -136,7 +141,7 @@ const Poster = props => {
       </div>
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>

src/pages/building/list/add/components/share.jsx

@@ -87,6 +87,7 @@ const Share = props => {
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => router.go(-1)}>取消</Button>
   </div>

src/pages/building/list/add/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
 import moment from 'moment';
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
@@ -11,9 +11,10 @@ import ImageUpload from '../../../../components/XForm/ImageUpload'
 import Wangedit from '../../../../components/Wangedit/Wangedit'
 import TagGroup from './components/tags'
 import Base from './components/base'
-import ImageSet from './components/imageSet'
+import Apartment from './components/imageSet'
 import Poster from './components/poster'
 import Share from './components/share'
+import BuildingImage from './components/buildingImage';
 
 
 const { Option } = Select
@@ -30,37 +31,48 @@ const formItemLayout = {
   },
 };
 
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
 function AddBuilding(props) {
 
   const [tab, setTab] = useState('base')
+  const [buildingData, setBuildingData] = useState({ buildingId: undefined })
 
   function tabsCallback(e) {
     console.log(e);
-    setTab(e.target.value)
+    if (!buildingData.buildingId) {
+      openNotificationWithIcon('error', '请先保存基本信息')
+    } else {
+      setTab(e.target.value)
+    }
   }
 
-  // console.log(props.location)
+  // building 回调
+  function buildingOnSuccess(e) {
+    setBuildingData(e)
+  }
 
   return (
     <>
       <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <Radio.Button value="base">基本信息</Radio.Button>
-        {
-          props.location.query.id &&
-          (
-            <>
-              <Radio.Button value="image">户型库</Radio.Button>
-              <Radio.Button value="poster">海报图片</Radio.Button>
-              <Radio.Button value="share">分享设置</Radio.Button>
-            </>
-          )
-        }
+        <Radio.Button value="apartment">户型库</Radio.Button>
+        <Radio.Button value="image">项目相册</Radio.Button>
+        <Radio.Button value="poster">海报图片</Radio.Button>
+        <Radio.Button value="share">分享设置</Radio.Button>
       </Radio.Group>
       <div style={{ marginTop: '20px' }}>
-        { tab === 'base' && <Base building={{ buildingId: props.location.query && props.location.query.id }} /> }
-        { props.location.query.id && (tab === 'image' && <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />)}
-        { props.location.query.id && (tab === 'poster' && <Poster building={{ buildingId: props.location.query && props.location.query.id }} />)}
-        { props.location.query.id && (tab === 'share' && <Share building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { tab === 'base' && <Base building={{ buildingId: buildingData.buildingId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/> }
+        { (tab === 'apartment' && <Apartment building={buildingData} />)}
+        { (tab === 'image' && <BuildingImage building={buildingData} />)}
+        { (tab === 'poster' && <Poster building={buildingData} />)}
+        { (tab === 'share' && <Share building={buildingData} />)}
       </div>
     </>
     // <Tabs defaultActiveKey="1" onChange={tabsCallback}>

src/pages/building/list/index.jsx

@@ -31,7 +31,6 @@ function openNotificationWithIcon(type, message) {
 function CartBody(props) {
   const { data } = props
 
-
   function toEdi(record) {
     router.push({
       pathname: '/building/list/add',
@@ -87,7 +86,7 @@ function CartBody(props) {
           openNotificationWithIcon('success', '操作成功')
           props.onSuccess()
         }).catch(err => {
-          openNotificationWithIcon('error', err.message)
+          // openNotificationWithIcon('error', err.message)
         })
 
         modal.destroy();
@@ -98,11 +97,13 @@ function CartBody(props) {
     });
   }
 
+  const { buildingImg } = data
+  console.log("buildingImg: ", data.buildingImg, "data: ", data)
   return (
     <Card
       hoverable
       style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-      cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+      cover={<img alt="example" src={((data.buildingImg && data.buildingImg[0]) || {}).url} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
       bodyStyle={{ padding: '10px 20px' }}
     >
       <p className={Styles.cardText}>
@@ -117,12 +118,12 @@ function CartBody(props) {
       </p>
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘名称</span>
-        <span >：{data.name}</span>
+        <span >：{data.buildingName || data.name}</span>
       </p>
       <p className={Styles.cardItem}>
         <span className={Styles.title}>均价</span>
         <span >
-          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>元/m²
         </span>
       </p>
       <p className={Styles.cardItem}>
@@ -179,6 +180,7 @@ function body(props) {
     // 网路请求
     request({ ...apis.building.getList, params: { ...params } }).then(res => {
       setDataSource(res)
+      console.log("res:",res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -218,7 +220,7 @@ function body(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() })
   }
 
   function getDate(value, dateString) {
@@ -236,6 +238,7 @@ function body(props) {
    */
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 9 })
   }
 
 
@@ -267,15 +270,16 @@ function body(props) {
           {getFieldDecorator('buildingStatus')(
             <Select style={{ width: '180px' }} placeholder="楼盘状态" onChange={handleSelectChange}>
               <Option value="1">发布</Option>
-              <Option value="0">未发布</Option>
+              <Option value="2">未发布</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('marketStatus')(
             <Select style={{ width: '180px' }} placeholder="销售状态" onChange={handleSelectChange}>
-              <Option value="1">已销售</Option>
-              <Option value="0">未销售</Option>
+                <Option value="待定">待定</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售完">售完</Option>
             </Select>,
           )}
         </Form.Item>
@@ -288,7 +292,7 @@ function body(props) {
           {getFieldDecorator('isMain')(
             <Select style={{ width: '180px' }} placeholder="首页推荐" onChange={handleSelectChange}>
               <Option value="1">首页推荐</Option>
-              <Option value="0">首页未推荐</Option>
+              <Option value="2">首页未推荐</Option>
             </Select>,
           )}
         </Form.Item>
@@ -320,7 +324,7 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
       </div>
     </>
   );

src/pages/building/type/edi.jsx

@@ -59,8 +59,7 @@ function body(props) {
       openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('error', err)
+      
     })
   }
 
@@ -76,6 +75,8 @@ function body(props) {
         // eslint-disable-next-line no-unused-expressions
         openNotificationWithIcon('success', '操作成功')
         router.go(-1)
+      }).catch(err => {
+        
       })
     }
 

src/pages/building/type/index.jsx

@@ -15,8 +15,9 @@ function body() {
   const columns = [
     {
       title: '编号',
-      dataIndex: 'buildingTypeId',
-      key: 'buildingTypeId',
+      dataIndex: 'index',
+      key: 'index',
+      render: (text, record, index) => <span>{index + 1}</span>,
     },
     {
       title: '类型名称',
@@ -42,6 +43,12 @@ function body() {
             删除
             <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </Button>
+          <Button type="link" style={{
+            color: '#FF4A4A', right: '0',
+          }} onClick={() => toEdi(record.buildingTypeId)}>
+            编辑
+            <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+          </Button>
         </span>
       ),
     },
@@ -65,7 +72,7 @@ function body() {
       setData(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('error', err)
+      // openNotificationWithIcon('error', err)
     })
   }
 
@@ -84,7 +91,7 @@ function body() {
     }).then(() => {
       openNotificationWithIcon('success', '操作成功')
     }).catch(err => {
-      //openNotificationWithIcon('error', err.message)
+      // openNotificationWithIcon('error', err.message)
     })
   }
 
@@ -106,7 +113,7 @@ function body() {
       <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/SelectActivity.jsx

@@ -56,7 +56,14 @@ export default (props) => {
         }}
         onCancel={() => setVisible(false)}
       >
-        <Select defaultValue={chooseVal} onChange={handleChange} style={{ width: '90%' }}>
+        <Select
+        showSearch
+        filterOption={(input, option) =>
+          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+        defaultValue={chooseVal} 
+        onChange={handleChange} 
+        style={{ width: '90%' }}>
           {
             list.map(x => (<Select.Option key={x.dynamicId} value={x.dynamicId}>{x.title}</Select.Option>))
           }

src/pages/carouselFigure/SelectGroup.jsx

@@ -0,0 +1,74 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+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,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+      onChange(val)
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择拼团"
+        visible={visible}
+        onOk={() => {
+          updateGroup(value)
+          onChange(value)
+          setVisible(false)
+        }}
+        onCancel={() => setVisible(false)}
+      >
+        <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.groupActivityId} value={x.groupActivityId}>{x.activityName}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectHelp.jsx

@@ -0,0 +1,76 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+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,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateHelp(value ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== help.helpId) {
+    updateHelp(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{help.helpName}</div>
+      <Modal
+        title="请选择助力"
+        visible={visible}
+        onOk={() => {
+          updateHelp(value)
+          onChange(value)
+          setVisible(false)
+        }}
+        onCancel={() => setVisible(false)}
+      >
+        <Select
+          placeholder="请选择助力"
+          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.helpActivityId} value={x.helpActivityId}>{x.title}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectNews.jsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import{ Select, Modal } from 'antd';
+import { Select, Modal } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getNewsList = fetch(apis.news.getList)
 
-export default (props) => {
+export default props => {
   const {
     value,
     onChange,
@@ -13,21 +13,21 @@ export default (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 [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,
-      }
-    }).then((data) => {
-      setList(data.list || [])
+      },
+    }).then(data => {
+      setList(data.records || [])
 
       updateNews(buildingId ? undefined : value);
     })
@@ -37,10 +37,11 @@ export default (props) => {
     updateNews(value);
   }
 
-  let chooseVal = value
-
-  const handleChange = val => chooseVal = val
+  const handleChange = val => {
+    onChange(val)
+  }
 
+  console.log(value, typeof value)
   return (
     <div>
       <div onClick={() => setVisible(true)}>{news.newsName}</div>
@@ -48,13 +49,21 @@ export default (props) => {
         title="请选择资讯"
         visible={visible}
         onOk={() => {
-          updateNews(chooseVal)
-          onChange(chooseVal)
+          updateNews(value)
+          onChange(value)
           setVisible(false)
         }}
         onCancel={() => setVisible(false)}
       >
-        <Select defaultValue={chooseVal} onChange={handleChange} style={{ width: '90%' }}>
+        <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.newsId} value={x.newsId}>{x.newsName}</Select.Option>))
           }

src/pages/carouselFigure/advertisingList.jsx

@@ -53,15 +53,15 @@ const toEdit = (contentId) => () => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
-    },
-    {
-      title: '发布位置',
-      dataIndex: 'showPosition',
-      key: 'showPosition',
-      align: 'center',
-      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
     },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',
@@ -220,7 +220,7 @@ const handleSubmit = (e, props) => {
       </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={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/carouselFigureList.jsx

@@ -53,7 +53,7 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
     },
     {
       title: '发布位置',
@@ -185,14 +185,14 @@ const handleSubmit = (e, props) => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="other">其他</Option>
+              {/* <Option value="other">其他</Option> */}
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
-              <Option value="mall">商城</Option>
+              <Option value="mall">积分商城</Option>
               <Option value="index">首页</Option>
             </Select>,
           )}
@@ -219,7 +219,7 @@ const handleSubmit = (e, props) => {
       </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} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/editAdvertising.jsx

@@ -11,6 +11,8 @@ 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';
 
 /**
  *
@@ -22,12 +24,17 @@ import request from '../../utils/request'
   let contentVisible = false
   let activityVisible = false
   let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
   let buildingId = ''
 
   const setExtraData = (data) => {
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
     buildingId = data.buildingId
   }
   
@@ -87,7 +94,7 @@ import request from '../../utils/request'
         name: 'contentType',
         type: FieldTypes.Select,
         dict: [{
-          label: '活动',
+          label: '常规活动',
           value: 'activity'
         },
         {
@@ -101,6 +108,14 @@ import request from '../../utils/request'
         {
           label: '其他',
           value: 'other'
+        },
+        {
+          label: '拼团',
+          value: 'group'
+        },
+        {
+          label: '助力',
+          value: 'help'
         }],
         value: data.contentType,
       },
@@ -125,6 +140,20 @@ import request from '../../utils/request'
         value: data.content,
         hidden: () => !contentVisible,
       },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+      },
       {
         label: '状态',
         name: 'status',

src/pages/carouselFigure/editCarousel.jsx

@@ -1,14 +1,18 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+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 styles from '../style/GoodsList.less';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../components/XForm';
+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 SelectNews from './SelectNews';
+import SelectActivity from './SelectActivity';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -17,130 +21,195 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ tab, changeTab ] = useState('basic')
-  const contentId = props.location.query.contentId
-  const [ data, setData ] = useState({})
-  if(contentId){
-    useEffect(() => {
-      getDetail(contentId);
-    },[])
+ const Edit = props => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let buildingId = ''
 
-  // 查询列表
-  const getDetail = (contentId) => {
-    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
+  const setExtraData = data => {
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
+    buildingId = data.buildingId
   }
 
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/carouselFigure/carouselFigureList',
-    });
+    
+  const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
   }
- 
-    const fields = [
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: data.buildingId,
-      },
-      {
-        label: '商品图片',
-        name: 'image',
-        type: FieldTypes.ImageUploader,
-        value: data.image,
-        help: '建议图片尺寸：640px*330px',
-      },
-      {
-        label: '标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: data.title,
-      },
-      {
-        label: '发布位置',
-        name: 'showPosition',
-        type: FieldTypes.Select,
-        dict: [{
-          label: '首页',
-          value: 'index'
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+
+    const [tab, changeTab] = useState('basic')
+    const { contentId } = props.location.query
+    const [data, setData] = useState({})
+    if (contentId) {
+      // 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)
+          setExtraData(data)
+          setData(data)
+      })
+    }
+    }
+
+    const cancelPage = () => {
+      router.push({
+        pathname: '/carouselFigure/carouselFigureList',
+      });
+    }
+
+      const fields = [
+        {
+          label: '所属项目',
+          name: 'buildingId',
+          render: <BuildSelect />,
+          value: data.buildingId,
         },
         {
-          label: '商城',
-          value: 'mall'
-        }],
-        value: data.showPosition,
-      },
-      {
-        label: '类型',
-        name: 'contentType',
-        type: FieldTypes.Select,
-        dict: [{
-          label: '活动',
-          value: 'activity'
+          label: '商品图片',
+          name: 'image',
+          type: FieldTypes.ImageUploader,
+          value: data.image,
+          help: '建议图片尺寸：640px*330px',
         },
         {
-          label: '项目',
-          value: 'project'
+          label: '标题',
+          name: 'title',
+          type: FieldTypes.Text,
+          value: data.title,
         },
         {
-          label: '资讯',
-          value: 'news'
+          label: '发布位置',
+          name: 'showPosition',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '积分商城',
+            value: 'mall',
+          }],
+          value: data.showPosition,
         },
         {
-          label: '其他',
-          value: 'other'
-        }],
-        value: data.contentType,
-      },
-      {
-        label: '发布内容',
-        name: 'content',
-        render: <Wangedit />,
-        value: data.content,
-      },
-      {
-        label: '状态',
-        name: 'status',
-        type: FieldTypes.Select,
-        dict: [{
-          label: "启用",
-          value: 1
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '常规活动',
+            value: 'activity',
+          },
+          {
+            label: '项目',
+            value: 'project',
+          },
+          {
+            label: '资讯',
+            value: 'news',
+          },
+          // {
+          //   label: '其他',
+          //   value: 'other',
+          // },
+          {
+            label: '拼团',
+            value: 'group',
+          },
+          {
+            label: '助力',
+            value: 'help',
+          }],
+          value: data.contentType,
         },
         {
-          label: "停用",
-          value: 0
-        },],
-        value: data.status != null ? data.status : 1,
-      },
-    ]
-  
-    const handleSubmit = val => { 
-      val.showType = 'banner'
-      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)
-        })
+          label: '发布活动',
+          name: 'targetId',
+          render: <SelectActivity buildingId={() => buildingId} />,
+          hidden: () => !activityVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布资讯',
+          name: 'targetId',
+          render: <SelectNews buildingId={() => buildingId} />,
+          hidden: () => !newsVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布内容',
+          name: 'content',
+          render: <Wangedit />,
+          value: data.content,
+          hidden: () => !contentVisible,
+        },
+        {
+          label: '发布助力',
+          name: 'targetId',
+          render: <SelectHelp buildingId={() => buildingId} />,
+          hidden: () => !helpVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布拼团',
+          name: 'targetId',
+          render: <SelectGroup buildingId={() => buildingId} />,
+          hidden: () => !groupVisible,
+          value: data.targetId,
+        },
+        {
+          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 = 'banner'
+        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>
-  );
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    );
+  }
  }
 
 
-
-export default Edit
+export default Edit()

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

@@ -21,19 +21,19 @@ class ModalAttribution extends React.Component {
     super(props);
     this.state = {
        dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '', buildingId: '' },
     }
   }
 
   // 挂载之后
   componentDidMount() {
-    this.getList({ pageNumber: 1, pageSize: 5 })
+    // this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData.realtyConsultant)
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.getList({ pageNumber: 1, pageSize: 5 })
+    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 });
     }
   }
@@ -41,28 +41,25 @@ class ModalAttribution extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   getList(params) {
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
     // 网路请求
-    request({ ...apis.customer.consultant, params: { ...params } }).then(res => {
+    request({ ...apis.customer.buildingConsultant, 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
-      />
+      
     })
   }
 
@@ -76,13 +73,13 @@ class ModalAttribution extends React.Component {
 
    // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5 })
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
   }
 
   // 提交
   submitGm(record) {
     // 网路请求
-    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.userId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()
@@ -96,13 +93,13 @@ class ModalAttribution extends React.Component {
     const columns = [
       // {
       //   title: '编号',
-      //   dataIndex: 'personId',
-      //   key: 'personId',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
       // },
       {
         title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'userName',
+        key: 'userName',
       },
       {
         title: '电话',
@@ -116,15 +113,15 @@ class ModalAttribution extends React.Component {
       },
       {
         title: '岗位',
-        dataIndex: 'post',
-        key: 'post',
+        dataIndex: 'position',
+        key: 'position',
       },
       {
         title: '操作',
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{ this.props.visibleData.realtyConsultant !== record.personId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant != record.userId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
       },
     ]
     return (

src/pages/customer/customerlist/customerDetail.jsx

@@ -16,6 +16,7 @@ function header(props) {
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([{ visitRecords: [] }])
+  const [dataConsultant, setDataonsultant] = useState({})
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -31,6 +32,7 @@ function header(props) {
 
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
       setData(res)
+      setDataonsultant(res.geoInfo)
     })
   }
 
@@ -59,6 +61,7 @@ function header(props) {
   return (
     <>
       <div className={styles.cardBox}>
+     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={styles.leftBox}>
           <p className={styles.tit}>置业顾问信息</p>
           <img className={styles.touxiang} src={ data.consultant && data.consultant.picture } />
@@ -88,9 +91,9 @@ function header(props) {
           <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
           <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p>
           <div className={styles.rightInfo}>
-            <p className={styles.rightItem}>国家：{ data.country }</p>
-            <p className={styles.rightItem}>省份：{ data.province }</p>
-            <p className={styles.rightItem}>城市：{data.city }</p>
+            <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}>详细信息：</p>
             <p className={styles.rightItem}>意向项目：{data.intention }</p>
             <p className={styles.rightItem}>价格区间：{data.priceRange }</p>

src/pages/customer/customerlist/index.jsx

@@ -37,7 +37,7 @@ function body(props) {
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
   // 调整归属 ============= end
 
   // 积分记录 ============  start
@@ -123,20 +123,20 @@ function body(props) {
   // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
 
   function showGM(record) {
-    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
+    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant, buildingId: record.buildingId })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
     setRecordVisibleData({ visible: true, customerId: record.customerId })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
     setRecordVisibleData({ visible: false, customerId: '' })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
   function toCustomerDateil(record) {
@@ -171,6 +171,12 @@ function body(props) {
     link.click()
   }
 
+  // 关闭调整归属的窗口
+  function closeAttribution() {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
+  }
+
   const publicColumns = [
     {
       title: '头像',
@@ -374,7 +380,7 @@ function body(props) {
       }
       
       {/* 调整归属 */}
-      <Attribution visibleData={gVisibleData} />
+      <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()}/>
 
       {/* 积分记录 */}
       <IntegralRecord visibleData={recordVisibleData} />

src/pages/customer/independentList/index.jsx

@@ -112,13 +112,15 @@ class ModalTable extends React.Component {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-          if (records.status === 1) { return '报备' }
+          console.log("retrun", records)
+          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
           if (records.verifyStatus === 1) { return '待审核' }
           if (records.verifyStatus === 2) { return '审核同意' }
           if (records.verifyStatus === 3) { return '签约' }
+          // reportRecommendStatus
         },
       },
     ]
@@ -155,13 +157,13 @@ class InviteTable extends React.Component {
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
-    this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
+    
   }
 
   componentDidUpdate (preProps, preState) {
-    const { customerId } = this.state.visibleData
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+    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 });
     }
@@ -170,31 +172,27 @@ class InviteTable extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ dataSource: { records: [] } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ dataSource: { records: [] } })
+    this.props.onCancel()
   }
 
   getList (params) {
-    const { customerId } = this.props.visibleData
-    if (customerId === '' || customerId === undefined) {
+    const { id } = params
+    console.log(id)
+    if (id === '' || id === undefined) {
       return
     }
     request({ ...apis.customer.InviteClientsList, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+    
     })
   }
 
@@ -214,15 +212,15 @@ class InviteTable extends React.Component {
       },
       {
         title: '用户姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'nickname',
+        key: 'nickname',
         align: 'center',
         render: text => <a>{text}</a>,
       },
       {
         title: '电话',
-        dataIndex: 'tel',
-        key: 'tel',
+        dataIndex: 'phone',
+        key: 'phone',
         align: 'center',
       },
       {
@@ -236,7 +234,7 @@ class InviteTable extends React.Component {
     return (
       <>
         <Modal
-          title="推荐客户"
+          title="邀请经纪人"
           destroyOnClose="true"
           width={900}
           footer={null}
@@ -388,12 +386,13 @@ function body (props) {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{record.channelName !== null ? '渠道经纪人' : '独立经纪人'}</span></>,
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? '渠道经纪人' : '独立经纪人'}</span></>,
     },
     {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? record.channelName : ''}</span></>,
     },
     {
       title: '操作',
@@ -450,9 +449,11 @@ function body (props) {
         导出
       </Button>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
-      {/* 调整归属 */}
+      {/* 推荐客户 */}
       <ModalTable visibleData={gVisibleData} />
-      <InviteTable visibleData={gInviteData} />
+
+      {/* 邀请经纪人 */}
+      <InviteTable visibleData={gInviteData} onCancel={() => setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })} />
     </>
   );
 }

src/pages/customer/recommendCustomer/audit.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, Upload, message } from 'antd';
+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';
@@ -7,6 +7,8 @@ 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;
@@ -24,9 +26,20 @@ const tailFormItemLayout = {
   },
 };
 
+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: '' })
 
@@ -49,27 +62,13 @@ function body(props) {
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
-    request({ ...apis.customer.auto, urlData: { id: params.customerId }, params: { verifyStatus: params.verifyStatus } }).then(() => {
+    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
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message="操作成功"
-        type="success"
-        showIcon
-      />
+      openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+
     })
   }
 
@@ -89,6 +88,22 @@ function body(props) {
     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' }}>
@@ -99,6 +114,20 @@ function body(props) {
             />,
           )}
         </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
@@ -159,7 +188,7 @@ function body(props) {
             <DatePicker showTime placeholder="报备日期" />,
           )}
         </Form.Item>
-        <Form.Item label="状态">
+        {/* <Form.Item label="状态">
           {getFieldDecorator('verifyStatus')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
               <Option value={0}>未通过</Option>
@@ -167,27 +196,30 @@ function body(props) {
               <Option value={2}>已驳回</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="归属置业顾问">
             <Row gutter={8}>
               <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="归属置业顾问" />)}
+                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
               </Col>
               <Col span={12}>
-                <Button>选择</Button>
+                <Button onClick={() => showConsultant()}>选择</Button>
               </Col>
             </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            确定
+          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+            审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>
-            取消
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            驳回
           </Button>
         </Form.Item>
       </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
     </>
   );
 }

src/pages/customer/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={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/recommendCustomer/index.jsx

@@ -160,7 +160,7 @@ function body(props) {
       title: '状态',
       dataIndex: 'verifyStatus',
       key: 'verifyStatus',
-      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
+      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '待审核': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
     },
     {
       title: '操作',
@@ -170,7 +170,7 @@ function body(props) {
         <>
           {
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
-              {record.verifyStatus === null ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           }
         </>

src/pages/customer/report/index.jsx

@@ -75,10 +75,11 @@ function body(props) {
     */
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 9 })
   }
 
   function exportReport() {
-    request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+    request({ ...apis.customer.customerRecommendReportExport, params: { ...props.form.getFieldsValue() }, responseType: 'blob' })
       .then(response => {
         download(response)
       })
@@ -123,8 +124,8 @@ function body(props) {
     },
     {
       title: '意向项目',
-      dataIndex: 'intention',
-      key: 'intention',
+      dataIndex: 'intentionName',
+      key: 'intentionName',
     },
     {
       title: '置业顾问',

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -272,7 +272,7 @@ const UserBehavior = props => {
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} one="true"></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

src/pages/indexEcharts/index.jsx

@@ -15,11 +15,19 @@ import IntentionalCustomers from './components/IntentionalCustomers'
 import styles from './styles.less'
 import moment from 'moment';
 import CityNums from '../charts/CityNums';
-const indexEcharts = (props) => {
+const indexEcharts = props => {
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [checkData, setCheckData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    setCheckData(props.checkData)
+  }, [props.checkData]);
 
   const endDate = new Date()
 
-  //为了观察数据先设30天
+  // 为了观察数据先设30天
   const startDate = moment().subtract(7, 'day').toDate()
 
   function onTabledatas (e) {
@@ -29,37 +37,54 @@ const indexEcharts = (props) => {
   return (
 
     <>
-      <div style={{ display: 'flex',width:'100%' }}>
-        <div className={styles.bar}>
-          <UserSource endDate={endDate}  startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
+      <div style={{ display: 'flex', width: '100%' }}>
+        {checkData.includes('user_source') &&
+          <div className={styles.bar}>
+            <UserSource endDate={endDate} startDate={startDate} onSuccess={e => onTabledatas(e)}></UserSource>
+          </div>
+        }
+        {checkData.includes('user_source') &&
+          <div className={styles.pie}>
+            <UserSourcepie endDate={endDate} startDate={startDate}></UserSourcepie>
+          </div>
+        }
+      </div>
+      {checkData.includes('urban_distribution') &&
+        <div>
+          <CityNums></CityNums>
         </div>
-        <div className={styles.pie}>
-          <UserSourcepie endDate={endDate} startDate={startDate}></UserSourcepie>
+      }
+      {checkData.includes('user_behavior') &&
+        <div className={styles.behavior}>
+          <UserBehavior tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehavior>
         </div>
-      </div>
-      <div>
-      <CityNums></CityNums>
-      </div>
-      <div className={styles.behavior}>
-        <UserBehavior tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehavior>
-      </div>
+      }
       <div style={{ display: 'flex' }}>
-        <div className={styles.bar}>
-
-          <UserActive ></UserActive>
-        </div>
-        <div className={styles.pie}><UserSex></UserSex> </div>
+        {checkData.includes('active_users') &&
+          <div className={styles.bar}>
+            <UserActive ></UserActive>
+          </div>
+        }
+        {checkData.includes('sex_ratio') &&
+          <div className={styles.pie}><UserSex></UserSex> </div>
+        }
       </div>
       <div style={{ display: 'flex' }}>
-        <div className={styles.bar}>
-          <NewUsers endDate={endDate} startDate={startDate} dataZoom={false}></NewUsers>
-        </div>
-        <div className={styles.pie}><UserConversion></UserConversion> </div>
+        {checkData.includes('number_of_new_users') &&
+          <div className={styles.bar}>
+            <NewUsers endDate={endDate} startDate={startDate} dataZoom={false}></NewUsers>
+          </div>
+        }
+        {checkData.includes('conversion_rate') &&
+          <div className={styles.pie}><UserConversion></UserConversion> </div>
+        }
       </div >
 
-      <div className={styles.customers}>
-        <IntentionalCustomers></IntentionalCustomers>
-      </div>
+      {checkData.includes('intentional_user') &&
+        <div className={styles.customers}>
+          <IntentionalCustomers></IntentionalCustomers>
+        </div>
+      }
     </>
   )
 }

src/pages/indexEcharts/userBehavior.jsx

@@ -1,12 +1,13 @@
 import React, { Component, useState, useEffect } from 'react';
-import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table } from 'antd';
-import { Row, Col, Menu, Dropdown } from 'antd';
-import UserBehavior from './components/UserBehavior'
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table , Row, Col, Menu, Dropdown } from 'antd';
+
 import moment from 'moment';
+import UserBehavior from './components/UserBehavior'
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
 
 // const formatDate = (start, end) => {
 //   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
@@ -16,77 +17,73 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 const { Option } = Select;
 
 const header = props => {
-
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [tableData, setTableData] = useState({ records: [] })
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [endDate, setEndDate] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [startDate, setStartDate] = useState({})
-  let daterange = []
+  const daterange = []
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-
+    window.scrollTo(0, 0)
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
     getBizEventType()
     getBizEventList()
     getProperties()
-  
-    
+    props.form.setFieldsValue({ radioGroup: 'a' })
   }, [])
- 
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [eventypes, setEventTypes] = useState([])
   function getBizEventType(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.dict,
-    }).then((data) => {
-      setEventTypes(data.records)
-
+    }).then(data => {
+      const eventType = ['agent', 'main']
+      setEventTypes(data.records.filter(item => !eventType.includes(item.typeId)))
     })
   }
   const [eventList, setEventList] = useState([])
   function getBizEventList(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.list,
-    }).then((data) => {
+    }).then(data => {
       setEventList(data.records)
-      
     })
   }
   const [properties, setProperties] = useState([])
   function getProperties(row) {
-
     request({
       ...apis.indexEcharts.bizEvent.properties,
-    }).then((data) => {
-
+    }).then(data => {
       setProperties(data.records)
-
     })
   }
 
   const { RangePicker } = DatePicker;
 
-  function onChangetime(dates, dateStrings) {
-
-    daterange[1] = dateStrings[1]
-    daterange[0] = dateStrings[0]
 
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        const { rangePicker } = values
+        console.log('Received values of form: ', values.rangePicker);
+        setEndDate(rangePicker[1])
+        setStartDate(rangePicker[0])
+      }
+    });
   }
 
-  const getDataOf = (days) => () => {
-
+  const getDataOf = days => () => {
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
   }
 
-  function datalist() {
-
-    setEndDate(daterange[1])
-    setStartDate(daterange[0])
-
-  }
 
   function redata(e) {
     console.log('行为回调数据：', e)
@@ -109,6 +106,12 @@ const header = props => {
     setBuildingId(value)
   }
 
+  // 重置
+  function resetQuery() {
+    props.form.resetFields()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -144,52 +147,80 @@ const header = props => {
 
   const dataSource = []
 
-  return (<>
+  const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
+  return (
+  <>
     <div>
       <div>
-        <Radio.Group buttonStyle="solid" defaultValue="a">
-          <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-          <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-        </Radio.Group>
-        <RangePicker
-          style={{ paddingLeft: '30px', width: '400px' }}
-          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}
-        />
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
-          搜索
-      </Button>
-      </div>
-
-      <div style={{ display: 'flex', margin: '24px 0' }}>
-        <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-       
-        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
-          {eventypes.map(type => (
-            <Option key={type.typeId}>{type.typeName}</Option>
-          ))}
-      </Select>
-        <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
-          {eventList.map(event => (
-            <Option key={event.eventId}>{event.eventName}</Option>
-          ))}
-      </Select>
-        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
-          {properties.map(property => (
-            <Option key={property.propertyId}>{property.propertyName}</Option>
-          ))}
-      </Select>
-     
+        <Form layout="inline" onSubmit={handleSubmit}>
+          <Form.Item>
+            {getFieldDecorator('radioGroup')(
+              <Radio.Group buttonStyle="solid">
+                <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+                <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+              </Radio.Group>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('rangePicker')(
+              <RangePicker
+                style={{ paddingLeft: '30px', width: '400px' }}
+                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
+              />,
+            )}
+          </Form.Item>
+
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
+              搜索
+            </Button>
+            <Button style={{ marginLeft: '30px', float: 'right' }} onClick={resetQuery}>
+              重置
+            </Button>
+
+          <div style={{ display: 'flex', margin: '24px 0' }}>
+            <Form.Item>
+              {getFieldDecorator('buildingId')(
+                <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleType')(
+                <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+                    {eventypes.map(type => (
+                      <Option key={type.typeId}>{type.typeName}</Option>
+                    ))}
+                </Select>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleEvent')(
+                 <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+                      {eventList.map(event => (
+                        <Option key={event.eventId}>{event.eventName}</Option>
+                      ))}
+                  </Select>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('handleProperty')(
+                 <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+                    {properties.map(property => (
+                      <Option key={property.propertyId}>{property.propertyName}</Option>
+                    ))}
+                </Select>,
+              )}
+            </Form.Item>
+          </div>
+        </Form>
       </div>
 
-
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior tableShow={true} BuildSelectHide={true} buildingId={buildingId} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+       <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
       </div>
 
       {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
@@ -197,4 +228,6 @@ const header = props => {
   </>
   )
 }
-export default header
+
+const WrappedHorizontalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedHorizontalLoginForm

src/pages/indexEcharts/userSource.jsx

@@ -96,7 +96,11 @@ class Header extends React.Component {
   }
 
   datalist = () => {
-    this.setState({ endDate: daterange[1], startDate: daterange[0] })
+    console.log()
+    this.setState({ 
+      endDate: daterange[1] === '' ? new Date() : daterange[1],
+      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
+    })
   }
 
   onSuccess = e => {

src/pages/integralMall/GoodsList.jsx

@@ -43,6 +43,7 @@ function header(props) {
 
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 });
   }
 
   // 跳转到编辑商品
@@ -64,7 +65,7 @@ function header(props) {
       onOk() {
         request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
         })
       }
     });
@@ -201,7 +202,7 @@ function header(props) {
       </AuthButton>
       <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/achieve.jsx

@@ -129,28 +129,28 @@ const columns = [
         <TabPane tab="平台积分" key="platform">
           <Table rowKey="achieve" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
         </TabPane>
-        <TabPane tab="项目积分" key="project">
-        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-            <Form.Item>
-              {getFieldDecorator('buildingId')(
-                <BuildSelect />,
-              )}
-            </Form.Item>
-             
-            <Form.Item>
-              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-                搜索
-              </Button>
-            </Form.Item>
+        {/* <TabPane tab="项目积分" key="project">
+          <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect />,
+                )}
+              </Form.Item>
+              
+              <Form.Item>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                  搜索
+                </Button>
+              </Form.Item>
           </Form>
           <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
-        </TabPane>
+        </TabPane> */}
       </Tabs>,
     </>
   )

src/pages/integralMall/exchangeRecords.jsx

@@ -30,6 +30,7 @@ function record(props) {
   const getList = (params) => {
     request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
+        console.log("data:",data)
     })
   }
 
@@ -204,7 +205,7 @@ function record(props) {
       </Form>
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/verifyList.jsx

@@ -113,7 +113,7 @@ const header = (props) => {
       <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
       <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/writeOff.jsx

@@ -108,7 +108,7 @@ function header(props) {
   return (
     <>
       <Tabs onChange={callback} type="card">
-        <TabPane tab="扫码核销" key="1">
+        {/* <TabPane tab="扫码核销" key="1">
           <Row>
             <Col span={8} style={{ textAlign: 'center' }}>
               <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
@@ -129,7 +129,7 @@ function header(props) {
             </Col>
           </Row>
           <Dialog onEnter={handleEnter} onChange={changeCode} />
-        </TabPane>
+        </TabPane> */}
         <TabPane tab="手机号核销" key="2">
           <Row>
             <Col span={12} style={{ textAlign: 'center' }}>

src/pages/news/list/NewsList.jsx

@@ -319,7 +319,7 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} current={dataSource.current}/>
       </div>
     </>
   );

src/pages/news/list/editNewsList.jsx

@@ -293,6 +293,7 @@ const { TextArea } = Input;
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/news/type/NewsType.jsx

@@ -114,6 +114,10 @@ function header(props) {
       ),
     },
   ];
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -121,20 +125,25 @@ function header(props) {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="请选择">
-              <Option value="1">已上架</Option>
-              <Option value="0">已下架</Option>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
           )}
         </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
       </AuthButton>
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/staff/list/StaffList.jsx

@@ -31,48 +31,49 @@ const toEditStaff = (userId) => () => {
  */
 const CartBody = (props) => {
   const { data } = props
+  // console.log("data11:", data)
 
   const confirm = (data) => () => {
-    console.log(data,"11111")
-    if(data.status === 1){
+    // console.log(data, "11111")
+    if (data.status === 1) {
       Modal.confirm({
         title: '确认停用该角色？',
         okText: '确认',
         cancelText: '取消',
-        onOk() {
-          request({ ...apis.staff.change, urlData: {id:data.userId,type:'off'}}).then((data) => {
+        onOk () {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then((data) => {
             message.info("操作成功")
             props.onFresh()
           })
         }
       });
-    }else{
+    } else {
       Modal.confirm({
         title: '确认启用该角色？',
         okText: '确认',
         cancelText: '取消',
-        onOk() {
-          request({ ...apis.staff.change, urlData: {id:data.userId,type:'on'}}).then((data) => {
+        onOk () {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then((data) => {
             message.info("操作成功")
             props.onFresh()
           })
         }
       });
     }
-    
+
   }
   return (
 
     <Card className={Styles.card}>
       <div>
-        <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
-        <Button type="link" style={{color: '#FF925C', fontSize: '0.106rem',position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
+        <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
+        <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
         <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
           {data.status === 1 ? '停用' : '启用'}
-                <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
         {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
           启用
@@ -103,23 +104,21 @@ const CartBody = (props) => {
 }
 
 const header = (props) => {
-  const [tempData, setTempData] = useState([])
-  const [pageTotal, setPageTotal] = useState('')
+  const [tempData, setTempData] = useState({ records: [] })
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10 });
+    getList({ pageNum: 1, pageSize: 8 });
   }, [])
 
   const getList = (params) => {
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
-      setTempData(data.records)
-      setPageTotal(data.total)
+      setTempData(data)
     })
   }
 
   // 分页
   const onChange = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 });
+    getList({ pageNum: pageNumber, pageSize: 8 });
   }
 
   // 提交事件
@@ -128,13 +127,13 @@ const header = (props) => {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values })
+        getList({ pageNum: 1, pageSize: 8, ...values })
       }
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset () {
     props.form.resetFields();
   }
 
@@ -184,30 +183,30 @@ const header = (props) => {
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
-          
-   <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
       </Form>
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
-          tempData.map((item, index) => (
+          tempData.records.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} onFresh={()=> getList({ pageNum: 1, pageSize: 10 })}/>
+              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} key={item.userId} />
             </Col>
           ))
         }
       </Row>
 
       {/* 分页  */}
-      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>     
+        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current}/>
       </div>
     </>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader

src/pages/staff/list/editStaff.jsx

@@ -158,22 +158,22 @@ const Edit = (props) => {
       </Select>,
       value: userData.roleIds,
     },
-    {
-      label: '标签',
-      name: 'taTags',
-      render: <Select
-        mode="multiple"
-        style={{ width: '100%' }}
-        placeholder="请选择标签"
-        onChange={tagsChange} >
-        {tagData.map(item => (
-          <Select.Option key={item.tagId} value={item.tagId}>
-            {item.tagName}
-          </Select.Option>
-        ))}
-      </Select>,
-      value: userData.taTags,
-    },
+    // {
+    //   label: '标签',
+    //   name: 'taTags',
+    //   render: <Select
+    //     mode="multiple"
+    //     style={{ width: '100%' }}
+    //     placeholder="请选择标签"
+    //     onChange={tagsChange} >
+    //     {tagData.map(item => (
+    //       <Select.Option key={item.tagId} value={item.tagId}>
+    //         {item.tagName}
+    //       </Select.Option>
+    //     ))}
+    //   </Select>,
+    //   value: userData.taTags,
+    // },
     {
       label: '地址',
       name: 'address',
@@ -220,7 +220,7 @@ const Edit = (props) => {
 
   console.log('--------->', fields)
 
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+  return <XForm onSubmit={handleSubmit} fields={fields} onCancel={() => router.go(-1)}></XForm>
 }
 
 

src/pages/style/GoodsList.less

@@ -8,16 +8,21 @@
   width: 93px;
   height: 93px;
 }
+
 .ant-table-column-title {
   font-weight: 600;
 }
-.shoppingCart{
-  color: #dcdcdc;
+
+.shoppingCart {
+  // color: #dcdcdc;
+  color: #bebebe;
   margin-left: 6px;
   font-size: 16px;
 }
-.edit{
-  color: #dcdcdc;
+
+.edit {
+  // color: #dcdcdc;
+  color: #bebebe;
   margin-left: 6px;
   font-size: 15px;
-}
+}

src/pages/system/document/audit.jsx

@@ -1,88 +1,210 @@
 import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal} from 'antd'
+import { Col, Row, Button, Modal, Input, Pagination, message } from 'antd'
 import ZmageImg from '../../../components/ZmageImg/ZmageImg'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
+import AuthButton from '../../../components/AuthButton';
+import moment from 'moment';
 
+const unaudited = {
+  // color :'rgb(255, 126, 72)'
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
+
+const auditPass = {
+  // color : '#FF7E48',
+  color: 'green',
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
+
+const noauditPass = {
+  color: ' #fc515c',
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
 
 function body (props) {
   const documentVerifyId = props.location.query.id
   const [data, setData] = useState([])
-
+  const [datas, setDatas] = useState({})
+  // const [status,setStatus] = useState()
   useEffect(() => {
     getList()
-
+    // setVisible(false)
+    // setReasonValue()
+    // useState(2)
   }, [])
-// , documentVerifyId: documentVerifyId
+  // , documentVerifyId: documentVerifyId
   function getList (params) {
     // 网路请求
-    console.log(props,'1111')
-    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
-      console.log('data:', data.imgList)
-      setData(data.imgList)
+    console.log(props, '1111')
+    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId }, params: params }).then(data => {
+      console.log('data:', data.records)
+      setDatas(data)
+      setData(data.records)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
 
     })
   }
-  
-  function onVerify (params) {
 
-    alert(params)
-    // 网路请求
-    request({ ...apis.system.updateTaPolicy, urlData:{ id:documentVerifyId }, data:  {  verifyStatus: params}  }).then(data => {
-    
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
 
-    })
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/system/document/list',
+    });
   }
 
 
+  const Card = (props) => {
+    const [visible, setVisible] = useState()
+    const [reasonValue, setReasonValue] = useState('')
+    useEffect(() => {
+      setVisible(false)
+    }, [])
+
+
+    function onVerify (params) {
+      // 网路请求
+      console.log(reasonValue, "111212")
+      request({ ...apis.system.updateVerify, urlData: { id: props.data.documentVerifyId }, data: { verifyStatus: params, rejectReason: reasonValue } }).then(data => {
+        console.log(data, "datadata")
+        getList()
+      }).catch(err => {
+
+
+      })
+    }
+
+
+
+    const handleOk = (data) => {
+
+      if (data == 1) {
+        Modal.confirm({
+          title: '审核通过后，将给当前用户发放积分 确认审核通过？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk () {
+
+            onVerify(1)
+          }
+        });
+      } else {
+        setVisible(true)
+      }
+    }
 
-  const handleOk =  () => {
-    Modal.confirm({
-      title: '审核通过后，将给当前用户发放积分 确认审核通过？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-       
+    const showModal = () => {
+      setVisible(true)
+    };
+
+    const handleOk1 = e => {
+      console.log(reasonValue, "2222");
+      if (reasonValue ) {
+        // console.log(e);
         onVerify(2)
+        console.log(reasonValue, "11111111");
+        setVisible(false)
+      } else {
+        message.info("不能为空")
       }
-    });
+
+    };
+
+    const handleCancel = e => {
+
+      setVisible(false)
+    };
+
+    const Reason = e => {
+      console.log(e.target.value)
+      // e.target.
+      setReasonValue(e.target.value)
+    }
+
+
+    // console.log("props", props.data)
+    const carddata = props.data.imgList
+    return (
+      <>
+        <div style={{ background: '#ffffff', padding: '40px', marginTop: '30px', borderRadius: '12px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}>
+          <p style={{ fontSize: '0.096rem' }}>
+            <span>资料说明：{props.data.documentTitle} </span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+           
+            <span style={props.data.verifyStatus == 0 ? unaudited : props.data.verifyStatus == 1 ? auditPass : noauditPass} >
+              {props.data.verifyStatus == 0 ? "待审核" : props.data.verifyStatus == 1 ? "审核通过" : "不通过"}
+            </span>
+          </p>
+          <p style={{ fontSize: '0.096rem' }}>提交时间：{moment(props.data.createDate).format('YYYY-MM-DD HH:mm:ss')}   </p>
+
+          <div style={{ fontSize: '0.096rem' }}>资料图片:
+        <Row gutter={16}>
+              {
+                // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+                carddata.map((data, inx) =>
+                  <Col span={4} style={{ textAlign: "center" }}>
+                    <ZmageImg style={{ width: '128px', height: '128px', marginTop: '30px' }} src={data.img} />
+                  </Col>
+                )
+              }
+            </Row>
+          </div>
+          {props.data.verifyStatus == 0 && <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
+            <AuthButton name="admin.documentVerify.id.put" noRight={null}>
+              <Button type="primary" style={{ marginTop: '30px' }} onClick={() => handleOk(1)}>通过</Button>
+            </AuthButton>
+            &nbsp;&nbsp;&nbsp;&nbsp;
+        <AuthButton name="admin.documentVerify.id.put" noRight={null}>
+              <Button style={{ marginTop: '30px' }} onClick={() => handleOk(2)}>不通过</Button>
+            </AuthButton>
+          </div>}
+
+          {props.data.verifyStatus == 2 &&  <p style={{ fontSize: '0.096rem',marginTop: '30px' }}>驳回原因：{props.data.rejectReason}   </p>}
+
+          <Modal
+            title="驳回原因"
+            visible={visible}
+            onOk={handleOk1}
+            onCancel={handleCancel}
+            okText="确认"
+            cancelText="取消"
+          >
+            <Input value={reasonValue} onChange={e => Reason(e)} />
+          </Modal>
+        </div>
+
+      </>
+    )
+    // return <div>111</div>
   }
 
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/system/document/list',
-    });
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 5 })
   }
 
+
   return (
     <>
-      <div style={{ background: '#ECECEC', padding: '30px' }}>
-        <Row gutter={16}>
-          {
-            // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            data.map((data, inx) => 
-              <Col span={6}>
-               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
-              </Col>
-            )
-          }
-        </Row>
-      </div>
-      <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-        <Button type="primary" onClick={()=>handleOk()}>通过</Button>
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <Button onClick={()=>onVerify(2)}>不通过</Button>
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <Button onClick={cancelPage}>返回</Button>
-        
+      {/* <div>111</div> */}
+      <div>
+        {
+          // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+          data.map((data, inx) =>
+            <Card data={data}></Card>
+          )
+        }
+        {/* <Card data = {data.records}></Card> */}
+        <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} pageSize={datas.size} onChange={changePageNum} current={datas.current} />
+        </div>
+
       </div>
-     
-      
+
+
+
+
     </>
   )
 }

src/pages/system/document/list.jsx

@@ -3,6 +3,8 @@ import { Table, Form, Icon, Input, Button, message  } from 'antd'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
+import moment from 'moment';
+import AuthButton from '../../../components/AuthButton';
 
 function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -54,23 +56,14 @@ function body(props) {
   }
 
   function audit(record){
-    if(record.verifyStatus === 0){
+    
       router.push({
         pathname: '/system/document/audit',
         query: {
-          id: record.documentVerifyId,
+          id: record.personId,
         },
       })
-    }
-  else{
-    router.push({
-      pathname: '/system/document/see',
-      query: {
-        id: record.documentVerifyId,
-      },
-    })
-      
-    }
+   
   }
 
   const columns = [
@@ -78,38 +71,47 @@ function body(props) {
       title: '姓名',
       dataIndex: 'name',
       key: 'name',
+      align: 'center',
     },
     {
       title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'tel',
+      key: 'tel',
+      align: 'center',
     },
     {
       title: '提交时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
+      dataIndex: 'summitDate',
+      key: 'summitDate',
+      align: 'center',
+      render: (summitDate) => moment(summitDate).format('YYYY-MM-DD HH:mm:ss')
     },
+
     {
-      title: '状态',
-      dataIndex: 'verifyStatus',
-      key: 'verifyStatus',
-      render: (x,row) => (
-        <>
-         
-            <span style={{ cursor: 'pointer' }}>{ row.verifyStatus === 0 ? '未审核' : row.verifyStatus === 1 ? '审核通过' : '审核未通过' }</span>
-           
-        </>
-      )
+      title: '已审核数',
+      dataIndex: 'totalSummit',
+      key: 'totalSummit',
+      align: 'center',
     },
+
+    {
+      title: '未审核数',
+      dataIndex: 'unverified',
+      key: 'unverified',
+      align: 'center',
+    },
+
+   
     {
       title: '操作',
       dataIndex: 'documentVerifyId',
       key: 'documentVerifyId',
+      align: 'center',
       render: (x,row) => (
         <>
-          
-            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.verifyStatus === 0 ? '审核' : '查看' }</span>
-           
+          <AuthButton name="admin.documentVerify.id.get" noRight={null}>
+            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.unverified === 0 ? '查看' : '审核' }</span>
+           </AuthButton>
         </>
       )
     },

src/pages/system/document/see.jsx

@@ -1,64 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal} from 'antd'
-import ZmageImg from '../../../components/ZmageImg/ZmageImg'
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
-import { router } from 'umi';
-
-
-function body (props) {
-  const documentVerifyId = props.location.query.id
-  const [data, setData] = useState([])
-
-  useEffect(() => {
-    getList()
-
-  }, [])
-// , documentVerifyId: documentVerifyId
-  function getList (params) {
-    // 网路请求
-    console.log(props,'1111')
-    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
-      console.log('data:', data.imgList)
-      setData(data.imgList)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-
-    })
-  }
-  
-
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/system/document/list',
-    });
-  }
-
-
-
-  return (
-    <>
-      <div style={{ background: '#ECECEC', padding: '30px' }}>
-        <Row gutter={16}>
-          {
-            // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            data.map((data, inx) => 
-              <Col span={6}>
-               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
-              </Col>
-            )
-          }
-        </Row>
-      </div>
-      <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-       
-        <Button onClick={cancelPage}>返回</Button>
-        
-      </div>
-     
-      
-    </>
-  )
-}
-
-export default body

src/pages/system/housingPolicy.jsx

@@ -186,7 +186,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/system/intention.jsx

@@ -57,7 +57,7 @@ const Edit = (props) => {
     <>
       <Row>
         <Col span={6}>
-          <BuildSelect onChange={changBuilding} one="true" />
+          <BuildSelect onChange={changBuilding} checkFirst />
         </Col>
         <Col span={5} style={{ lineHeight: '30px' }}>
           用户操作

src/pages/system/messageList.jsx

@@ -62,7 +62,7 @@ const header = (props) => {
     <>
       <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/third/thirdList.jsx

@@ -93,7 +93,7 @@ const header = (props) => {
       </AuthButton>
       <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/services/apis.js

@@ -236,6 +236,11 @@ export default {
       url: `${prefix}/consultant`,
       action: 'admin.consultant.get',
     },
+    buildingConsultant: {
+      method: 'GET',
+      url: `${prefix}/building/consultant`,
+      action: 'admin.building.consultant.get',
+    },
     recommendEdit: {
       method: 'PUT',
       url: `${prefix}/customer/recommend/edit/:id`,
@@ -441,6 +446,11 @@ export default {
         method: 'GET',
         action: 'admin.SignList.get',
       },
+      getTaActivityDynamicEnlistExport: {
+        url: `${prefix}/activityDynamicEnlist/export`,
+        method: 'GET',
+        action: 'admin.activityDynamicEnlist.export.get',
+      },
       taDrainage: {
         url: `${prefix}/taDrainage`,
         method: 'GET',
@@ -461,16 +471,16 @@ export default {
         method: 'PUT',
         action: 'admin.taDrainage.id.put',
       },
-      taDrainageRecord:{
+      taDrainageRecord: {
         url: `${prefix}/taDrainageRecord`,
         method: 'GET',
         action: 'admin.taDrainageRecord.get',
       },
-      exporttaDrainageRecord:{
+      exporttaDrainageRecord: {
         url: `${prefix}/taDrainageRecord/export`,
         method: 'GET',
-        action: 'admin.taDrainageRecord/export.get',
-      }
+        action: 'admin.taDrainageRecord.export.get',
+      },
   },
   integralMall: {
     tdPointsRules: {
@@ -612,25 +622,21 @@ export default {
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
     },
-
-    documentVerifylist:{
+    documentVerifylist: {
       url: `${prefix}/documentVerify`,
       method: 'GET',
       action: 'admin.documentVerify.get',
     },
-    documentVerifyDetail:{
+    documentVerifyDetail: {
       url: `${prefix}/documentVerify/:id`,
       method: 'GET',
       action: 'admin.documentVerify.id.get',
     },
-    updateTaPolicy: {
+    updateVerify: {
       url: `${prefix}/documentVerify/:id`,
       method: 'PUT',
       action: 'admin.documentVerify.id.put',
     },
-// /admin/documentVerify  查询审核列表，参数 pageNum, pageSize, name, tel
-// /documentVerify/{id}   根据id查询详情
-// /admin/documentVerify/{id} 根据Id修改
   },
   staff: {
     taUser: {
@@ -734,122 +740,132 @@ export default {
   },
  },
  helpActivity: {
+  effectiveList: {
+    url: `${prefix}/helpActivityEffective/list`,
+    method: 'GET',
+    action: 'admin.helpActivityEffective.list.get',
+  },
   list: {
     url: `${prefix}/helpActivity/list`,
     method: 'GET',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.get',
   },
   add: {
     url: `${prefix}/helpActivity/add`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.add.post',
   },
   details: {
     url: `${prefix}/helpActivity/details`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.details.get',
   },
   update: {
     url: `${prefix}/helpActivity/update`,
     method: 'put',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.update.put',
   },
   top: {
     url: `${prefix}/top/update`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.top.update.post',
   },
   record: {
     url: `${prefix}/helpRecord`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpRecord.get',
   },
   helpPeopleDetails: {
     url: `${prefix}/taHelpRecord/details`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taHelpRecord.details.get',
   },
   verification: {
     url: `${prefix}/helpInitiateRecordVerify`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.helpInitiateRecordVerify.get',
   },
   HelpInitiateRecordSucceed: {
     url: `${prefix}/HelpInitiateRecordSucceed/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.HelpInitiateRecordSucceed.export.get',
   },
   gethelpRecordExport: {
     url: `${prefix}/helpRecord/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpRecord.export.get',
   },
  },
  groupActivity: {
   list: {
     url: `${prefix}/taShareActivity/list`,
     method: 'get',
-    action: 'admin.taShareActivity.get',
+    action: 'admin.taShareActivity.list.get',
+  },
+  EffectiveList: {
+    url: `${prefix}/taShareActivityEffective/list`,
+    method: 'get',
+    action: 'admin.taShareActivityEffective.list.get',
   },
   add: {
     url: `${prefix}/taShareActivity`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareActivity.post',
   },
   details: {
     url: `${prefix}/taShareActivity/:id`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareActivity.id.get',
   },
   avgScore: {
     url: `${prefix}/taShareActivity/avgScore`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareActivity.avgScore.get',
   },
   update: {
     url: `${prefix}/taShareActivity/update`,
     method: 'put',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareActivity.update.put',
   },
   finish: {
     url: `${prefix}/taShareActivity/finish/:id`,
     method: 'put',
-    action: 'admin.taShareActivity.finish',
+    action: 'admin.taShareActivity.finish.put',
   },
   top: {
     url: `${prefix}/taShareActivity/weight`,
     method: 'put',
-    action: 'admin.taShareActivity.weight',
+    action: 'admin.taShareActivity.weight.put',
   },
   shareSuccList: {
     url: `${prefix}/taShareSuccessRecord`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareSuccessRecord.get',
   },
   shareFailList : {
     url: `${prefix}/taShareFailAndProcessingRecord`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareFailAndProcessingRecord.get',
   },
   shareChildList : {
     url: `${prefix}/taShareChildRecord`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareChildRecord.get',
   },
   exportShareChildRecord: {
     url: `${prefix}/taShareChildRecord/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareChildRecord.export.get',
   },
   exportShareRecord: {
     url: `${prefix}/taShareRecord/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareRecord.export.get',
   },
   verification: {
     url: `${prefix}/taShareRecord/verificate`,
     method: 'put',
-    action: 'admin.taRole.get',
+    action: 'admin.taShareRecord.verificate.put',
   }
  },
  third: {

src/utils/request.js

@@ -86,14 +86,14 @@ request.interceptors.response.use(async (response, options) => {
       if (code != 1000) {
         if (code === 1001) {
           notification.error({
-            message: `请求错误`,
-            description: '请登录系统',
+            message: `请登录系统`,
+            // description: '请登录系统',
           });
           throw new Error('请登录系统');
         } else {
           notification.error({
-            message: `请求错误`,
-            description: message,
+            message: message || '请求错误',
+            // description: message,
           });
           throw new Error(message);
         }