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

config/config.js

@@ -138,5 +138,13 @@ export default {
   },
   chainWebpack: webpackPlugin,
 
-  proxy,
+  proxy: {
+    ...proxy,
+    '/gaode_amap': { // 高德地图
+      // target: 'http://192.168.0.11:8080/',
+      target: 'https://restapi.amap.com/v3/',
+      changeOrigin: true,
+      pathRewrite: { '^/gaode_amap': '' },
+    },
+  },
 };

config/routes.js

@@ -128,6 +128,12 @@ export default [
                 name: '到访记录',
                 component: './customer/visiting/index',
               },
+              {
+                path: '/customer/customerlist/publicCustomerDetail',
+                name: '私客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/publicCustomerDetail',
+              },
             ],
           },
           {
@@ -424,12 +430,6 @@ export default [
                 hideInMenu: true,
                 component: './system/document/audit',
               },
-              {
-                path: '/system/document/see',
-                name: '客户资料查看',
-                hideInMenu: true,
-                component: './system/document/see',
-              },
             ],
           },
           {

package.json

@@ -43,7 +43,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^4.5.9",
     "@antv/data-set": "^0.10.2",
-    "antd": "^3.20.0",
+    "antd": "^3.25.0",
     "classnames": "^2.2.6",
     "dayjs": "^1.8.16",
     "dva": "^2.4.1",

src/components/SelectButton/BuildSelect.jsx

@@ -19,14 +19,9 @@ function usePrevious(props) {
  * @param {*} props
  * @returns
  */
-const BuildingSelect = (props) => {
-  const [ data, setData ] = useState([])
-  const [ value, setValue ] = useState('')
-  // const preProps = usePrevious(props)
-
-  // if ((!preProps) && props.value != value) {
-  //   setValue(props.value)
-  // }
+const BuildingSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState('')
 
   useEffect(() => {
     setValue(props.value)
@@ -34,10 +29,10 @@ const BuildingSelect = (props) => {
 
   useEffect(() => {
     getCityList();
-  },[])
+  }, [])
 
-  const getCityList = (e) => {
-    request({ ...apis.building.getList, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
+  const getCityList = e => {
+    request({ ...apis.building.getList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data.records)
         // 默认选中第一个
         if (props.checkFirst) {
@@ -47,17 +42,18 @@ const BuildingSelect = (props) => {
     })
   }
 
-  const handleChange = (e) => {
+  const handleChange = e => {
     setValue(e)
     props.onChange(e)
   }
   // '' === value ? undefined : value
   return (
       <Select
+      {...props} 
       showSearch
       value={value}
-      style={{ width: '180px' }} 
-      placeholder="请选择项目" 
+      style={{ width: '180px' }}
+      placeholder="请选择项目"
       onChange={handleChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0

src/components/XForm/FileUpload.jsx

@@ -0,0 +1,73 @@
+import React, { useState, useEffect } from 'react'
+import { Upload, Button, Icon } from 'antd';
+import { uploaderProps } from '../../utils/upload';
+
+/**
+ * value 数据的接收格式 [{ url: xxxxx.mp4 }]
+ * @param {*} props 
+ */
+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() {
+    console.log('fileUpload: ', value)
+    // value 数据的接收格式 [{ url: xxxxx.mp4 }, { url: xxxxx.jpg }]
+    return (value || []).filter(f => f !== undefined).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 }) {
+    console.log(file, fileList)
+    setDefaultFileList(fileList)
+    if (file.status === 'uploading') {
+      return
+    }
+
+    if (file.status === 'done' || file.status === 'removed') {
+
+      // 因为这个控件本身返回的数据格式 [{ ..., response: '服务器返回的数据' }]
+      // 但是 我这里自己用的时候 传入的数据是 [ 'xxxx.mp4', 'xxxx.jpg' ], 然后通过 getFileList() 转换成了 [{ url: 'xxx.mp4' }] 这样的格式
+
+      // 原因是因为 控件返回的数据 和 fileList 展示已经上传的数据 的格式字段不一样
+
+      const resFileList = fileList.filter(f => f.response !== undefined).map(i => i.response)
+      const tempFileList = fileList.filter(f => f.url !== undefined).map(i => i.url)
+      const resultList = tempFileList.concat(resFileList || [])
+      props.onChange(resultList)
+    }
+  }
+
+  return (
+    <>
+      <Upload
+        { ...uploaderProps }
+        {...props}
+        onChange={onFileChange}
+        fileList={defaultFileList}
+      >
+        <Button>
+          <Icon type="upload" /> {props.label}
+        </Button>
+      </Upload>
+    </>
+  )
+}
+
+export default fileUpload

src/components/XForm/ImageListUpload.jsx

@@ -3,6 +3,10 @@ import { Upload, Icon, Modal } from 'antd';
 import './style.less';
 import { uploaderProps } from '../../utils/upload';
 
+/**
+ * unlimited  属性表示上传图片无限制
+ * 例子： <ImageListUpload unlimited/>
+ */
 class ImageListUpload extends React.Component {
   state = {
     previewVisible: false,
@@ -79,7 +83,8 @@ class ImageListUpload extends React.Component {
           { ...uploaderProps }
           onSuccess={this.handleUploadSucess}
         >
-          {(fileList || images).length >= 8 ? null : uploadButton}
+          {/* unlimited 表示上传无限制数量 */}
+          {(this.props.unlimited && uploadButton) || ((fileList || images).length >= 8 ? null : uploadButton)}
         </Upload>
         <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={previewImage} />

src/pages/Welcome.jsx

@@ -54,7 +54,7 @@ const welcome = (props) => {
             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 && data.selectRegisteredCount + 95) || '0'}</span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
           </div>
         }
         {checkData.includes('number_of_new_users') &&

src/pages/activity/ActivityList.jsx

@@ -17,6 +17,7 @@ const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
   //   const [page, changePage] = useState({})
+  const [time, setTime] = useState('')
 
   // 查询列表
   const getList = params => {
@@ -70,12 +71,20 @@ const header = props => {
       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',
+      // width: '15%',
+      // width: '20%',
       render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
     },
     {
@@ -83,32 +92,44 @@ const header = props => {
       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',
+      // width: '10%',
       render: activityStatus => <><span>{activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
     },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
+    },
     {
       title: '操作',
       dataIndex: 'handle',
@@ -117,24 +138,23 @@ const header = props => {
       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' ? '报名记录' : ''}{ (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}>
-            {row.activityStatus != 0 && <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>
-          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>下载二维码<Icon type="qrcode" className={styles.shoppingCart} /></span>
+      {(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',
@@ -153,7 +173,7 @@ const header = props => {
         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)
@@ -168,7 +188,7 @@ const header = props => {
     request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).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)
@@ -187,7 +207,7 @@ const header = props => {
   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)
@@ -198,7 +218,7 @@ const header = props => {
   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)
@@ -206,15 +226,21 @@ const header = props => {
   }
 
   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 })
       }
     });
@@ -223,6 +249,14 @@ const header = props => {
   // 重置搜索
   function handleReset () {
     props.form.resetFields();
+    setTime('')
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  // 时间回调
+  function timeOnChange(date, dateString) {
+    console.log(date, dateString)
+    setTime(date)
   }
 
 
@@ -232,7 +266,7 @@ const header = props => {
     <>
       {/* style={{ display: 'none' }} */}
       <div id="qrcode"></div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
             <SelectCity />,
@@ -253,7 +287,7 @@ const header = props => {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('time')(
-            <DatePicker />,
+            <DatePicker onChange={timeOnChange}/>,
           )}
         </Form.Item>
         <Form.Item>

src/pages/activity/drainage/Detail.jsx

@@ -8,6 +8,7 @@ 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 = []
@@ -22,7 +23,6 @@ const header = (props) => {
   const [startDate, setStartDate] = useState('')
   const [endDate, setEndDate] = useState('')
   const [total, setTotal] = useState({})
-  let daterange = []
   // let content = {}
   useEffect(() => {
 
@@ -61,7 +61,7 @@ const header = (props) => {
         const r = {
 
           key: inx + 1,
-          createDate:row.createDate,
+          createDate: row.createDate,
           [`${col.key}`]: col.value,
           ...acc,
         }
@@ -72,14 +72,14 @@ const header = (props) => {
   }
 
   function tableTitle (data) {
-   tableTitle = eval('(' + data[0].content + ')')
+    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) => {
+    return cols.concat(tableTitle.map((item) => {
       const col = {
         title: item.label,
         dataIndex: item.key,
@@ -88,32 +88,34 @@ const header = (props) => {
       return col
     }))
   }
+  // function datalist () {
 
-
-  function datalist () {
-
-    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) })
-  }
+  //   gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
+  // }
 
   function fromTime (str) {
     return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
   }
 
+  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) })
+    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) } })
       .then(response => {
         download(response)
@@ -137,29 +139,45 @@ 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>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-         <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>
-            H5项目：{ name }
-         </div>
+          <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>
@@ -167,7 +185,7 @@ const header = (props) => {
         </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)} current={total.current}/>
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current} />
         </div>
       </div>
 
@@ -177,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

@@ -19,21 +19,6 @@ const toEditList = (row) => () => {
   });
 }
 
-
-
-const data = [
-
-  {
-    Id: '1',
-    name: 'zls',
-    // StartTime:'',
-    // EndTime:'',
-    number: 33,
-  }
-
-
-];
-
 const header = (props) => {
   // const [data, setData] = useState({ data: [] })
   const [datas, setDatas] = useState([])//表格数据
@@ -72,7 +57,7 @@ const header = (props) => {
           gettaDrainage({ pageNum: 1, pageSize: 10 })
         }).catch((err) => {
           console.log('111111', err)
-          message.info(err.msg || err.message)
+          // message.info(err.msg || err.message)
         })
       }
     });
@@ -90,14 +75,18 @@ const header = (props) => {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <AuthButton name="admin.taDrainage.id.put" noRight={null}><div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div></AuthButton>
+      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',
@@ -113,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>
         </>
       ),
     },
@@ -124,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>
         </>
       ),
     },
@@ -158,61 +147,49 @@ const header = (props) => {
   const Forms = props => {
 
     console.log(date, '---------------')
-    console.log(formsdate, '---------------')
+    console.log(formsdate.name, '---------------')
     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} />,
-      },
-
-
-    ]
-
-    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 => {
@@ -221,16 +198,73 @@ 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 })
   }
 
 
@@ -247,7 +281,13 @@ const header = (props) => {
     console.log(formsdate, '22222222')
     setDate({
       visible: true,
+      title: "修改H5项目"
     });
+
+
+    console.log('form :', props.form)
+
+
   };
   function showModal () {
     setFormsDate({
@@ -257,6 +297,7 @@ const header = (props) => {
     })
     setDate({
       visible: true,
+      title: '新建H5项目'
     });
   };
   const changePageNum = pageNumber => {
@@ -296,7 +337,7 @@ const header = (props) => {
   }
 
   const { getFieldDecorator } = props.form;
-  const { visible, confirmLoading, ModalText } = date;
+  const { visible, confirmLoading, ModalText, title } = date;
   return (
     <>
       <div>
@@ -319,7 +360,7 @@ const header = (props) => {
               />,
             )}
           </Form.Item>
-          <Form.Item>
+          <Form.Item >
             <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
               搜索
           </Button>
@@ -332,14 +373,15 @@ const header = (props) => {
           <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" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/activity/editActivity.jsx

@@ -16,7 +16,6 @@ import touxiang from '../../assets/touxiang.jpg';
 import poster1 from '../../assets/poster1.png';
 import poster2 from '../../assets/poster2.png';
 import xiaochengxu from '../../assets/xiaochengxu.png'
-import PosterCard from '../../components/Cards/PosterCard'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -28,9 +27,10 @@ const formItemLayout = {
 
 const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1)
+  const [activityStatus, setActivityStatus] = useState(1)
+  const [disable, setDisable] = useState(false)
 
   const radioOnChange = e => {
-    // console.log(e.target.value)
     setIsEnlist(e.target.value)
   }
 
@@ -44,6 +44,8 @@ const BasicForm = props => {
       data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
 
       setIsEnlist(data.isEnlist)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0 ? true : false)
       props.form.setFieldsValue(data)
     })
   }
@@ -104,11 +106,27 @@ const BasicForm = props => {
               message: '请选择所属项目',
             },
           ],
-        })(<BuildSelect />)}
+        })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
-        <Form.Item label="主图">
-          {getFieldDecorator('imgUrl')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于活动列表">
+          {getFieldDecorator('listImgUrl', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动封面图1',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动详情">
+          {getFieldDecorator('imgUrl', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动详情主图',
+            },
+          ],
+        })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动标题">
         {getFieldDecorator('title', {
@@ -118,7 +136,7 @@ const BasicForm = props => {
               message: '请输入活动标题',
             },
           ],
-        })(<Input />)}
+        })(<Input/>)}
         </Form.Item>
         <Form.Item label="活动时间">
         {getFieldDecorator('activityTime', {
@@ -128,7 +146,7 @@ const BasicForm = props => {
               message: '请选择活动时间',
             },
           ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+        })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动地点">
         {getFieldDecorator('address', {
@@ -138,7 +156,7 @@ const BasicForm = props => {
               message: '请输入活动地点',
             },
           ],
-        })(<Input />)}
+        })(<Input disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动人数">
         {getFieldDecorator('personNum', {
@@ -148,7 +166,7 @@ const BasicForm = props => {
               message: '请输入活动人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="最大报名人数">
         {getFieldDecorator('maxEnlistByPerson', {
@@ -158,21 +176,12 @@ const BasicForm = props => {
               message: '请输入最大报名人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动详情">
         {getFieldDecorator('desc')(<Wangedit />)}
         </Form.Item>
-        <Form.Item label="是否需要报名">
-        {getFieldDecorator('isEnlist')(
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
-            <Radio value={1}>是</Radio>
-            <Radio value={0}>否</Radio>
-          </Radio.Group>,
-        )}
-        </Form.Item>
-        {
-          isEnlist === 1 && (<Form.Item label="报名时间">
+        <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {
             rules: [
               {
@@ -180,9 +189,18 @@ const BasicForm = props => {
                 message: '请选择报名时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
-          </Form.Item>)
-        }
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
+        </Form.Item>  
+        <Form.Item label="权重">
+        {getFieldDecorator('heavy', {
+          rules: [
+            {
+              required: true,
+              message: '请输入权重',
+            },
+          ],
+        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+        </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
             确认
@@ -224,13 +242,13 @@ const Edit = props => {
     if (dynamicId) {
       console.log(dynamicId, 'dynamicId')
       useEffect(() => {
-        request({ ...apis.activity.usedPoster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
+        request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
           console.log(data, "2222")
-          if (data) {
-            setPosterId(data.posterId)
-            changeImg(data.posterImg)
-            changeTextArea(data.posterDescription)
-            changeInput(data.posterTitle)
+          if (data.length > 0) {
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
           }
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -249,24 +267,16 @@ const Edit = props => {
       })
     }
 
-    //获取选中的模板
-    const [ checkList, setCheckList ] = useState([])
-
-    const cardChange = (e) => {
-      console.log(e,"123")
-      setCheckList(e)
-    }
-
     const submitPoster = () => {
       if (dynamicId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue, templateIds: checkList }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue, templateIds: checkList }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -281,14 +291,56 @@ const Edit = props => {
     return <div>
       <div style={{ display: 'flex' }}>
         <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-           <PosterCard postType="dynamic"  checkedList={checkList} onChange={cardChange} />
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px',
+              fontSize: '20px',
+              color: '#222',
+              fontWeight: '600',
+              display: '-webkit-box',
+              lineClamp: '3',
+              height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px',
+              fontSize: '17px',
+              color: '#999',
+              display: '-webkit-box',
+              lineClamp: '3',
+              height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>{miniappName || '置业V顾问'}</span>报名活动</p>
+              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
         </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' }}>活动海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -363,9 +415,10 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <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' }}>活动分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友</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

@@ -32,6 +32,9 @@ const Edit = props => {
   const { groupActivityId } = props.location.query
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
   const [scoreData, setScoreData] = useState({})
+  const [activityStatus, setActivityStatus] = useState({})
+  const [disable, setDisable] = useState(false)
+
   useEffect(() => {
     request(apis.groupActivity.avgScore).then((data) => {
       setScoreData(data);
@@ -46,6 +49,8 @@ const Edit = props => {
     const getDynamicData = (groupActivityId) => {
       request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
         setDynamicData(data)
+        setActivityStatus(data.activityStatus)
+        setDisable(data.activityStatus === 0 ? true : false)
       })
     }
   }
@@ -65,7 +70,7 @@ const Edit = props => {
       {
         label: '选择项目',
         name: 'buildingId',
-        render: <BuildSelect />,
+        render: <BuildSelect disabled={disable}/>,
         value: dynamicData.buildingId,
         rules: [
           { required: true, message: '请选择项目' },
@@ -81,21 +86,41 @@ const Edit = props => {
         ]
       },
       {
-        label: '活动主图',
+        label: '拼团详情主图',
         name: 'mainImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.mainImg,
         rules: [
-          { required: true, message: '请输入活动主图' },
+          { required: true, message: '请输入拼团详情主图' },
+        ],
+        help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动详情',
+      },
+      {
+        label: '拼团封面图1',
+        name: 'listImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.listImg,
+        rules: [
+          { required: true, message: '请输入拼团封面图1' },
         ],
-        help: '建议尺寸375*312px',
+        help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表',
+      },
+      {
+        label: '拼团封面图2',
+        name: 'bannerListImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.bannerListImg,
+        rules: [
+          { required: true, message: '请输入拼团封面图2' },
+        ],
+        help: '建议图片尺寸：670*224px，比例3:1,格式：jpg，用于首页底部活动轮播',
       },
       {
         label: '活动时间',
         name: 'activityTime',
         type: FieldTypes.RangePicker,
         value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
-        props: { showTime: { format: 'HH:mm' } },
+        props: { showTime: { format: 'HH:mm' }, disabled: activityStatus === 0 ? true : false },
         rules: [
           { required: true, message: '请选择活动时间' },
         ],
@@ -105,6 +130,7 @@ const Edit = props => {
         name: 'groupBuyPeople',
         type: FieldTypes.Text,
         value: dynamicData.groupBuyPeople,
+        props: {disabled: activityStatus === 0 ? true : false },
         help: '注：成团所需人数',
         rules: [
           { required: true, message: '请输入成团人数' },
@@ -115,6 +141,7 @@ const Edit = props => {
         name: 'integral',
         type: FieldTypes.Text,
         value: dynamicData.integral,
+        props: {disabled: activityStatus === 0 ? true : false },
         help: '注：用户平均积分' + scoreData.averageScore,
         rules: [
           { required: true, message: '请输入所需积分' },
@@ -130,6 +157,17 @@ const Edit = props => {
         ],
         help: '建议宽度:335px,高度不限',
       },
+      {
+        label: '权重',
+        name: 'heavy',
+        type: FieldTypes.Number,
+        render: <Input type="number" style={{ width: 80}}/>,
+        value: dynamicData.heavy,
+        rules: [
+          { required: true, message: '请输入权重' },
+        ],
+        help: '数字越大越靠前',
+      },
     ]
 
     const handleSubmit = val => {
@@ -254,9 +292,10 @@ const Edit = props => {
 
         <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' }}>拼团海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -331,9 +370,10 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <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' }}>拼团分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</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

@@ -109,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 (

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,11 +63,11 @@ 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: 'participateNum',
@@ -79,7 +79,7 @@ const toEditActivity = (groupActivityId) => () => {
       dataIndex: 'groupBuyPeople',
       key: 'groupBuyPeople',
       align: 'center',
-    },  
+    },
     {
       title: '状态',
       dataIndex: 'activityStatus',
@@ -99,127 +99,132 @@ const toEditActivity = (groupActivityId) => () => {
       render: (x, row) => (
         <>
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', 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', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></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.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.taShareActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
+          {(row.activityStatus === 0 || row.activityStatus === 2)&&
+            <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 === 1 &&
-          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
-                <span style={{ color: '#1990FF', 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>
+          {
+            <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+              <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.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 === 2 &&
-        <AuthButton><span style={{ color: '#1990FF', 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>
+          {(row.activityStatus === 0 || row.activityStatus === 1) &&
+            <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>
           }
         </>
       ),
     },
   ];
   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.groupActivityId} }).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: { groupActivityId: row.groupActivityId, weight: weight } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+      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 sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
+  }
+
+  // 取消活动
+  const cancelDynamic = row => {
+    request({ ...apis.groupActivity.cancel, urlData: { id: row.groupActivityId } }).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.groupActivity.send, urlData: { id: row.groupActivityId } }).then(data => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
     })
   }
 
   //首页推荐
   const recommendGroupActivity = (row, code) => () => {
     request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+      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)
-      })
-  }
-  
+
   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) {
@@ -229,9 +234,10 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset () {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
 
@@ -272,14 +278,14 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <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} current={data.current} />
       </div>

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -85,6 +85,11 @@ const header = props => {
           message.error('助力邀请人数不能超过200')
           return
         }
+          // 助力邀请人数>0
+        if (values.personNum <= 0) {
+          message.error('助力邀请人数大于0')
+          return
+        }
 
         // 判断助力人数必须大于0
         if (values.isEnlist === 1) {
@@ -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
@@ -153,12 +154,34 @@ const header = props => {
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="活动主图" help="建议尺寸375*312px">
+        <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动详情">
           {getFieldDecorator('img', {
           rules: [
             {
               required: true,
-              message: '活动主图不能为空',
+              message: '助力详情主图不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
+        <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表">
+          {getFieldDecorator('listImg', {
+          rules: [
+            {
+              required: true,
+              message: '助力封面图1不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
+        <Form.Item label="助力封面图2" help="建议图片尺寸：670*224px，比例3:1,格式：jpg，用于首页底部活动轮播">
+          {getFieldDecorator('bannerListImg', {
+          rules: [
+            {
+              required: true,
+              message: '助力封面图2不能为空',
             },
           ],
         })(<ImageUploader />)}
@@ -373,9 +396,10 @@ const Edit = props => {
 
         <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' }}>助力海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -450,9 +474,10 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <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' }}>助力分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</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 });
@@ -42,15 +41,20 @@ 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 => {

src/pages/activity/helpActivity/list.jsx

@@ -91,40 +91,30 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.activityStatus === 0 &&
+          {(row.activityStatus === 0 || row.activityStatus === 2) &&
           <AuthButton name="admin.helpRecord.get">
-             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+             <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>}
+          {
+            <AuthButton name="admin.top.update.post" noRight={null}>
+              <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>
+          }
           {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> </AuthButton>
+          }
+          {
           <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', 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>
+            <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 &&
+          {(row.activityStatus === 1 || row.activityStatus === 0) &&
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" 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" 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>
-          }
-
-          {row.activityStatus === 2 &&
-          <AuthButton name="admin.helpRecord.get" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <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 === 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" 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>
-          }
         </>
       ),
     },
@@ -147,7 +137,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)
@@ -161,26 +151,26 @@ 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)
       })
   }
   
-  // const sendOrPublicDynamic = (row) => {
-  //     if (row.status === 1) {
-  //         cancelDynamic(row)
-  //     } else {
-  //         sendDynamic(row)
-  //     }
-  // }
+  const sendOrPublicDynamic = (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 })
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
       }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
@@ -191,7 +181,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)
@@ -199,7 +189,7 @@ const toEditGoods = (helpActivityId) => () => {
   }
   
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件

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/amapAroundData.js

@@ -0,0 +1,103 @@
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+
+const KEY = '14f05ce59c26364fd0674014dc0d8b1b'
+
+const POI_TYPES_KETY = {
+    Transport: 'Transport',
+    Mall: 'Mall',
+    Edu: 'Edu',
+    Hospital: 'Hospital',
+    Bank: 'Bank',
+    Restaurant: 'Restaurant',
+}
+
+// key 值会被拿到 building 表中 组合为字段名
+const POI_TYPES = [
+    {
+      key: POI_TYPES_KETY.Transport,
+      label: '交通',
+      types: ['150100', '150200', '150300', '150400', '150500', '150600'],
+      data: [],
+    },
+    {
+      key: POI_TYPES_KETY.Mall,
+      label: '商业',
+      types: ['060100', '060200', '060300', '060400', '060500', '060600',
+              '060700', '060800', '060900', '061000', '061100', '061200',
+              '061300', '061400', '080100', '080200', '080300', '080400',
+              '080500', '080600'],
+      data: [],
+    },
+    {
+      key: POI_TYPES_KETY.Edu,
+      label: '学校',
+      types: ['141200'],
+      data: [],
+    },
+    {
+      key: POI_TYPES_KETY.Hospital,
+      label: '医院',
+      types: ['090100', '090200', '090300', '090400', '090500', '090600', '090700'],
+      data: [],
+    },
+    {
+      key: POI_TYPES_KETY.Bank,
+      label: '银行',
+      types: ['160100'],
+      data: [],
+    },
+    {
+      key: POI_TYPES_KETY.Restaurant,
+      label: '餐饮',
+      types: ['050100', '050200', '050300', '050400', '050500', '050600',
+              '050700', '050800', '050900'],
+      data: [],
+    },
+  ]
+
+/**
+ * 获取 POI 类型
+ * @param {*} keyType 
+ */
+const getPOIType = keyType => {
+    return POI_TYPES.filter(item => item.key === keyType)
+}
+
+/**
+ * 获取这个 keyType 类型的所有 types
+ * @param {类型的key值} keyType 
+ */
+const getTypes = keyType => {
+  const typesArr = getPOIType(keyType)
+  return typesArr[0].types.join('|')
+}
+
+/**
+ * 获取周边数据
+ * @param {查询参数} params 
+ */
+function getAroundData (params) {
+    return new Promise((resolve, reject) => {
+        const { types, location } = params
+        if (!types) {
+            // console.err('未传输类型types值')
+            reject(new Error('未传输类型types值'))
+            return
+        }
+        if (!location) {
+            // console.err('未传输传输中心坐标location值')
+            reject(new Error('未传输传输中心坐标location值'))
+            return
+        }
+
+        request({ ...apis.amap.webService, params: { ...params, key: KEY, types: getTypes(types), location } }).then(data => {
+            // console.log(data)
+            resolve(data)
+        }).catch(err => {
+            reject(err)
+        })
+    })
+}
+
+export { POI_TYPES_KETY, getAroundData, getPOIType, POI_TYPES }

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

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber, notification } from 'antd';
 import moment from 'moment';
+import { router } from 'umi';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
-import { router } from 'umi';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
@@ -12,6 +12,9 @@ import TagGroup from './tags'
 import Amap from './amap'
 import BudildingProjectType from './buildingProjectType'
 import SelectCity from '../../../../../components/SelectButton/CitySelect'
+import FileUpload from '@/components/XForm/FileUpload';
+import { POI_TYPES_KETY, getAroundData, getPOIType, POI_TYPES } from './amapAroundData'
+import { ifError } from 'assert';
 
 const { Option } = Select
 const { TabPane } = Tabs;
@@ -40,19 +43,25 @@ function openNotificationWithIcon(type, message) {
 function AddBuilding(props) {
   const { getFieldDecorator } = props.form;
 
+  const [poi, setPoi] = useState([])
+
+  // 视频上传按钮是否 禁用
+  const [fileUploadDisabled, setFileUploadDisabled] = useState(false)
+
+  // 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)
-      }, [])
-    }
+        setPoi(POI_TYPES)
+      }
+    }, [])
   }
 
    // 获取详情信息
    function getById(currentId) {
-
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       if (res.openingDate !== null) {
         res.openingDate = moment(res.openingDate)
@@ -65,7 +74,19 @@ 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)
+        // 视频上传按钮禁用
+        setFileUploadDisabled(true)
+      }
+      if (res.videoImage) {
+        res.videoImage = res.videoImage[0].url
+      }
+      setPoi(res.mapJson || [])
       props.form.setFieldsValue(res)
+      props.onSuccess(res)
     })
   }
 
@@ -79,26 +100,126 @@ function AddBuilding(props) {
   }
 
   function addBuilding(data) {
+    // console.log('poi: ', poi)
+    data.mapJson = poi
     data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
     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 }))
+    if (data.videoUrl) {
+      // console.log(data.videoUrl[0])
+      data.videoUrl = data.videoUrl[0]
+    }
+    
     if (data.tag) {
       data.tag = data.tag.map((item, _) => ({ tagName: item }))
     }
 
+    if (data.videoImage) {
+      data.videoImage = [{ imgType: 'videoImage', url: data.videoImage, orderNo: 1 }]
+    }
+
     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)
+      // 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 (fileUploadDisabled) {
+        openNotificationWithIcon('error', '项目视频，只允许上传一个')
+        reject()
+      } else if (file.type === 'video/mp4' || file.type === '.mp4') {
+          setFileUploadDisabled(true)
+          resolve(file)
+      } else {
+        openNotificationWithIcon('error', '项目视频，仅支持MP4格式')
+        reject()
+      }
+    })
+  }
+
+  // 周边设施 回调
+  function getMapScope(e) {
+    const coordinate = props.form.getFieldValue('coordinate').split(',')
+    const poiData = [].concat(POI_TYPES)
+    poiData.map(item => {
+      getAroundData({ types: item.key, location: `${coordinate[1]},${coordinate[0]}`, radius: e }).then(res => {
+        const { pois } = res
+        setFormMapScopeValue(item.key, pois)
+      }).catch(err => {
+        console.log(err.message)
+        openNotificationWithIcon('error', '周边数据获取失败')
+      })
+    })
+  }
+
+  function setFormMapScopeValue(key, pois) {
+    const poiArray = pois.map(p => {
+      return {
+        address: p.address,
+        adname: p.adname,
+        cityname: p.cityname,
+        distance: p.distance,
+        id: p.id,
+        location: p.location,
+        name: p.name,
+        pname: p.pname,
+        shopinfo: p.shopinfo,
+        type: p.type,
+        typecode: p.typecode,
+      }
+    })
+    
+    // 设置表单值
+    getFormMapScopeName(key, { data: poiArray })
+
+    const poiData = [].concat(POI_TYPES)
+    const newPoi = poiData.map(m => {
+      if (m.key === key) {
+        m.data = poiArray
+      }
+      return m
+    })
+    setPoi(newPoi)
+  }
+
+  function getFormMapScopeName(keyType, item) {
+    switch (keyType) {
+      case POI_TYPES_KETY.Transport:
+        props.form.setFieldsValue({ buildingTransport: item.data.map(t => t.name).join(',') })
+        return 'buildingTransport';
+      case POI_TYPES_KETY.Bank:
+        props.form.setFieldsValue({ buildingBank: item.data.map(t => t.name).join(',') })
+        return 'buildingBank';
+      case POI_TYPES_KETY.Edu:
+        props.form.setFieldsValue({ buildingEdu: item.data.map(t => t.name).join(',') })
+        return 'buildingEdu';
+      case POI_TYPES_KETY.Hospital:
+        props.form.setFieldsValue({ buildingHospital: item.data.map(t => t.name).join(',') })
+        return 'buildingHospital';
+      case POI_TYPES_KETY.Restaurant:
+        props.form.setFieldsValue({ buildingRestaurant: item.data.map(t => t.name).join(',') })
+        return 'buildingRestaurant';
+      case POI_TYPES_KETY.Mall:
+        props.form.setFieldsValue({ buildingMall: item.data.map(t => t.name).join(',') })
+        return 'buildingMall';
+      default:
+    }
+  }
+
   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="楼盘编号" >
@@ -111,11 +232,13 @@ function AddBuilding(props) {
               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²
@@ -146,7 +269,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,20 +282,42 @@ function AddBuilding(props) {
           <Form.Item label="项目标签" >
             {getFieldDecorator('tag')(
               <Select mode="tags" placeholder="输入后选中" style={{ width: '1016px' }}>
-                
+
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目主图" help="建议图片尺寸：640px*360px">
-            {getFieldDecorator('avatarImage')(
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：1920*1080，比例16:9">
+            {getFieldDecorator('videoUrl')(
+              // disabled={fileUploadDisabled}
+              <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" />,
+            )}
+          </Form.Item>
+          <Form.Item label="视频封面图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于视频封面" >
+            {getFieldDecorator('videoImage', {
+              rules: [{ required: true, message: '请选择视频封面图' }],
+            })(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘详情">
+            {getFieldDecorator('avatarImage', {
+              rules: [{ required: true, message: '请选择项目主图' }],
+            })(
+              <ImageListUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘封面图" help="建议图片尺寸：670*377px，比例16:9,格式：jpg，用于楼盘列表">
+            {getFieldDecorator('listImage', {
+              rules: [{ required: true, message: '请选择列表图' }],
+            })(
               <ImageListUpload />,
             )}
           </Form.Item>
-          <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
+          {/* <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
             {getFieldDecorator('mapImg')(
               <ImageUpload />,
             )}
-          </Form.Item>
+          </Form.Item> */}
           {/* <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
             {getFieldDecorator('poster')(
               <ImageUpload />,
@@ -183,7 +330,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>
@@ -198,16 +347,34 @@ function AddBuilding(props) {
             )}
           </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' }} onChange={e => getMapScope(e)}>
+                <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,275 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal, Layout } from 'antd';
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+
+const { Header, Footer, Sider, Content } = Layout;
+
+const modalEdiFormItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+};
+
+/**
+ * 弹框
+ */
+function ModalEdi(props) {
+  const { apartment, buildingId, apartmentId } = props.visibleData
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+
+  if (!props.visibleData) {
+    console.error('缺少visibleData参数!')
+  }
+
+  useEffect(() => {
+    setVisibleData(props.visibleData)
+    props.form.setFieldsValue({ apartmentId, apartmentName: apartment !== '' ? apartment.apartmentName : '' })
+  }, [props.visibleData.visible])
+
+  function handleOk(e) {
+    // console.log(e);
+    props.onCancel();
+  }
+
+  function handleCancel(e) {
+    // console.log(e);
+    props.onCancel();
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        submitData(values)
+      }
+    });
+  }
+
+  function submitData(data) {
+    if (buildingId === '' || buildingId === undefined) {
+      return
+    }
+    if (data.img) {
+        // 如果是 名称 和 图片一起编辑，就穿最新的图片
+      data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    } else {
+        // 如果是 名称 和 图片一起编辑，就穿最新的图片
+      data.img = visibleData.apartment.buildingImgList
+    }
+    data.buildingId = buildingId;
+    data.apartmentType = 'photo'
+    const api = (data.apartmentId !== undefined && data.apartmentId !== '') ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      handleCancel()
+      props.onSuccess()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('error', err)
+    })
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Modal
+          title="编辑"
+          visible={visibleData.visible}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          width={700}
+          footer={null}
+        >
+         <Form {...modalEdiFormItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="编号" style={{ display: 'none' }}>
+              {getFieldDecorator('apartmentId')(<Input />)}
+          </Form.Item>
+          <Form.Item label="相册名称">
+            {getFieldDecorator('apartmentName', {
+              rules: [
+                {
+                  required: true,
+                  message: '请输入相册名称',
+                },
+                {
+                  max: 10,
+                  message: '不超过10个字符',
+                },
+              ],
+            })(<Input />)}
+          </Form.Item>
+          {
+            !props.noImage && <Form.Item label="选择图片">
+            {getFieldDecorator('img', {
+              rules: [
+                {
+                  required: true,
+                  message: '请选择图片',
+                },
+              ],
+            })(<ImageListUpload />)}
+          </Form.Item>
+          }
+          <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+            </Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => handleCancel()}>
+              取消
+            </Button>
+          </Form.Item>
+         </Form>
+        </Modal>
+    </>
+  )
+}
+
+const WrappedModalEdiForm = Form.create({ name: 'ModalEdi' })(ModalEdi);
+
+/**
+ * 模块
+ */
+function BuildingImageModel(props) {
+  const [imageList, setImageList] = useState([])
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+
+  useEffect(() => {
+    setImageList(getImgUrl())
+  }, [props.apartment.apartmentId])
+
+  function getImgUrl() {
+    return ((props.apartment.buildingImgList || [])).map(item => item.url)
+  }
+
+  function submitData(data) {
+    const { apartmentId } = props.apartment
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    data.buildingId = props.apartment.buildingId;
+    data.apartmentType = 'photo'
+    const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      // openNotificationWithIcon('error', err)
+    })
+  }
+
+  function onImageChange(e) {
+    setImageList(e)
+       
+    // 新增加图片后，更新后端数据
+    const img = e.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    submitData({ ...props.apartment, img })
+  }
+
+  function edi() {
+    setVisibleData({ visible: true, buildingId: props.apartment.buildingId, apartmentId: props.apartment.apartmentId, apartment: props.apartment })
+  }
+
+  function onCancel(e) {
+    setVisibleData({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  }
+
+  function deletePhoto() {
+    request({ ...apis.building.buildingApartmentDelete, urlData: { id: props.apartment.apartmentId } }).then(() => {
+      openNotificationWithIcon('success', '操作成功')
+      props.onSuccess()
+    }).catch(err => {
+
+    })
+  }
+
+  return (
+    <>
+      <span style={{ marginTop: '10px', marginBottom: '10px' }}>{props.apartment.apartmentName}({imageList.length})</span>
+      <Button type="link" style={{ color: 'blue' }} onClick={() => edi()}>重命名</Button>
+      <Button type="link" style={{ color: 'blue' }} onClick={() => deletePhoto()}>删除相册</Button>
+      <ImageListUpload value={imageList} onChange={onImageChange} unlimited/>
+
+       {/* 编辑页 */}
+       <WrappedModalEdiForm visibleData={visibleData} onCancel={e => onCancel(e)} onSuccess={() => props.onSuccess()} noImage/>
+       <hr />
+    </>
+  )
+}
+
+/**
+ * 主体
+ */
+function buildingImage(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  const [imageList, setImageList] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList()
+  }, [props.building.buildingId])
+ 
+
+  function edi() {
+    setVisibleData({ visible: true, buildingId: props.building.buildingId, apartmentId: '', apartment: '' })
+  }
+
+  function onCancel(e) {
+    setVisibleData({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  }
+
+  function onSuccess(e) {
+    getList()
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'photo' } }).then(res => {
+      setImageList(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  return (
+    <>
+      <Button type="primary" onClick={() => edi()}>新增</Button>
+      <Layout style={{ background: '#fff' }}>
+        {
+          imageList.map(item => <Content><BuildingImageModel apartment={item} key={item.apartmentId} onSuccess={e => onSuccess(e)}/></Content>)
+        }
+      </Layout>
+
+      {/* 编辑页 */}
+      <WrappedModalEdiForm visibleData={visibleData} onCancel={e => onCancel(e)} onSuccess={e => onSuccess(e)}/>
+    </>
+  )
+}
+
+export default buildingImage

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 = [
   {
@@ -51,7 +53,7 @@ function imageSet(props) {
 
   function getList(params) {
     // 网路请求
-    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params } }).then(res => {
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'apart' } }).then(res => {
       setData(res)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
@@ -82,13 +84,22 @@ function imageSet(props) {
    * @param {*} record
    */
   function deleteApartment(record) {
-    // 网路请求
-    request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
-      getList()
-      openNotificationWithIcon('success', '操作成功')
-    }).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,
@@ -118,6 +118,7 @@ class ModalImage extends React.Component {
     // TODO 这里应该是要支持多图，但是封装的控件没有
     data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
     data.buildingId = this.props.visibleData.buildingId;
+    data.apartmentType = 'apart'
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
 
     // 网路请求
@@ -162,23 +163,18 @@ class ModalImage extends React.Component {
               <Form.Item label="编号" style={{ display: 'none' }}>
                   {getFieldDecorator('apartmentId')(<Input />)}
               </Form.Item>
-              <Form.Item label="名称">
+              <Form.Item label="户型名称">
                 {getFieldDecorator('apartmentName', {
-                  rules: [{ required: true, message: '请输入名称' }],
-                })(<Input />)}
-              </Form.Item>
-              <Form.Item label="类型">
-                {getFieldDecorator('apartmentType', {
-                  rules: [{ required: true, message: '请选择类型' }],
-                })(
-                  <Select placeholder="类型">
-                    <Option value="apart">户型</Option>
-                    <Option value="photo">相册</Option>
-                  </Select>,
-                )}
+                  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>)
@@ -188,27 +184,20 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="图片">
               {getFieldDecorator('img', {
-                  rules: [{ required: true, message: '请选择图片' }],
+                  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

@@ -140,10 +140,11 @@ const Poster = props => {
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
       <div >
-        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
+        <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
+          <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>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘海报</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
           <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

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

@@ -84,9 +84,10 @@ const Share = props => {
       <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
     </div>
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-      <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' }}>楼盘分享图</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘分享好友</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

@@ -86,7 +86,7 @@ function CartBody(props) {
           openNotificationWithIcon('success', '操作成功')
           props.onSuccess()
         }).catch(err => {
-          openNotificationWithIcon('error', err.message)
+          // openNotificationWithIcon('error', err.message)
         })
 
         modal.destroy();
@@ -97,13 +97,13 @@ function CartBody(props) {
     });
   }
 
-  const { buildingImg = []} = data
-
+  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={(buildingImg[0] || {}).url} 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}>
@@ -118,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}>
@@ -220,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) {
@@ -238,6 +238,7 @@ function body(props) {
    */
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 9 })
   }
 
 
@@ -269,7 +270,7 @@ 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>
@@ -291,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>
@@ -323,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} pageSize={dataSource.size} current={dataSource.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
       </div>
     </>
   );

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: '类型名称',

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);
     })
@@ -41,6 +41,7 @@ export default (props) => {
     onChange(val)
   }
 
+  console.log(value, typeof value)
   return (
     <div>
       <div onClick={() => setVisible(true)}>{news.newsName}</div>

src/pages/carouselFigure/advertisingList.jsx

@@ -55,13 +55,13 @@ const toEdit = (contentId) => () => {
       align: 'center',
       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: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',

src/pages/carouselFigure/editAdvertising.jsx

@@ -77,11 +77,11 @@ import SelectGroup from './SelectGroup';
         value: data.buildingId,
       },
       {
-        label: '商品图片',
+        label: '开屏广告',
         name: 'image',
         type: FieldTypes.ImageUploader,
         value: data.image,
-        help: '建议图片尺寸：640px*960px',
+        help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
       },
       {
         label: '标题',

src/pages/carouselFigure/editCarousel.jsx

@@ -28,15 +28,19 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let locationType = false
 
   const setExtraData = data => {
+    console.log(data, 'data');
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
-
+    
     buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
   }
 
     
@@ -81,11 +85,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           value: data.buildingId,
         },
         {
-          label: '商品图片',
+          label: locationType ? '积分商城轮播图' : '首页轮播图',
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: '建议图片尺寸：640px*330px',
+          help: locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播':'建议图片尺寸：750*600px，比例5:4,格式：jpg，用于首页顶部banner轮播',
         },
         {
           label: '标题',

src/pages/channel/channelList.jsx

@@ -72,12 +72,6 @@ const columns = [
     key: 'recommendCount',
     align: 'center',
   },
-  {
-    title: '邀请经纪人',
-    dataIndex: 'inviteCount',
-    key: 'inviteCount',
-    align: 'center',
-  },
   {
     title: '操作',
     dataIndex: '',

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

@@ -21,18 +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)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -49,8 +50,12 @@ class ModalAttribution extends React.Component {
   }
 
   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
@@ -68,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()
@@ -88,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: '电话',
@@ -108,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/components/recommend.jsx

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

src/pages/customer/customerlist/customerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table } from 'antd';
+import { Form, Table, Pagination } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from './style.less';
 import apis from '../../../services/apis';
@@ -16,6 +16,8 @@ function header(props) {
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([{ visitRecords: [] }])
+  const [dataConsultant, setDataonsultant] = useState({})
+  const [intentionData, setIntentionData] = useState([])
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -31,9 +33,13 @@ function header(props) {
 
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
       setData(res)
+      setDataonsultant(res.geoInfo)
     })
   }
-
+// 分页
+  const changePageNum = pageNumber => {
+    // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
   const columns = [
     {
       title: '访问事件',
@@ -56,16 +62,79 @@ function header(props) {
       render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
     },
   ]
+  // 意向
+  const intention = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      width: 150,
+      render: (_, record) => <span>香颂半岛</span>,
+    },
+    {
+      title: 'Address',
+      dataIndex: 'address',
+      render: (_, record) => <span style={{ marginLeft: '55%' }}>22</span>,
+    },
+  ];
+
+for (let i = 0; i < 100; i++) {
+  intentionData.push({
+    key: i,
+    name: `Edward King ${i}`,
+    age: 32,
+    address: `London, Park Lane no. ${i}`,
+  });
+}
   return (
     <>
       <div className={styles.cardBox}>
-        <div className={styles.leftBox}>
-          <p className={styles.tit}>置业顾问信息</p>
-          <img className={styles.touxiang} src={ data.consultant && data.consultant.picture } />
-          <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
-          <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p>
-          <p className={styles.infoItem}>岗位：{ data.consultant && data.consultant.post }</p>
+     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={styles.rightBox}>
+          <p className={styles.tit}>客户信息</p>
+          <img className={styles.touxiang} src={ data.picture && data.picture } />
+          <div className={styles.right}>
+            <p className={styles.rightItem}>用户名称：{ data.name }</p>
+            <p className={styles.rightItem}>手机号码：{ data.phone }</p>
+            <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+          </div>
+          <div className={styles.Centered}>
+          <p>访问时长：{ data.duration }秒</p>
+          <p>访问次数：{ data.visitTimes }</p>
+          <p className={styles.rightItem}>客户描述：{ data.describe }</p>
+          {/* <p>预约人数：{ data.visiteNum }</p> */}
+          </div>
+          <div className={styles.rightCentered}>
+          <p >需求类型：{ data.demandType }</p>
+          <p >价格区间：{data.priceRange }</p>
+          <p >物业类型：{ data.realtyManageType }</p>
+          {/* <p>预约人数：{ data.visiteNum }</p> */}
+          </div>
+          {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+          <div className={styles.rightInfo}>
+            <p className={styles.rightItem}>国家：{ dataConsultant&&dataConsultant.country }</p>
+            <p className={styles.rightItem}>省份：{ dataConsultant&&dataConsultant.provience }</p>
+            <p className={styles.rightItem}>城市：{dataConsultant&&dataConsultant.city }</p>
+            <p className={styles.rightItem}>来访渠道：活动分享</p>
+            {/* <p className={styles.rightItem}>详细信息：</p> */}
+            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */} 
+            {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+          </div>
+        </div>
+        
+      </div>
+      <br></br>
+      <div className={styles.cardBox}>
+        <div className={styles.rightBoxCentre}>
+        <p className={styles.tit}>置业顾问信息</p>
+          <img className={styles.touxiang} src={ data.picture && data.picture } />
+          <p className={styles.infoItem}>曹玉文</p>
+          <div className={styles.right}>
+          {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
+          <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
           <p className={styles.infoItem}>号码：{ data.consultant && data.consultant.phone } </p>
+          <p className={styles.infoItem}>岗位：{ data.consultant && data.consultant.post }</p>
+          </div>
+          <div className={styles.left}>
           <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.company } </p>
           <p className={styles.infoItem}>
             所属项目：
@@ -73,37 +142,24 @@ function header(props) {
               data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
             }
           </p>
+          </div>
         </div>
-        <div className={styles.rightBox}>
-          <p className={styles.tit}>客户信息</p>
-          <img className={styles.touxiang} src={ data.picture && data.picture } />
-          <div className={styles.right}>
-            <p className={styles.rightItem}>用户名称：{ data.name }</p>
-            <p className={styles.rightItem}>手机号码：{ data.phone }</p>
-            <p className={styles.rightItem}>来访渠道：活动分享</p>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div className={styles.leftBoxCentre}>
+          <div className={styles.tit}>
+                <span>项目名称</span>
+                <span style={{ marginLeft: '47%' }}>项目名称</span>
           </div>
-          <p className={styles.rightItem}>访问时长：{ data.duration }秒</p>
-          <p className={styles.rightItem}>访问次数：{ data.visitTimes }</p>
-          <p className={styles.rightItem}>预约人数：{ data.visiteNum }</p>
-          <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}>详细信息：</p>
-            <p className={styles.rightItem}>意向项目：{data.intention }</p>
-            <p className={styles.rightItem}>价格区间：{data.priceRange }</p>
-            <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p>
-            <p className={styles.rightItem}>客户描述：{ data.describe }</p>
-            <p className={styles.rightItem}>需求类型：{ data.demandType }</p>
-            <p className={styles.rightItem}>物业类型：{ data.realtyManageType }</p>
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          <div className={styles.infoItem}>
+          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={{ pageSize: 50 }} scroll={{ y: 240 }}/>,
           </div>
         </div>
+
       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table dataSource={data.visitRecords} columns={columns} pagination={false} rowKey="customerDetail" />
+        <Table showQuickJumper defaultCurrent={1} dataSource={data.visitRecords} columns={columns} current={50} />
       </div>
 
     </>

src/pages/customer/customerlist/index.jsx

@@ -8,6 +8,7 @@ import router from 'umi/router';
 
 import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
+import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import AuthButton from '@/components/AuthButton';
@@ -37,7 +38,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
@@ -50,6 +51,9 @@ function body(props) {
   const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
   // 变更状态 ============= end
 
+  // 推荐客户
+  const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -76,6 +80,7 @@ function body(props) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
   }
 
   // 提交事件
@@ -123,22 +128,33 @@ 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: '' })
+    setRecommendVisibleData({ 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: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
     setRecordVisibleData({ visible: false, customerId: '' })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
+
+  // 推荐客户
+  function showRecommend(personId) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: true, customerId: personId })
+  }
   function toCustomerDateil(record) {
     router.push({
       pathname: '/customer/customerlist/customerDetail',
@@ -147,6 +163,15 @@ function body(props) {
       },
     });
   }
+  // 私客详情
+  function publicCustomerDetail(record) {
+    router.push({
+      pathname: '/customer/customerlist/publicCustomerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
 
   function exportCustomer () {
     const fieldsValue = getFieldsValue()
@@ -173,9 +198,18 @@ function body(props) {
 
   // 关闭调整归属的窗口
   function closeAttribution() {
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    alert(1)
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
+  // 回调关闭所有弹框
+  function closeAll() {
+    alert(1)
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+  }
 
   const publicColumns = [
     {
@@ -202,13 +236,41 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
-    // {
-    //   title: '推广人员',
-    //   dataIndex: 'sharePersonName',
-    //   key: 'sharePersonName',
-    //   align: 'center',
-    //   width: '15%',
-    // },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '25%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <AuthButton>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
+          </AuthButton>
+          &nbsp;&nbsp;
+          <AuthButton>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+          </AuthButton>
+        </>
+      ),
+    },
   ]
 
   const privateColumns = [
@@ -290,12 +352,13 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
+            &nbsp;
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
             &nbsp;&nbsp;
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
-            <br />
+            &nbsp;&nbsp;
           <AuthButton name="admin.customer.recommend.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
@@ -303,6 +366,10 @@ function body(props) {
           <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
+            &nbsp;
+          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.customerId)}>推荐客户</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -383,10 +450,13 @@ function body(props) {
       <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()}/>
 
       {/* 积分记录 */}
-      <IntegralRecord visibleData={recordVisibleData} />
+      <IntegralRecord visibleData={recordVisibleData} onCancel={() => closeAll()} />
 
       {/* 变更状态 */}
-      <ChangeStatus visibleData={statusVisibleData} />
+      <ChangeStatus visibleData={statusVisibleData} onCancel={() => closeAll()}/>
+
+      {/* 推荐客户 */}
+      <ModalRecommendRecord visibleData={recommendVisibleData} onCancel={() => closeAll()}/>
     </>
   );
 }

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -0,0 +1,137 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table, Pagination } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import publicStyle from './publicStyle.less';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import moment from 'moment';
+
+import router from 'umi/router';
+
+
+function header(props) {
+  /**
+   * @param {*} props
+   * @returns
+   */
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{ visitRecords: [] }])
+  const [dataConsultant, setDataonsultant] = useState({})
+  const [intentionData, setIntentionData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+  }, [])
+
+  // 查询
+  function getById(params) {
+    const { id } = props.location.query;
+    if (id === '' || id === undefined) {
+      return
+    }
+
+    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
+      setData(res)
+      setDataonsultant(res.geoInfo)
+    })
+  }
+// 分页
+  const changePageNum = pageNumber => {
+    // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'activity',
+      key: 'activity',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'visitDuration',
+      key: 'visitDuration',
+      align: 'center',
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
+    },
+  ]
+  // 意向
+  const intention = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      width: 150,
+      render: (_, record) => <span>香颂半岛</span>,
+    },
+    {
+      title: 'Address',
+      dataIndex: 'address',
+      render: (_, record) => <span style={{ marginLeft: '55%' }}>22</span>,
+    },
+  ];
+
+for (let i = 0; i < 1; i++ ) {
+  intentionData.push({
+    key: i,
+    name: `Edward King ${i}`,
+    age: 32,
+    address: `London, Park Lane no. ${i}`,
+  });
+}
+  return (
+    <>
+      <div className={publicStyle.cardBox}>
+     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.rightBox}>
+          <p className={publicStyle.tit}>客户信息</p>
+          <img className={publicStyle.touxiang} src={ data.picture && data.picture } />
+          <div className={publicStyle.right}>
+            <p className={publicStyle.rightItem}>用户名称：{ data.name }</p>
+            <p className={publicStyle.rightItem}>手机号码：{ data.phone }</p>
+            <p className={publicStyle.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+          </div>
+          <div className={publicStyle.Centered}>
+          <p>访问时长：{ data.duration }秒</p>
+          <p>访问次数：{ data.visitTimes }</p>
+          <p className={publicStyle.rightItem}>来访渠道：活动分享</p>
+          {/* <p>预约人数：{ data.visiteNum }</p> */}
+          </div>
+          {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+          <div className={publicStyle.rightInfo}>
+            <p className={publicStyle.rightItem}>国家：{ dataConsultant && dataConsultant.country }</p>
+            <p className={publicStyle.rightItem}>省份：{ dataConsultant && dataConsultant.provience }</p>
+            <p className={publicStyle.rightItem}>城市：{dataConsultant && dataConsultant.city }</p>
+            {/* <p className={styles.rightItem}>详细信息：</p> */}
+            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */} 
+            {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+          </div>
+        </div>
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
+        <div className={publicStyle.leftBoxCentre}>
+          <div className={publicStyle.tit}>
+                <span>项目名称</span>
+                <span style={{ marginLeft: '47%' }}>项目名称</span>
+          </div>
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          <div className={publicStyle.infoItem}>
+          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={{ pageSize: 50 }} scroll={{ y: 240 }}/>,
+          </div>
+        </div>
+      </div>
+      <div className={publicStyle.recordBox}>
+        <p className={publicStyle.tableName}>访问记录</p>
+        <Table dataSource={data.visitRecords} columns={columns} rowKey="customerDetail" onChange={changePageNum} showQuickJumper/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/customer/customerlist/publicStyle.less

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

src/pages/customer/customerlist/style.less

@@ -77,9 +77,21 @@
 .cardBox{
   display: flex;
   .leftBox{
-    width:342px;
+    width:1000px;
     min-width:342px;
-    height:511px;
+    height:1000px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:865px;
+    min-width:342px;
+    height:290px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
     border-radius:8px;
@@ -90,8 +102,31 @@
   }
   .rightBox{
     width:-webkit-fill-available;
-    height:511px;
-    min-width: 800px;
+    height:315px;
+    min-width: 100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .rightBoxCentre{
+    width:865px;
+    height:315px;
+    min-width: 60%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .leftBoxCentre{
+    width:100%;
+    height:315px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
     border-radius:8px;
@@ -128,10 +163,33 @@
     top:108px;
     left:170px;
   }
+  .left{
+    position: absolute;
+    top:108px;
+    left:60%;
+  }
   .rightInfo{
     position: absolute;
-    top:50px;
-    left:50%;
+    top:108px;
+    left:80%;
+  }
+
+  .Centered{
+    position: absolute;
+    top:108px;
+    left:30%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 19px;
+  }
+
+  .rightCentered{
+    position: absolute;
+    top:108px;
+    left:55%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 19px;
   }
   
 }

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
         },
       },
     ]
@@ -210,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',
       },
       {

src/pages/customer/recommendCustomer/audit.jsx

@@ -38,7 +38,7 @@ function body(props) {
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' })
@@ -62,7 +62,7 @@ function body(props) {
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
-    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('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
       openNotificationWithIcon('success', '操作成功')
       router.go(-1)
@@ -90,16 +90,17 @@ function body(props) {
 
   // 显示选择置业顾问的窗口
   function showConsultant() {
-    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant') })
+    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: '' })
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
   }
 
   // 选择置业顾问弹窗
   function consultantSuccess(e) {
+    console.log(e)
     props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
   }
 
@@ -113,6 +114,13 @@ 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

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

@@ -21,18 +21,18 @@ 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) {
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -49,8 +49,12 @@ class ModalAttribution extends React.Component {
   }
 
   getList(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
@@ -68,21 +72,27 @@ 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 => {
-      // 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)
-    })
+
+    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() {
@@ -94,8 +104,8 @@ class ModalAttribution extends React.Component {
       // },
       {
         title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'userName',
+        key: 'userName',
       },
       {
         title: '电话',
@@ -109,15 +119,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/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))} checkFirst></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

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/achieve.jsx

@@ -132,25 +132,25 @@ const columns = [
             <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} current={data.current}/>
           </div>
-        </TabPane>
+        </TabPane> */}
       </Tabs>,
     </>
   )

src/pages/integralMall/editGoods.jsx

@@ -40,11 +40,18 @@ const header = props => {
       ]
     },
     {
-      label: '商品图片',
+      label: '商品封面图',
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: goodsData.imgUrl,
-      help: '建议图片尺寸：164px*164px',
+      help: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于商品封面图',
+    },
+    {
+      label: '商品主图',
+      name: 'detailImgUrl',
+      type: FieldTypes.ImageUploader,
+      value: goodsData.detailImgUrl,
+      help: '建议图片尺寸：750*750px，比例1:1,格式：jpg，用于商品主图',
     },
     {
       label: '商品名称',

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/editNewsList.jsx

@@ -64,11 +64,11 @@ const { TextArea } = Input;
         ]
       },
       {
-        label: '资讯图片',
+        label: '资讯列表',
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,
-        help: '建议图片尺寸：660px*416px',
+        help: '建议图片尺寸：320*256px，比例5:4,格式：jpg，用于资讯列表',
       },
       {
         label: '资讯标题',
@@ -215,9 +215,10 @@ const { TextArea } = Input;
 
         <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' }}>资讯海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -290,9 +291,10 @@ const { TextArea } = Input;
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <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' }}>资讯分享好友图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯分享好友</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

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',
@@ -191,10 +191,10 @@ const Edit = (props) => {
       value: userData.buildingId
     },
     {
-      label: '头像',
+      label: '置业顾问头像',
       name: 'photo',
       type: FieldTypes.ImageUploader,
-      extra: '建议图片大小 640 * 640',
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像',
       value: userData.photo,
       rules: [
         { required: true, message: '请选择头像' },

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,92 +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
   function getList (params) {
     // 网路请求
     console.log(props, '1111')
-    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
-      console.log('data:', data)
-      setData(data.imgList)
+    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) {
-    // 网路请求
-    request({ ...apis.system.updateVerify, 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 = () => {
 
+      })
+    }
 
-    Modal.confirm({
-      title: '审核通过后，将给当前用户发放积分 确认审核通过？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk () {
 
-        onVerify(1)
+
+    const handleOk = (data) => {
+
+      if (data == 1) {
+        Modal.confirm({
+          title: '审核通过后，将给当前用户发放积分 确认审核通过？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk () {
+
+            onVerify(1)
+          }
+        });
+      } else {
+        setVisible(true)
       }
-    });
+    }
+
+    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' }}>
-        <AuthButton name="admin.documentVerify.id.put" noRight={null}>
-          <Button type="primary" onClick={() => handleOk()}>通过</Button>
-        </AuthButton>
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <AuthButton name="admin.documentVerify.id.put" noRight={null}>
-          <Button onClick={() => onVerify(2)}>不通过</Button>
-        </AuthButton>
-        &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

@@ -56,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 = [
@@ -80,38 +71,46 @@ function body(props) {
       title: '姓名',
       dataIndex: 'name',
       key: 'name',
+      align: 'center',
     },
     {
       title: '手机号',
       dataIndex: 'tel',
       key: 'tel',
+      align: 'center',
     },
     {
       title: '提交时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      render: (createDate) => moment(createDate).format('YYYY-MM-DD')
+      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) => (
         <>
           <AuthButton name="admin.documentVerify.id.get" noRight={null}>
-            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.verifyStatus === 0 ? '审核' : '查看' }</span>
+            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.unverified === 0 ? '查看' : '审核' }</span>
            </AuthButton>
         </>
       )

src/pages/system/document/see.jsx

@@ -1,62 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal } from 'antd'
-import { router } from 'umi';
-import ZmageImg from '../../../components/ZmageImg/ZmageImg'
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
-
-
-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(item =>
-              <Col span={6} key={item.documentImgId}>
-               <ZmageImg style={{ width: '300px', height: '400px' }} src={item.img} />
-              </Col>,
-            )
-          }
-        </Row>
-      </div>
-      <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-
-        <Button onClick={cancelPage}>返回</Button>
-
-      </div>
-
-
-    </>
-  )
-}
-
-export default body

src/pages/system/editPolicy.jsx

@@ -48,11 +48,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         value: policyData.cityId,
       },
       {
-        label: '政策图片',
+        label: '购房政策封面图',
         name: 'policyImg',
         type: FieldTypes.ImageUploader,
         value: policyData.policyImg,
-        help: '建议图片尺寸：660px*416px',
+        help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房百科列表',
       },
       {
         label: '政策标题',

src/services/apis.js

@@ -1,4 +1,6 @@
 const prefix = '/api/admin'
+// 高德地图
+const amapPrefix = '/gaode_amap'
 
 export default {
   image: {
@@ -236,6 +238,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`,
@@ -281,6 +288,11 @@ export default {
       url: `${prefix}/customer/recommend/export`,
       action: 'admin.customer.recommend.export.get',
     },
+    recommendClient: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/:id`,
+      action: 'admin.customer.recommend.get',
+    },
   },
   indexEcharts: {
     list:{
@@ -765,6 +777,16 @@ export default {
     method: 'post',
     action: 'admin.top.update.post',
   },
+  cancel: {
+    method: 'PUT',
+    url: `${prefix}/helpActivity/cancel/:id`,
+    action: 'admin.helpActivity.update.put',
+  },
+  send: {
+    url: `${prefix}/helpActivity/send/:id`,
+    method: 'PUT',
+    action: 'admin.helpActivity.update.put',
+  },
   record: {
     url: `${prefix}/helpRecord`,
     method: 'get',
@@ -827,6 +849,16 @@ export default {
     method: 'put',
     action: 'admin.taShareActivity.finish.put',
   },
+  send: {
+    url: `${prefix}/taShareActivity/send/:id`,
+    method: 'PUT',
+    action: 'admin.taShareActivity.finish.put',
+  },
+  cancel: {
+    method: 'PUT',
+    url: `${prefix}/taShareActivity/cancel/:id`,
+    action: 'admin.taShareActivity.finish.put',
+  },
   top: {
     url: `${prefix}/taShareActivity/weight`,
     method: 'put',
@@ -891,5 +923,11 @@ export default {
     method: 'GET',
     action: 'admin.posterTemplate.get',
   },
+ },
+ amap: { // 高德地图
+   webService: { // Web服务Api ---- 周边搜索
+     url: `${amapPrefix}/place/around`,
+     method: 'GET',
+   },
  }
 }

src/utils/request.js

@@ -65,7 +65,6 @@ request.interceptors.request.use((url, options) => {
 });
 
 request.interceptors.response.use(async (response, options) => {
-
   if (response && response.status) {
     if (response.status != 200) {
       const errorText = codeMessage[response.status] || response.statusText;
@@ -76,12 +75,17 @@ request.interceptors.response.use(async (response, options) => {
       });
       throw new Error(response.statusText);
     } else {
-      console.log('response.headers: ', response.headers)
-      console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      // console.log('response.headers: ', response.headers)
+      // console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
       if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
         return await response.clone().blob();
       }
 
+      // 高德地图的数据，直接返回
+      if (response.url.indexOf('gaode_amap') !== -1) {
+        return await response.clone().json();
+      }
+
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         if (code === 1001) {
@@ -92,7 +96,7 @@ request.interceptors.response.use(async (response, options) => {
           throw new Error('请登录系统');
         } else {
           notification.error({
-            message,
+            message: message || '请求错误',
             // description: message,
           });
           throw new Error(message);