Merge branch 'dev'

# Conflicts:
#	src/pages/customer/customerlist/index.jsx

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -42,10 +42,12 @@ class AvatarDropdown extends React.Component {
   }
 
   render() {
+    console.log(this.props, 'props')
     const {
       currentUser = {
         avatar: '',
         userName: '',
+        miniAppName: '',
       },
       menu,
     } = this.props;
@@ -78,10 +80,15 @@ class AvatarDropdown extends React.Component {
     return currentUser && currentUser.userName ? (
       <>
         <HeaderDropdown overlay={menuHeaderDropdown}>
-            <span className={`${styles.action} ${styles.account}`}>
-              <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
-              <span className={styles.name}>{currentUser.userName}</span>
-            </span>
+            <div className={`${styles.action} ${styles.account}`} style={{display:'flex'}}>
+              
+         <div style={{margin:'10px 0' }}>
+              <p align="right" className={styles.name}>{currentUser.loginName}</p>
+     
+              <p align="right" className={styles.name}>欢迎登录{currentUser.miniAppName}</p>
+          </div>
+          <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
+            </div>
         </HeaderDropdown>
 
         {/* 修改密码 */}

src/components/GlobalHeader/index.less

@@ -4,6 +4,11 @@
 .name {
 
   color: #fff;
+  padding: 0;
+  margin: 0;
+  height: 20px;
+  line-height: 20px;
+    
 }
 .logo {
   display: inline-block;
@@ -46,7 +51,7 @@
   .action {
     display: inline-block;
     height: 100%;
-    padding: 0 12px;
+    padding: 0 40px;
     cursor: pointer;
     transition: all 0.3s;
     > i {
@@ -68,8 +73,10 @@
   }
   .account {
     .avatar {
-      margin: ~'calc((@{layout-header-height} - 24px) / 2)' 0;
-      margin-right: 8px;
+      width: 44px;
+      height: 44px;
+      margin: ~'calc((@{layout-header-height} - 44px) / 2)' 0;
+      margin-left: 20px;
       color: @primary-color;
       vertical-align: top;
       background: rgba(255, 255, 255, 0.85);

src/components/SelectButton/channelSelect.jsx

@@ -0,0 +1,45 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const ChannelSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getChannelSelect();
+  }, [props.value])
+
+
+  const getChannelSelect = e => {
+    request({ ...apis.channelList.getList, params: { pageNumber: 1, pageSize: 999 } }).then(data => {
+        setData(data.channelNmae)
+        // 默认选中第一个
+    })
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '250px' }}
+      placeholder="请选择渠道"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(Item => (
+            <Option key={Item.channelId} value={Item.channelId}> {Item.channelName} </Option>
+          ))}
+      </Select>
+  )
+}
+export default ChannelSelect

src/global.less

@@ -10,12 +10,6 @@ body,
   filter: invert(80%);
 }
 
-.ant-layout {
-  min-height: 100vh;
-  background-color: #f8f8f8;
-  height: fit-content;
-}
-
 canvas {
   display: block;
 }
@@ -191,3 +185,10 @@ ol {
     border-top:none;
   }
 }
+:global {
+  .ant-layout {
+    min-height: 100vh;
+    background-color: #f8f8f8;
+    height: fit-content!important;
+  }  
+}

src/pages/activity/ActivityList.jsx

@@ -43,7 +43,7 @@ const header = props => {
   }, [])
 
   // 跳转到编辑商品
-  const toEditGoods = dynamicId => () => {
+  const toEditGoods = dynamicId  => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
@@ -196,7 +196,7 @@ const header = props => {
           {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
           {/* </AuthButton> */}
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            {(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>}
+            {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId,row.count)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
           
           {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}

src/pages/activity/dataRecord/index.jsx

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

src/pages/activity/dataRecord/table/shareNum.jsx

@@ -51,6 +51,7 @@ const date = {
             if (records.sharePersonType === 'drift') { return '游客' }
             if (records.sharePersonType === 'customer') { return '普通客户' }
             if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+            if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
           },
         },
         {
@@ -120,6 +121,7 @@ const date = {
                             <Option value="drift">游客</Option>
                             <Option value="customer">普通客户</Option>
                             <Option value="Realty Consultant">置业顾问</Option>
+                            <Option value="estate agent">专业经纪人</Option>
                         </Select>
                     )}
                 </Form.Item>

src/pages/activity/dataRecord/table/shares.jsx

@@ -51,6 +51,10 @@ const header = props => {
         if (records.sharePersonType === 'drift') { return '游客' }
         if (records.sharePersonType === 'customer') { return '普通客户' }
         if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+        if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
+      //   ESTATE_AGENT']:
+      //   return [{ isAgent: true }, '普通用户']
+      // case ROLE_CODE['CHANNEL_AGENT
       },
     },
     {
@@ -151,6 +155,8 @@ const header = props => {
               <Option value="drift">游客</Option>
               <Option value="customer">普通客户</Option>
               <Option value="Realty Consultant">置业顾问</Option>
+              <Option value="estate agent">专业经纪人</Option>
+              
             </Select>
           )}
         </Form.Item>

src/pages/activity/drainage/DrainageList.jsx

@@ -9,7 +9,7 @@ import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
 import ImageUploader from '../../../components/XForm/ImageUpload';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import Prompt from 'umi/prompt';
 
 const toEditList = (row) => () => {

src/pages/activity/drainage/detailDrainage.jsx

@@ -1,27 +1,27 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import apis from '../../../services/apis';
+import { Form, Button } from 'antd';
+// import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
-import request from '../../../utils/request'
-import AuthButton from '@/components/AuthButton';
+// import AuthButton from '@/components/AuthButton';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
 
 const cancelPage = () => {
-  router.go(-1)
-}
+  router.go(-1);
+};
 
 const BasicForm = props => {
-  const { drainageId } = props.location.query
-  const [data, setData] = useState({})
+  const { drainageId } = props.location.query;
+  const [data, setData] = useState({});
 
   useEffect(() => {
-    request({...apis.activity.detailDrainage,urlData: { id: drainageId }}).then((data) => {
+    request({ ...apis.activity.detailDrainage, urlData: { id: drainageId } }).then(data => {
       setData(data);
-    })
-  }, [])
+    });
+  }, []);
+
 
-  const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
   const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
@@ -34,54 +34,60 @@ const BasicForm = props => {
   };
   return (
     <>
-      <Form  {...formItemLayout}>
+      <Form {...formItemLayout}>
         <Form.Item label="H5活动编号：">
           <span>{data.drainageId}</span>
         </Form.Item>
         <Form.Item label="是否投放小程序：">
-        <span>{data.isMiniapp ? "是" : "否"}</span>
+          <span>{data.isMiniapp ? '是' : '否'}</span>
         </Form.Item>
         <Form.Item label="H5活动名称：">
-        <span>{data.name}</span>
+          <span>{data.name}</span>
         </Form.Item>
-        {data.isMiniapp && <Form.Item label="链接地址：">
-        <span>{data.h5Address}</span>
-        </Form.Item>}
+        {data.isMiniapp && (
+          <Form.Item label="链接地址：">
+            <span>{data.h5Address}</span>
+          </Form.Item>
+        )}
         <Form.Item label="上架状态：">
-        <span>{data.status === 1 ? "已上架" : "未上架"}</span>
+          <span>{data.status === 1 ? '已上架' : '未上架'}</span>
         </Form.Item>
         <Form.Item label="新建时间：">
-        <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+          <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </Form.Item>
         <Form.Item label="自动下架时间：">
-        <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+          <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </Form.Item>
         <Form.Item label="appid：">
-        <span>{data.appid}</span>
+          <span>{data.appid}</span>
         </Form.Item>
         <Form.Item label="secret：">
-        <span>{data.appSecret}</span>
+          <span>{data.appSecret}</span>
         </Form.Item>
         <Form.Item label="参与人数：">
-        <span>{data.enlistNum}</span>
+          <span>{data.enlistNum}</span>
         </Form.Item>
-        {data.isMiniapp && <Form.Item label="分享语：">
-        <span>{data.shareTitle}</span>
-        </Form.Item>}
-        {data.isMiniapp && <Form.Item label="分享图：">
-        <img src={data.shareImg} width="75px" height="60px" />
-        </Form.Item>}
-        {data.isMiniapp && <Form.Item label="中间页飞机图：">
-        <img src={data.middleImg} width="75px" height="166.7px" />
-        </Form.Item>}
+        {data.isMiniapp && (
+          <Form.Item label="分享语：">
+            <span>{data.shareTitle}</span>
+          </Form.Item>
+        )}
+        {data.isMiniapp && (
+          <Form.Item label="分享图：">
+            <img src={data.shareImg} width="75px" height="60px" alt="" />
+          </Form.Item>
+        )}
+        {data.isMiniapp && (
+          <Form.Item label="中间页飞机图：">
+            <img src={data.middleImg} width="75px" height="166.7px" alt="" />
+          </Form.Item>
+        )}
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button onClick={() => cancelPage()}>
-            取消
-          </Button>
+          <Button onClick={() => cancelPage()}>取消</Button>
         </Form.Item>
       </Form>
     </>
   );
-}
+};
 
-export default BasicForm
+export default BasicForm;

src/pages/activity/editActivity.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
+import Prompt from 'umi/prompt';
+import router from 'umi/router';
 import styles from '../style/GoodsList.less';
 import apis from '../../services/apis';
 import moment from 'moment';
-import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import request from '../../utils/request'
@@ -16,7 +17,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 Prompt from 'umi/prompt';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -36,6 +36,9 @@ const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1)
   const [activityStatus, setActivityStatus] = useState(1)
   const [disable, setDisable] = useState(false)
+  const [data, setData] = useState(1)
+  const [showSignupTime, setShowSignupTime] = useState([])
+
 
   const radioOnChange = e => {
     setIsEnlist(e.target.value)
@@ -45,14 +48,15 @@ const BasicForm = props => {
 
   // 查询详情
   const getDynamicData = dynamicId => {
-    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
-      console.log(data)
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+ 
       data.activityTime = [moment(data.startDate), moment(data.endDate)]
       data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
-
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data)
       setIsEnlist(data.isEnlist)
       setActivityStatus(data.activityStatus)
-      setDisable(data.activityStatus === 0 ? true : false)
+      setDisable(data.activityStatus === 0)
       props.form.setFieldsValue(data)
     })
   }
@@ -64,10 +68,33 @@ const BasicForm = props => {
       getDynamicData(dynamicId);
     }
   }, [])
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2)
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date()
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）'
+      }
+    }
+    return true
+  }
+
 
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+
       if (!err) {
         console.log('Received values of form: ', values);
         const { activityTime, signupTime } = values
@@ -82,6 +109,18 @@ const BasicForm = props => {
 
         console.log('submit data --->', values)
         if (dynamicId) {
+          const checks = checkTime()
+          if (checks != true) {
+            message.info(checks)
+            return
+          }
+          console.log(data.enlistNum,values.personNum,'143')
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数')
+            return
+          }
+
           values.dynamicId = dynamicId
           request({ ...apis.activity.update, data: values }).then(data => {
             message.info('保存成功')
@@ -106,6 +145,22 @@ const BasicForm = props => {
       }
     });
   }
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date)
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  }
 
   const { getFieldDecorator } = props.form;
   return (
@@ -169,7 +224,7 @@ const BasicForm = props => {
                 message: '请选择活动时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
         </Form.Item>
         <Form.Item label="活动地点">
           {getFieldDecorator('address', {
@@ -179,8 +234,9 @@ const BasicForm = props => {
                 message: '请输入活动地点',
               },
             ],
-          })(<Input disabled={activityStatus === 0 ? true : false} />)}
+          })(<Input />)}
         </Form.Item>
+        {/* disabled={activityStatus === 0 ? true : false} */}
         <Form.Item label="活动人数" help="当前活动最多可报名人数">
           {getFieldDecorator('personNum', {
             rules: [
@@ -188,8 +244,12 @@ const BasicForm = props => {
                 required: true,
                 message: '请输入活动人数',
               },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
             ],
-          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
+          })(<Input type="number" />)}
         </Form.Item>
         <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
           {getFieldDecorator('maxEnlistByPerson', {
@@ -199,7 +259,7 @@ const BasicForm = props => {
                 message: '请输入用户携带人数',
               },
             ],
-          })(<Input type="number" min={1} disabled={activityStatus === 0 ? true : false} />)}
+          })(<Input type="number" min={1} />)}
         </Form.Item>
         <Form.Item label="活动详情">
           {getFieldDecorator('desc')(<Wangedit />)}
@@ -212,10 +272,11 @@ const BasicForm = props => {
                 message: '请选择报名时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
         </Form.Item>
         <Form.Item label="权重">
           {getFieldDecorator('heavy', {
+
             rules: [
               {
                 required: true,
@@ -240,211 +301,209 @@ const BasicForm = props => {
 
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  const { dynamicId } = props.location.query
+const Poster = props => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
 
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
 
-  const Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
+        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)
+      })
+    }
+    // getMiniappName()
+  }, [])
+  
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
 
+  const submitPoster = () => {
     if (dynamicId) {
-      console.log(dynamicId, 'dynamicId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setPosterId(data[0].posterId)
-            changeImg(data[0].posterImg)
-            changeTextArea(data[0].posterDescription)
-            changeInput(data[0].posterTitle)
-          }
-        }).catch((err) => {
+      if (posterId) {
+        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)
         })
-        getMiniappName()
-      }, [])
-    } else {
-      getMiniappName()
-    }
-    // 获取小程序名称
-    const [miniappName, setMiniappName] = useState('')
-    function getMiniappName() {
-      request({ ...apis.building.getMiniappName }).then(res => {
-        console.log(res, "0000000000000")
-        setMiniappName(res)
-      })
-    }
-
-    const submitPoster = () => {
-      if (dynamicId) {
-        if (posterId) {
-          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 }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue } }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div>
-      <div style={{ display: 'flex' }}>
-        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-          <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' }}>进入活动查看详情</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <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 || 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={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </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 || '海报标题'}</p>
 
-        <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <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' }}>建议图片尺寸：640*670px，比例64:67,格式：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)} />
-          </div>
-          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <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 || '海报描述'}</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' }}>进入活动查看详情</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>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：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)} />
+        </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
         </div>
+
       </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button>
     </div>
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button>
+  </div>
+}
 
-  }
-
+const Share = props => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [dynamicId])
 
+  const submitShare = () => {
     if (dynamicId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
-        }).catch((err) => {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-      }, [dynamicId])
-    }
-
-    const submitShare = () => {
-      if (dynamicId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch(err => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div style={{ padding: '20px' }}>
-      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
-        <div>
-          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
-          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-        </div>
-      </div>
-      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
-        <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>
-        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>橙蕉互动</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </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={() => cancelPage()}>
-        取消
-      </Button>
     </div>
-  }
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <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>
+      <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={() => cancelPage()}>
+      取消
+    </Button>
+  </div>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { dynamicId } = props.location.query
 
   return (
     <div>
@@ -457,13 +516,13 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicId={dynamicId} />}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId}/>}
+        {tab === 'share' && <Share dynamicId={dynamicId}/>}
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/activity/ActivityList")
+        (location.pathname.startsWith('/activity/ActivityList')
           ? true
-          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
+          : (location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")))} />
     </div>
   );
 }

src/pages/activity/groupActivity/detailActivity.jsx

@@ -121,7 +121,7 @@ const BasicForm = props => {
           <img src={detailData.bannerListImg} height="125px" width="375px" />
         </Form.Item>
         <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+      <span>{`${moment(detailData.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span>
         </Form.Item>
         <Form.Item label="成团人数">
             <span>{detailData.groupBuyPeople}</span>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -5,7 +5,7 @@ import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'
@@ -27,367 +27,385 @@ const cancelPage = () => {
   });
 }
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  // 判断是否展示助力次数的输入框
-  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);
-    })
-  }, [])
+const Basic = props => {
+  const { dynamicData, disable, activityStatus, scoreData, groupActivityId } = props;
 
-    useEffect(() => {
-      if (groupActivityId) {
-      getDynamicData(groupActivityId);
-    }
-    }, [groupActivityId])
+  const fields = [
+    {
+      label: '选择项目',
+      name: 'buildingId',
+      render: <BuildSelect disabled={disable}/>,
+      value: dynamicData.buildingId,
+      rules: [
+        { required: true, message: '请选择项目' },
+      ],
+    },
+    {
+      label: '活动标题',
+      name: 'activityName',
+      type: FieldTypes.Text,
+      value: dynamicData.activityName,
+      rules: [
+        { required: true, message: '请输入活动标题' },
+      ]
+    },
+    {
+      label: '拼团详情主图',
+      name: 'mainImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.mainImg,
+      rules: [
+        { 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: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
+    },
+    {
+      label: '拼团封面图2',
+      name: 'bannerListImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.bannerListImg,
+      rules: [
+        { required: true, message: '请输入拼团封面图2' },
+      ],
+      help: '建议图片尺寸：750*250px，比例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' } },
+      rules: [
+        { required: true, message: '请选择活动时间' },
+      ],
+    },
+    {
+      label: '成团人数',
+      name: 'groupBuyPeople',
+      type: FieldTypes.Text,
+      value: dynamicData.groupBuyPeople,
+      props: { disabled: activityStatus === 0 },
+      help: '注：成团所需人数',
+      rules: [
+        { required: true, message: '请输入成团人数' },
+      ]
+    },
+    {
+      label: '所需积分',
+      name: 'integral',
+      type: FieldTypes.Text,
+      value: dynamicData.integral,
+      props: { disabled: activityStatus === 0 },
+      help: `注：用户平均积分${scoreData.averageScore}`,
+      rules: [
+        { required: true, message: '请输入所需积分' },
+      ]
+    },
+    {
+      label: '活动说明',
+      name: 'descImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.descImg,
+      rules: [
+        { required: true, message: '请输入活动说明' },
+      ],
+      help: '建议宽度：750px，高度不限，格式：jpg，用于活动详情',
+    },
+    {
+      label: '权重',
+      name: 'heavy',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 80}} />,
+      value: dynamicData.heavy,
+      rules: [
+        { required: true, message: '请输入权重' },
+      ],
+      help: '数字越大越靠前',
+    },
+  ]
 
-    // 详情
-    const getDynamicData = (groupActivityId) => {
-      request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
-        setDynamicData(data)
-        setActivityStatus(data.activityStatus)
-        setDisable(data.activityStatus === 0 ? true : false)
-      })
+  function compareDate(dateTime1, dateTime2) {
+    return new Date(dateTime1) > new Date(dateTime2);
   }
 
-  const radioOnChange = e => {
-    console.log(e.target.value)
-    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  }
+  const handleSubmit = val => {
+    const { activityTime, signupTime, ...submitValue } = val
 
-  const Basic = props => {
-    const fields = [
-      {
-        label: '选择项目',
-        name: 'buildingId',
-        render: <BuildSelect disabled={disable}/>,
-        value: dynamicData.buildingId,
-        rules: [
-          { required: true, message: '请选择项目' },
-        ],
-      },
-      {
-        label: '活动标题',
-        name: 'activityName',
-        type: FieldTypes.Text,
-        value: dynamicData.activityName,
-        rules: [
-          { required: true, message: '请输入活动标题' },
-        ]
-      },
-      {
-        label: '拼团详情主图',
-        name: 'mainImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.mainImg,
-        rules: [
-          { 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: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
-      },
-      {
-        label: '拼团封面图2',
-        name: 'bannerListImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.bannerListImg,
-        rules: [
-          { required: true, message: '请输入拼团封面图2' },
-        ],
-        help: '建议图片尺寸：750*250px，比例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' }, disabled: activityStatus === 0 ? true : false },
-        rules: [
-          { required: true, message: '请选择活动时间' },
-        ],
-      },
-      {
-        label: '成团人数',
-        name: 'groupBuyPeople',
-        type: FieldTypes.Text,
-        value: dynamicData.groupBuyPeople,
-        props: {disabled: activityStatus === 0 ? true : false },
-        help: '注：成团所需人数',
-        rules: [
-          { required: true, message: '请输入成团人数' },
-        ]
-      },
-      {
-        label: '所需积分',
-        name: 'integral',
-        type: FieldTypes.Text,
-        value: dynamicData.integral,
-        props: {disabled: activityStatus === 0 ? true : false },
-        help: '注：用户平均积分' + scoreData.averageScore,
-        rules: [
-          { required: true, message: '请输入所需积分' },
-        ]
-      },
-      {
-        label: '活动说明',
-        name: 'descImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.descImg,
-        rules: [
-          { required: true, message: '请输入活动说明' },
-        ],
-        help: '建议宽度：750px，高度不限，格式：jpg，用于活动详情',
-      },
-      {
-        label: '权重',
-        name: 'heavy',
-        type: FieldTypes.Number,
-        render: <Input type="number" style={{ width: 80}} />,
-        value: dynamicData.heavy,
-        rules: [
-          { required: true, message: '请输入权重' },
-        ],
-        help: '数字越大越靠前',
-      },
-    ]
+    const [startTime, endTime] = activityTime
+    submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
+    submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
 
-    const handleSubmit = val => {
-      const { activityTime, signupTime, ...submitValue } = val
-      console.log('val', val)
-      const [startTime, endTime] = activityTime
-      submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
-      submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
-      console.log('submit data --->', submitValue)
-      if (groupActivityId) {
-        submitValue.groupActivityId = groupActivityId
-        request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          // cancelPage()
-        }).catch((err) => {
-          // message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.groupActivity.add, data: submitValue }).then((data) => {
-          router.push({
-            pathname: '/activity/groupActivity/editGroupActivity',
-            query: {
-              groupActivityId: data,
-            },
-          });
-          message.info("保存成功")
-          // cancelPage()
-        }).catch((err) => {
-          // message.info(err.msg || err.message)
-        })
+    if (groupActivityId) {
+      const nowDate = new Date()
+      if (!compareDate(nowDate, startTime)) {
+        message.info('修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）')
+        return
       }
+      submitValue.groupActivityId = groupActivityId
+      request({ ...apis.groupActivity.update, data: submitValue }).then(data => {
+        message.info('保存成功')
+        // cancelPage()
+      }).catch(() => {
+        // message.info(err.msg || err.message)
+      })
+    } else {
+      request({ ...apis.groupActivity.add, data: submitValue }).then(data => {
+        router.push({
+          pathname: '/activity/groupActivity/editGroupActivity',
+          query: {
+            groupActivityId: data,
+          },
+        });
+        message.info("保存成功")
+        // cancelPage()
+      }).catch(() => {
+        // message.info(err.msg || err.message)
+      })
     }
-
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
 
-  const Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
+  return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+}
 
+const Poster = props => {
+  const { groupActivityId } = props;
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+  // const [miniappName, setMiniappName] = useState('')
+
+  useEffect(() => {
     if (groupActivityId) {
-      console.log(groupActivityId, 'groupActivityId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
-          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)
-        })
-        getMiniappName()
-      }, [])
-    }else{
-      getMiniappName()
-    }
-    // 获取小程序名称
-    const [miniappName, setMiniappName] = useState('')
-    function getMiniappName() {
-      request({ ...apis.building.getMiniappName }).then(res => {
-        console.log(res, "0000000000000")
-        setMiniappName(res)
+      request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
+        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)
       })
     }
 
-    const submitPoster = () => {
-      if (groupActivityId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, 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: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
+    // getMiniappName()
+  }, [])
+
+  // // 获取小程序名称
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  const submitPoster = () => {
+    if (groupActivityId) {
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div>
-      <div style={{ display: 'flex' }}>
-        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-          <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' }}>进入活动查看详情</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <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 || 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={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </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 || '海报标题'}</p>
 
-        <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <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*600，比例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)} />
-          </div>
-          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <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 || '海报描述'}</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' }}>进入活动查看详情</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>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600，比例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)} />
+        </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
       </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
-
-  }
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>取消</Button>
+  </div>
+}
 
 
+const Share = props => {
+  const { groupActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+  useEffect(() => {
+      if (groupActivityId) {
+      request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [])
 
+  const submitShare = () => {
     if (groupActivityId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
-        }).catch((err) => {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-      }, [])
-    }
-
-    const submitShare = () => {
-      if (groupActivityId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div style={{ padding: '20px' }}>
-      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
-        <div>
-          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
-          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-        </div>
-      </div>
-      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
-        <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>
-        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </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={() => cancelPage()}>取消</Button>
     </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <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>
+      <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={() => cancelPage()}>取消</Button>
+  </div>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  const { groupActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  const [scoreData, setScoreData] = useState({})
+  const [activityStatus, setActivityStatus] = useState({})
+  const [disable, setDisable] = useState(false)
+
+  // 详情
+  const getDynamicData = id => {
+    request({ ...apis.groupActivity.details, urlData: { id } }).then(data => {
+      setDynamicData(data)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0)
+    })
   }
 
+  useEffect(() => {
+    request(apis.groupActivity.avgScore).then(data => {
+      setScoreData(data);
+    })
+  }, [])
+
+  useEffect(() => {
+    if (groupActivityId) {
+      getDynamicData(groupActivityId);
+    }
+  }, [groupActivityId])
+
+  // const radioOnChange = e => {
+  //   setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  // }
+
   return (
     <div>
       <div>
@@ -398,14 +416,14 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic />}
-        {tab === 'poster' && <Poster />}
+        {tab === 'basic' && <Basic dynamicData={dynamicData} disable={disable} activityStatus={activityStatus} scoreData={scoreData} groupActivityId={groupActivityId} />}
+        {tab === 'poster' && <Poster groupActivityId={groupActivityId}/>}
         {tab === 'share' && <Share />}
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/activity/groupActivity")
+        (location.pathname.startsWith('/activity/groupActivity')
           ? true
-          : localStorage.removeItem("groupActivePageParams")} />
+          : localStorage.removeItem('groupActivePageParams'))} />
     </div>
   );
 }

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -5,7 +5,7 @@ import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'
@@ -47,27 +47,27 @@ const header = props => {
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
 
 
-      // 详情
-      const getDynamicData = helpActivityId => {
-        request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
-          data.activityTime = [moment(data.startDate), moment(data.endDate)]
-          const num = data.helpNum > 0 ? 1 : 0
-          setIsEnlist(num)
-          setActivityStatus(data.activityStatus)
-          setDisable(data.activityStatus === 0 ? true : false)
-          data.isEnlist = num
-          props.form.setFieldsValue(data)
-          setDynamicData(data)
-        })
-      }
+  // 详情
+  const getDynamicData = helpActivityId => {
+    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      const num = data.helpNum > 0 ? 1 : 0
+      setIsEnlist(num)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0 ? true : false)
+      data.isEnlist = num
+      props.form.setFieldsValue(data)
+      setDynamicData(data)
+    })
+  }
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      // eslint-disable-next-line no-use-before-define
-      if (helpActivityId) {
-        getDynamicData(helpActivityId) 
-      }
-    }, [])
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    if (helpActivityId) {
+      getDynamicData(helpActivityId)
+    }
+  }, [])
 
   // function addChannel(params) {
   //   request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
@@ -78,6 +78,17 @@ const header = props => {
   // })
   // }
 
+  function compareDate(dateTime1, dateTime2) {
+    var formatDate1 = new Date(dateTime1)
+    var formatDate2 = new Date(dateTime2)
+    if (formatDate1 > formatDate2) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -91,7 +102,7 @@ const header = props => {
           message.error('助力邀请人数不能超过200')
           return
         }
-          // 助力邀请人数>0
+        // 助力邀请人数>0
         if (values.personNum <= 0) {
           message.error('助力邀请人数大于0')
           return
@@ -99,11 +110,11 @@ const header = props => {
 
         // 判断助力人数必须大于0
         if (values.isEnlist === 1) {
-        if (values.helpNum <= 0) {
-          message.error('限制助力次数必须大于0')
-          return
+          if (values.helpNum <= 0) {
+            message.error('限制助力次数必须大于0')
+            return
+          }
         }
-      }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime
         console.log('startDate', activityTime)
@@ -114,6 +125,14 @@ const header = props => {
         // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         console.log('submit data --->', submitValue)
         if (helpActivityId) {
+
+          const nowDate = new Date()
+          if (!compareDate(nowDate, startDate)) {
+
+            message.info("修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）")
+            return
+          }
+
           submitValue.helpActivityId = helpActivityId
           request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
             message.info("保存成功")
@@ -145,129 +164,129 @@ const header = props => {
     <>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled={disable}/>)}
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
         </Form.Item>
 
         <Form.Item label="活动标题">
-        {getFieldDecorator('title', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动标题',
-            },
-          ],
-        })(<Input />)}
+          {getFieldDecorator('title', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动标题',
+              },
+            ],
+          })(<Input />)}
         </Form.Item>
 
         <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：助力活动详情">
           {getFieldDecorator('img', {
-          rules: [
-            {
-              required: true,
-              message: '助力详情主图不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力详情主图不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐">
           {getFieldDecorator('listImg', {
-          rules: [
-            {
-              required: true,
-              message: '助力封面图1不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力封面图1不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="助力封面图2" help="建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
-          rules: [
-            {
-              required: true,
-              message: '助力封面图2不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力封面图2不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="活动时间">
-        {getFieldDecorator('activityTime', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动时间',
-            },
-          ],
-        })(<RangePicker disabled={activityStatus===0 ? true : false} format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('activityTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
         </Form.Item>
 
         <Form.Item label="助力邀请人数" min={1} max={10}>
-        {getFieldDecorator('personNum', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动人数',
-            },
-          ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+            ],
+          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
 
         <Form.Item label="助力次数">
-        {getFieldDecorator('isEnlist', {
-          rules: [
-            {
-              required: true,
-              message: '请选择助力次数',
-            },
-          ],
-        })(
-          <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus===0 ? true : false}>
-            <Radio value={0}>不限制</Radio>
-            <Radio value={1}>限制</Radio>
-          </Radio.Group>,
-        )}
+          {getFieldDecorator('isEnlist', {
+            rules: [
+              {
+                required: true,
+                message: '请选择助力次数',
+              },
+            ],
+          })(
+            <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus === 0 ? true : false}>
+              <Radio value={0}>不限制</Radio>
+              <Radio value={1}>限制</Radio>
+            </Radio.Group>,
+          )}
         </Form.Item>
-         {
-           isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
-           {getFieldDecorator('helpNum', {
-             rules: [
-               {
-                 required: true,
-                 message: '请输入助力人数',
-               },
-             ],
-           })(<Input type="number" placeholder="助力人数限制"/>)}
-           </Form.Item>
-         }
+        {
+          isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
+            {getFieldDecorator('helpNum', {
+              rules: [
+                {
+                  required: true,
+                  message: '请输入助力人数',
+                },
+              ],
+            })(<Input type="number" placeholder="助力人数限制" />)}
+          </Form.Item>
+        }
 
         <Form.Item label="活动说明" help="建议宽度：750px，高度不限，格式：jpg，用于活动详情">
           {getFieldDecorator('activityInstructions', {
-          rules: [
-            {
-              required: true,
-              message: '活动说明不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
-        </Form.Item>        
+            rules: [
+              {
+                required: true,
+                message: '活动说明不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
         <Form.Item label="权重">
-        {getFieldDecorator('heavy', {
-          rules: [
-            {
-              required: true,
-              message: '请输入权重',
-            },
-          ],
-        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
@@ -277,7 +296,7 @@ const header = props => {
           <Button onClick={() => cancelPage()}>
             取消
           </Button>
-          </Form.Item>
+        </Form.Item>
       </Form>
     </>
   )
@@ -285,222 +304,227 @@ const header = props => {
 
 const Basic = Form.create({ name: 'header' })(header);
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  // 判断是否展示助力次数的输入框
-  // const [help, helpTab] = useState('1')
-  const { helpActivityId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      // eslint-disable-next-line no-use-before-define
-      if (helpActivityId) {
-      getDynamicData(helpActivityId);
-    }
-    }, [])
+const Poster = props => {
+  const { helpActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  useEffect(() => {
+    if (helpActivityId) {
+      request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then(data => {
 
-    // 详情
-    const getDynamicData = (helpActivityId) => {
-      request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
-        console.log(data)
-        setDynamicData(data)
+        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)
       })
     }
-  
-  const radioOnChange = e => {
-    console.log(e.target.value)
-    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  }
-
-  const Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
+    // getMiniappName()
+  }, [])
+
+  // // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
 
+  const submitPoster = () => {
     if (helpActivityId) {
-      console.log(helpActivityId, 'helpActivityId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setPosterId(data[0].posterId)
-            changeImg(data[0].posterImg)
-            changeTextArea(data[0].posterDescription)
-            changeInput(data[0].posterTitle)
-          }
-        }).catch((err) => {
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-        getMiniappName()
-      }, [])
-    }else{
-      getMiniappName()
-    }
-    // 获取小程序名称
-    const [miniappName, setMiniappName] = useState('')
-    function getMiniappName() {
-      request({ ...apis.building.getMiniappName }).then(res => {
-        console.log(res, "0000000000000")
-        setMiniappName(res)
-      })
-    }
-
-    const submitPoster = () => {
-      if (helpActivityId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', 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: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          setPosterId(data.posterId)
+          message.info("保存成功")
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div>
-      <div style={{ display: 'flex' }}>
-        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-          <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' }}>进入活动查看详情</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>
-            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <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 || 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={{ 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)} />
-          </div>
-          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <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 || '海报标题'}</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 || '海报描述'}</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' }}>进入活动查看详情</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>
+          <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)} />
         </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
       </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
-
-  }
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>取消</Button>
+  </div>
+}
 
 
+const Share = props => {
+  const { helpActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+  useEffect(() => {
+    if (helpActivityId) {
+      request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then(data => {
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [])
 
+  const submitShare = () => {
     if (helpActivityId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
-        }).catch((err) => {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-      }, [])
-    }
-
-    const submitShare = () => {
-      if (helpActivityId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div style={{ padding: '20px' }}>
-      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
-        <div>
-          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
-          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-        </div>
-      </div>
-      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
-        <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>
-        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />橙蕉互动
+        </p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </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={() => cancelPage()}>取消</Button>
     </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <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>
+      <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={() => cancelPage()}>取消</Button>
+  </div>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  // const [help, helpTab] = useState('1')
+  const { helpActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  
+  // 详情
+  const getDynamicData = id => {
+    request({ ...apis.helpActivity.details, params: { helpActivityId: id } }).then(data => {
+      setDynamicData(data)
+    })
   }
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    if (helpActivityId) {
+      getDynamicData(helpActivityId);
+    }
+  }, [])
+
+
   return (
     <div>
       <div>
@@ -511,14 +535,14 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic helpActivityId={helpActivityId}/>}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'basic' && <Basic helpActivityId={helpActivityId} />}
+        {tab === 'poster' && <Poster helpActivityId={helpActivityId} />}
+        {tab === 'share' && <Share helpActivityId={helpActivityId} />}
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/activity/helpActivity")
+        (location.pathname.startsWith('/activity/helpActivity')
           ? true
-          : localStorage.removeItem("activePageParams")} />
+          : localStorage.removeItem('activePageParams'))} />
     </div>
   );
 }

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

@@ -434,6 +434,7 @@ function AddBuilding(props) {
                 <Option value="待售">待售</Option>
                 <Option value="在售">在售</Option>
                 <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
               </Select>,
             )}
           </Form.Item>

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

@@ -98,12 +98,13 @@ class TypeForm extends React.Component {
                   <Radio.Group onChange={e => this.onChange(e, 'priceType')} >
                     <Radio value="average">均价</Radio>
                     <Radio value="total">总价</Radio>
+                    <Radio value="lease">租赁价</Radio>
                   </Radio.Group>
                 )}
               </Form.Item>
             <Form.Item label="价格区间" help='最高价与最低价一致时，只展示一个'>
               {getFieldDecorator('startPrice')(<Input type="number" placeholder="最低价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
-              {getFieldDecorator('endPrice')(<Input type="number" placeholder="最高价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
+              {getFieldDecorator('endPrice')(<Input type="number" placeholder="最高价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : this.props.type.priceType === "lease" ? "元/㎡/天" : "万元/套"}
             </Form.Item>
             <Form.Item label="销售状态" >
             {getFieldDecorator('marketStatus')(
@@ -111,6 +112,7 @@ class TypeForm extends React.Component {
                 <Option value="待售">待售</Option>
                 <Option value="在售">在售</Option>
                 <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
               </Select>,
             )}
           </Form.Item>

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

@@ -23,6 +23,10 @@ const saleType = [
     id: 3,
     name: '在售',
   },
+  {
+    id: 4,
+    name: '在租',
+  },
 ]
 
 const houseType = [

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

@@ -40,6 +40,10 @@ const saleType = [
     id: 3,
     name: '在售',
   },
+  {
+    id: 4,
+    name: '在租',
+  },
 ]
 
 const houseType = [

src/pages/carouselFigure/customImg/edit.jsx

@@ -14,9 +14,9 @@ const { TextArea } = Input;
 const { Option } = Select;
 
 let activityVisible = true
+let helpTips = ''
 
 const setExtraData = (data) => {
-    console.log(data, 'data');
     activityVisible = data.imgType === 'index';
   }
 
@@ -36,7 +36,21 @@ const header = props => {
   } = props;
 
   const imgId = props.location.query.imgId
-  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': currentUser.orgName+' 精准获客平台'})
+  const imgType = props.location.query.imgType
+
+  const [ data, setData ] = useState(imgType === 'index' ? 
+  {
+    'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    'imgType':'index',
+    'imgDesc':'小程序首页分享配图',
+    'imgDocument': currentUser.orgName+' 精准获客平台'
+  } : 
+  {
+    'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
+    'imgType':'indexNews',
+  }
+  )
+
   if(imgId){
     useEffect(() => {
       getData(imgId);
@@ -48,8 +62,10 @@ const header = props => {
         console.log(data)
         if (data.imgType === 'index'){
             activityVisible = true;
+            helpTips = '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享';
         }else{
             activityVisible = false;
+            helpTips = '建议尺寸：80*80px，比例1:1，格式：jpg，用于：首页资讯logo'
         }
         setData(data)
     })
@@ -62,7 +78,7 @@ const header = props => {
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: data.imgUrl,
-      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
+      help: helpTips,
       rules: [
         {required: true, message: '请选择图片'},
       ]
@@ -71,17 +87,21 @@ const header = props => {
       label: '类型',
       name: 'imgType',
       type: FieldTypes.Select,
-      value: 'index',
+      value: data.imgType,
       dict: [{
           label: '首页分享',
           value: 'index',
         },
+        {
+          label: '首页资讯',
+          value: 'indexNews',
+        },
       ],
       rules: [
         { required: true, message: '请选择类型' },
       ],
     },
-    {
+    data.imgType === 'index' && {
       label: '分享文案',
       name: 'imgDocument',
       type: FieldTypes.Text,

src/pages/carouselFigure/customImg/list.jsx

@@ -26,18 +26,22 @@ function header(props) {
         if(data.records.length > 0){
           setData(data.records)
         }else{
-          setData([{'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'}])
+          setData([
+            {'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'},
+            {'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png','imgType':'indexNews','imgDesc':'首页资讯logo'}
+          ])
         }
         
     })
   }
   
     // 跳转到编辑商品
-  const toEditCustom = (imgId) => () => {
+  const toEditCustom = (imgId, imgType) => () => {
     router.push({
       pathname: '/carouselFigure/customImg/edit',
       query: {
-        imgId
+        imgId,
+        imgType:imgType
       },
     });
   }
@@ -50,12 +54,12 @@ function header(props) {
       <Table dataSource={data}>
         <Column title="图片" dataIndex="imgUrl" key="imgUrl" 
         render={(text, record) => (
-        <img src={record.imgUrl} height="120px" width="150px" />
+        <img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }}/>
         )}/>
         <Column title="类型" dataIndex="imgType" key="imgType" 
         render={(text, record) => (
           <span>
-            {record.imgType === 'index' ?'首页分享':'请编辑'}
+            {record.imgType === 'index' ?'首页分享': record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
           </span>
           )}
         />
@@ -65,7 +69,7 @@ function header(props) {
         key="handle" 
         render={(text, record) => (
           <AuthButton name="admin.custom.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId)}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
               编辑<Icon type="form" className={styles.edit} />
             </span>
           </AuthButton>

src/pages/carouselFigure/editAdvertising.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';

src/pages/carouselFigure/editCarousel.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
 import styles from '../style/GoodsList.less';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'

src/pages/carouselFigure/propaganda.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';

src/pages/channel/brokerList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Avatar } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -36,18 +36,19 @@ const columns = [
     align: 'center',
 
     // eslint-disable-next-line jsx-a11y/alt-text
-    render: (text, list) => <img src={list.avatarurl }/>,
+    render: (text, list) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} src={list.avatarurl} size={64} icon="user" />,
   },
   {
     title: '用户姓名',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'nickname',
+    key: 'nickname',
     align: 'center',
+    render: (text, list) => <><span>{ list.name || list.nickname }</span></>,
   },
   {
     title: '电话',
-    dataIndex: 'tel',
-    key: 'tel',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
   },
   {
@@ -55,7 +56,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, list) => <a>{list.gender === '1' ? '男' : '女'}</a>,
+    render: (text, list) => <a>{list.gender === '1' ? '男' : list.gender === '2' ? '女':'未知'}</a>,
   },
   {
     title: '推荐客户',

src/pages/channel/channelList.jsx

@@ -6,6 +6,7 @@ import router from 'umi/router';
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import ChannelSelect from '@/components/SelectButton/channelSelect';
 
 const { Option } = Select;
 
@@ -67,7 +68,7 @@ const columns = [
       render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
   },
   {
-    title: '推荐客户有效',
+    title: '推荐客户有效数',
     dataIndex: 'recommendCount',
     key: 'recommendCount',
     align: 'center',
@@ -107,9 +108,9 @@ function toedit(channelId) {
 
 // 经纪人页面
 function toBroker(record) {
-  if (record.brokerCount === 0) {
-    return
-  }
+  // if (record.brokerCount === 0) {
+  //   return
+  // }
   router.push({
     pathname: '/channel/brokerList',
     query: {
@@ -121,6 +122,7 @@ function toBroker(record) {
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ channelNmae: [], result: [] })
+  const [channelNmae, setChannelNmae] = useState()
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     localStorage.removeItem('value');
@@ -142,10 +144,12 @@ const header = props => {
   }
   // 查询
   function queryList() {
-    getList({ pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+   
+    getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
   }
   // 重置
   function reset() {
+    setChannelNmae()
     getList({ pageNum: 1, pageSize: 10 })
   }
 
@@ -161,31 +165,39 @@ const header = props => {
 
   // 分页
   function onChange(pageNumber) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: pageNumber, pageSize: 10, ...values })
-      }
-    });
+    getList({ pageNum: pageNumber, pageSize: 10, channelId: channelNmae })
+    // getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    //   }
+    // });
+  }
+
+  function onChannelChange(value) {
+    setChannelNmae(value)
   }
 
   return (
     <>
       <div className={channels.searchBox}>
         <div>
-          <span className={channels.selectName}>渠道名称</span>
+        <span className={channels.selectName}>渠道名称</span>
+        <ChannelSelect value={channelNmae} onChange={onChannelChange}></ChannelSelect>
+          {/* 
           <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
             <option value="">全部</option>
             {data.channelNmae.map(Item =>
               <Option value={Item.channelId}> {Item.channelName} </Option>,
-            )}
+            )} */}
             {/* {listItems} */}
-          </Select>
+          {/* </Select> */}
         </div>
         <div >
         <AuthButton name="admin.channel.search" noRight={null}>
           <Button type="primary" onClick={() => queryList()}>查询</Button>
           </AuthButton>
-          {/* <Button onClick={() => reset() }>重置</Button> */}
+          <Button onClick={() => reset() } style={{marginLeft:'8px'}}>重置</Button>
         </div>
       </div>
       <AuthButton name="admin.channel.post" noRight={null}>

src/pages/channel/independentList/index.jsx

@@ -6,7 +6,7 @@ import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
-
+import ChannelSelect from '@/components/SelectButton/channelSelect';
 
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -24,11 +24,11 @@ class ModalTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -37,16 +37,17 @@ class ModalTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList (params) {
+  getList(params) {
+    // eslint-disable-next-line no-console
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -70,25 +71,25 @@ class ModalTable extends React.Component {
   }
 
   // 分页
-  onChange (pageNum) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNumber: pageNum, pageSize: 5, ...values })
-      }
-    });
+  onChange(pageNum) {
+
+    this.getList({ pageNumber: pageNum, pageSize: 5, })
+
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
         // eslint-disable-next-line jsx-a11y/alt-text
-        render: (text, records) => <img src={records.picture} width={50} height={50} />,
+        render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+        // render: (text, records) => <img src={records.picture} width={50} height={50} />,
       },
       {
         title: '用户名',
         dataIndex: 'name',
         key: 'name',
+        // render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -110,20 +111,37 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+        render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
       },
       {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
           console.log("retrun", records)
-          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          //     if (records.status === 1) { return '报备' }
+          // if (records.status === 2) { return '推荐' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
+          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          // if (records.status === 2) { return '到访' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
+          if (records.status === 1) {
+            if (records.verifyStatus === 0) { return '待审核' }
+            if (records.verifyStatus === 1) { return '报备' }
+            // if (records.reportRecommendStatus === 1) { return '报备' }
+            // if (records.reportRecommendStatus === 2) { return '推荐' }}
+            if (records.verifyStatus === 2) { return '审核驳回' }
+           }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
-          if (records.verifyStatus === 1) { return '待审核' }
-          if (records.verifyStatus === 2) { return '审核同意' }
-          if (records.verifyStatus === 3) { return '签约' }
           // reportRecommendStatus
         },
       },
@@ -139,13 +157,13 @@ class ModalTable extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ current: this.state.dataSource.current, pageSize: this.state.dataSource.size, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
         </Modal>
       </>
     );
   }
 }
-
+// defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current}
 
 /**
  * 邀请客户
@@ -160,13 +178,13 @@ class InviteTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
-    
+  componentDidMount() {
+
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { customerId } = this.props.visibleData
-    
+
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -175,18 +193,18 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
-  getList (params) {
+  getList(params) {
     const { id } = params
     console.log(id)
     if (id === '' || id === undefined) {
@@ -196,16 +214,16 @@ class InviteTable extends React.Component {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-    
+
     })
   }
 
   // 分页
-  onChange (pageNum) {
+  onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
@@ -219,7 +237,7 @@ class InviteTable extends React.Component {
         dataIndex: 'nickname',
         key: 'nickname',
         align: 'center',
-        render: text => <a>{text}</a>,
+        render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -259,8 +277,8 @@ class InviteTable extends React.Component {
  * @param {*} props
  * @returns
  */
-function body (props) {
-  const { getFieldDecorator } = props.form
+function body(props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
@@ -271,7 +289,7 @@ function body (props) {
   }, [])
 
 
-  function openNotificationWithIcon (type, message) {
+  function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
       description:
@@ -279,7 +297,7 @@ function body (props) {
     });
   }
 
-  function getList (params) {
+  function getList(params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
@@ -289,7 +307,7 @@ function body (props) {
   }
 
   // 提交事件
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -302,24 +320,24 @@ function body (props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
-  function handleSelectChange (e) {
+  function handleSelectChange(e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
-  function gM (row) {
+  function gM(row) {
     setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGInviteData({ visible: false })
   }
 
-  function Invite (row) {
+  function Invite(row) {
     setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGVisibleData({ visible: false })
   }
 
   // 分页
-  function onChange (pageNum) {
+  function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
@@ -327,11 +345,12 @@ function body (props) {
   /**
     * 重置搜索
     */
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10 })
   }
 
-  function toAudit (cuurentId) {
+  function toAudit(cuurentId) {
     router.push({
       pathname: '/customer/recommendCustomer/audit',
       query: {
@@ -340,8 +359,10 @@ function body (props) {
     })
   }
 
-  function exportIndependen () {
-    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
+  function exportIndependen() {
+    const fieldsValue = getFieldsValue()
+    console.log('fieldsValue', fieldsValue)
+    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob', params: { ...fieldsValue } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -349,7 +370,7 @@ function body (props) {
       })
   }
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -373,6 +394,7 @@ function body (props) {
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
+      render: (_, record) => <><span>{record.name || record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -390,13 +412,13 @@ function body (props) {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{record.personType === 'channel agent' ? '渠道经纪人' : '独立经纪人'}</span></>,
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? '专业经纪人' : '专业经纪人'}</span></>,
     },
     {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
-      render: (_, record) => <><span>{record.personType === 'channel agent' ? record.channelName : ''}</span></>,
+      render: (_, record) => <><span>{record.channelName}</span></>,
     },
     {
       title: '操作',
@@ -421,9 +443,33 @@ function body (props) {
     },
   ]
 
+  // <div>
+  //         <span className={channels.selectName}>渠道名称</span>
+  //         <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
+  //           <option value="">全部</option>
+  //           {data.channelNmae.map(Item =>
+  //             <Option value={Item.channelId}> {Item.channelName} </Option>,
+  //           )}
+  //           {/* {listItems} */}
+  //         </Select>
+  //       </div>
+  //       <div ></div>
+
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
+        <Form.Item>
+          {getFieldDecorator('channelId')(
+            <ChannelSelect />
+            //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
+            //   <option value="">全部</option>
+            //   {data.channelNmae.map(Item =>
+            //     <Option value={Item.channelId}> {Item.channelName} </Option>,
+            //   )}
+
+            // </Select>,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input

src/pages/channel/recommendClients.jsx

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

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

@@ -22,8 +22,9 @@ class ModalAttribution extends React.Component {
     super(props);
     console.log(props, 'props')
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: [], buildingName: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: [], buildingName: '' },
+      buildingId: ''
     }
   }
 
@@ -33,9 +34,11 @@ class ModalAttribution extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
+    // this.setState({ buildingId: this.props.visibleData.buildingId })
     console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId })
+
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -51,12 +54,12 @@ class ModalAttribution extends React.Component {
     this.props.onCancel()
   }
 
-  changBuilding(buildingId){
+  changBuilding(buildingId) {
     this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
     this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
   }
 
-  getUserList(params){
+  getUserList(params) {
     console.log('params: ', params)
     if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
@@ -65,17 +68,17 @@ class ModalAttribution extends React.Component {
     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-      
+      message.err(err)
     })
   }
 
   getList(params) {
     // 网路请求
     console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant }).then(res => {
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-      
+
     })
   }
 
@@ -87,22 +90,27 @@ class ModalAttribution extends React.Component {
     });
   };
 
-   // 分页
+  // 分页
   onChange(pageNum) {
 
-    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
   }
 
   // 提交
   submitGm(record) {
     // 网路请求
-    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, personIds: this.state.visibleData.customerId } }).then(res => {
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, customerIds: this.state.visibleData.customerId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('success', '操作成功')
+
+      if (res != null && res.failNum > 0) {
+        this.openNotificationWithIcon('success', '共' + res.totalNum + '条数据,失败操作' + res.failNum + '条')
+      } else {
+        this.openNotificationWithIcon('success', '操作成功')
+      }
       this.handleCancel()
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('error', err)
+
     })
   }
 
@@ -138,22 +146,23 @@ class ModalAttribution extends React.Component {
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+        render: (_, record) => <>{<Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+      },
     ]
     return (
       <>
         <Modal
-            title="分配置业顾问"
-            width={800}
-            destroyOnClose="true"
-            footer={null}
-            visible={this.state.visibleData.visible}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
-            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
-            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="分配置业顾问"
+          width={800}
+          destroyOnClose="true"
+          footer={null}
+          visible={this.state.visibleData.visible}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br /><br />
+          {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+          <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }

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

@@ -21,8 +21,8 @@ class ModalAttribution extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', buildingName: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', buildingName: '' },
     }
   }
 
@@ -34,7 +34,7 @@ class ModalAttribution extends React.Component {
   componentDidUpdate(preProps, preState) {
     console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId })
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -50,12 +50,13 @@ class ModalAttribution extends React.Component {
     this.props.onCancel()
   }
 
-  changBuilding(buildingId){
+  changBuilding(buildingId) {
+    console.log(buildingId,'buildingId')
     this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
     this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
   }
 
-  getUserList(params){
+  getUserList(params) {
     console.log('params: ', params)
     if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
@@ -64,7 +65,7 @@ class ModalAttribution extends React.Component {
     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-      
+      message.err(err)
     })
   }
 
@@ -73,7 +74,7 @@ class ModalAttribution extends React.Component {
     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-      
+      message.err(err)
     })
   }
 
@@ -85,9 +86,10 @@ class ModalAttribution extends React.Component {
     });
   };
 
-   // 分页
+  // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+    console.log(this.state.visibleData.buildingName)
+    this.getList({ pageNumber: pageNum, pageSize: 5, customerId: this.props.visibleData.customerId, buildingId: this.state.visibleData.buildingName })
   }
 
   // 提交
@@ -99,7 +101,7 @@ class ModalAttribution extends React.Component {
       this.handleCancel()
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('error', err)
+
     })
   }
 
@@ -135,21 +137,22 @@ class ModalAttribution extends React.Component {
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+        render: (_, record) => <>{<Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+      },
     ]
     return (
       <>
         <Modal
-            title="分配置业顾问"
-            width={800}
-            destroyOnClose="true"
-            footer={null}
-            visible={this.state.visibleData.visible}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
-            <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="分配置业顾问"
+          width={800}
+          destroyOnClose="true"
+          footer={null}
+          visible={this.state.visibleData.visible}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+          <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }

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

@@ -142,7 +142,7 @@ class ModalIntegralRecord extends React.Component {
     return (
       <>
         <Modal
-            title={ '当前可用积分：' + this.state.dataSource.totalPoints }
+            title={ '当前可用积分：' + (this.state.dataSource.totalPoints  || 0 )}
             width={800}
             destroyOnClose="true"
             footer={null}

src/pages/customer/customerlist/customerDetail.jsx

@@ -151,7 +151,7 @@ function header(props) {
               <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
               <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
               <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
-              <p className={styles.rightItem}>来访渠道：{data.personFrom ? data.personFrom : "其他"}</p>
+              <p className={styles.rightItem}>来源渠道：{data.personFrom ? data.personFrom : "其他"}</p>
               {/* <p className={styles.rightItem}>详细信息：</p> */}
               {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
               {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -139,7 +139,7 @@ function onChange(number) {
           <div className={publicStyle.Centered}>
           <p>访问时长：{ data.duration }秒</p>
           <p>访问次数：{ data.visitTimes }次</p>
-          <p className={publicStyle.rightItem}>来访渠道：{data.personFrom ? data.personFrom : '其他'}</p>
+          <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
           {/* <p>预约人数：{ data.visiteNum }</p> */}
           </div>
           {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}

src/pages/indexEcharts/newUsers.jsx

@@ -38,9 +38,9 @@ const header = props => {
   useEffect(() => {
 
     setEndDate(new Date())
-    setStartDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
     // setStartDate(moment().subtract(7, 'day').toDate())
-    userResource({startDate: new Date(), endDate: new Date()})
+    userResource({startDate: moment().subtract(7, 'day').toDate(), endDate: new Date()})
   }, [])
 
   const { RangePicker } = DatePicker;
@@ -152,8 +152,8 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="c"  style={{marginBottom:'20px'}}>
-        <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button>
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a"  style={{marginBottom:'20px'}}>
+        {/* <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button> */}
         <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
         <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
       </Radio.Group>

src/pages/integralMall/editGoods.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from '../channel/channelList.less';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';

src/pages/news/list/editNewsList.jsx

@@ -5,7 +5,7 @@ import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 import  { FieldTypes, createForm } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'

src/pages/recommend/recommendCustomer/audit.jsx

@@ -56,12 +56,13 @@ function body(props) {
   function getById(currentId) {
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
       res.reportDate = moment(res.reportDate)
-     props.form.setFieldsValue(res)
+      props.form.setFieldsValue(res)
     })
   }
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
+    console.log(params, 'params')
     request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
       openNotificationWithIcon('success', '操作成功')
@@ -77,7 +78,8 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ ...values })
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
       }
     });
   }
@@ -195,20 +197,28 @@ function body(props) {
               <Option value={1}>已通过</Option>
               <Option value={2}>已驳回</Option>
             </Select>,
-          )}
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
         </Form.Item> */}
-        <Form.Item label="归属置业顾问">
-            <Row gutter={8}>
-              <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
-              </Col>
-              <Col span={12}>
-                <Button onClick={() => showConsultant()}>选择</Button>
-              </Col>
-            </Row>
+        <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
             审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -219,7 +229,7 @@ function body(props) {
       </Form>
 
       {/* 选择置业顾问 */}
-      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
     </>
   );
 }

src/pages/staff/components/BatchAssistConsultant.jsx

@@ -0,0 +1,129 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    // console.log(props, 'props')
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visible !== preState.visibleData.visible) {
+      this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
+      this.setState({ visibleData: { visible: this.props.visible, buildingId: this.props.buildingId } });
+    }
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  getUserList(params) {
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 分页
+  onChange(pageNum) {
+
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    this.props.onCancel(record)
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+        width: 120,
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+        width: 150,
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+        width: 130,
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+        width: 120,
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        width: 80,
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{record.userId !== this.props.userId ? <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button> : ''}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="分配置业顾问"
+          width={600}
+          destroyOnClose="true"
+          footer={null}
+          visible={this.state.visibleData.visible}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="userId" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/staff/components/BuildingSelection.jsx

@@ -0,0 +1,58 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert, Modal } from 'antd';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import CustomerChange from './CustomerChange'
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+
+let building = null
+const BuildingSelection = (props) => {
+    const [visible, setVisible] = useState(false) 
+    const { userData } = props;
+
+     //授权项目改变
+  const consultantBuildingChange =(e) => {
+    building = e
+    if(userData.isConsultant && props.value !== e){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此置业顾问下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }else{
+            props.onChange(e)
+        }
+     })
+    }else{
+        props.onChange(e)
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+       if(e === 'success'){
+        props.onChange(building)
+       }
+       setVisible(false)
+  }
+
+     return (<>
+        <BuildSelect value={props.value} onChange={consultantBuildingChange} />
+        <Modal
+              visible={visible}
+              title="分配归属"
+              onCancel={() => setVisible(false)}
+              footer={null}
+              width={900}
+            >
+                <CustomerChange userId={userData.userId} consultantPersonId={userData.consultantPersonId} buildingId={userData.buildingId} onSuccess={moveSuccess} />
+            </Modal>
+     </>)
+  }
+  
+  export default BuildingSelection;

src/pages/staff/components/CustomerChange.jsx

@@ -0,0 +1,117 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+import BatchAssistConsultant from './BatchAssistConsultant'
+
+const CustomerChange = (props) => {
+  const [data, setData] = useState([])
+  const [consultantVisible, setConsultantVisible] = useState(false)
+  const [selectIds, setSelectIds] = useState([])
+
+  const rowSelection = {
+    selectedRowKeys: selectIds,
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setSelectIds(selectedRowKeys)
+    },
+  };
+
+  const batchAssistConsultant = () => {
+    if (selectIds.length < 1) {
+      message.info("请至少选择一条数据");
+      return
+    }
+    setConsultantVisible(true)
+  }
+
+  const consulatanChange = (e) => {
+    if (e) {
+      data.map(x => {
+        selectIds.map(y => {
+          if (x.customerId === y) {
+            x.realtyConsultant = e.userId
+            x.moveUserId = e.userId
+            x.moveUserName = e.userName
+          }
+        })
+      })
+    }
+    setConsultantVisible(false)
+    setSelectIds([])
+  }
+
+  //批量保存
+  const batchSaveConsultant = () => {
+    const unMoveData = data.filter(x => !x.moveUserId)
+    if (unMoveData.length > 0) {
+      message.info("存在未分配归属客户");
+      return
+    }
+    request({ ...apis.staff.move, data }).then(data => {
+      message.info('操作成功')
+      props.onSuccess('success')
+    })
+  }
+
+  //取消按钮
+  const cancelConsultant = () => {
+    props.onSuccess('cancel')
+  }
+
+
+  const columns = [
+    {
+      title: '用户名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认购' }
+        if (records.status === 4) { return '签约' }
+      },
+    },
+    {
+      title: '调整后归属',
+      dataIndex: 'moveUserName',
+      key: 'moveUserName',
+      align: 'center',
+    }
+  ];
+
+  useEffect(() => {
+    request({ ...apis.staff.check, params: { userId: props.userId, personId: props.consultantPersonId, buildingId: props.buildingId } }).then(data => {
+      setData(data)
+    })
+  }, [props.userId])
+
+  return (
+    <div>
+      <Button type="primary" onClick={() => batchAssistConsultant()} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>分配置业顾问</Button>
+      <Table rowSelection={rowSelection} dataSource={data} columns={columns} rowKey="customerId" pagination={false} scroll={{ y: 500 }} />
+      <BatchAssistConsultant visible={consultantVisible} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+      <div style={{ textAlign: 'center', marginTop: '16px' }}><Button type="primary" onClick={() => batchSaveConsultant()}>保存</Button>
+        <Button style={{ marginLeft: '10px' }} onClick={() => cancelConsultant()}>取消</Button></div>
+    </div>
+  )
+}
+
+export default CustomerChange;

src/pages/staff/list/StaffList.jsx

@@ -9,6 +9,7 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import CustomerChange from '../components/CustomerChange'
 
 const { Meta } = Card;
 const { Option } = Select;
@@ -32,29 +33,59 @@ const toEditStaff = userId => () => {
  */
 const CartBody = props => {
   const { data } = props
+  const [visible, setVisible] = useState(false)
   // console.log("data11:", data)
 
   const confirm = data => () => {
     // console.log(data, "11111")
     if (data.status === 1) {
-      Modal.confirm({
-        title: '停用后无法登录后台系统',
-        okText: '确认',
-        cancelText: '取消',
-        onOk () {
-          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(data => {
-            message.info('操作成功')
-            props.onFresh()
-          })
-        },
-      });
+      if(data.isConsultant){
+        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
+          if(res.length > 0){
+            Modal.confirm({
+              title: '此置业顾问下有私客，是否转移私客？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk () {
+                setVisible(true)
+              },
+            });
+          }else{
+            const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+            Modal.confirm({
+              title: titleMessahe,
+              okText: '确认',
+              cancelText: '取消',
+              onOk () {
+                request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
+                  message.info('操作成功')
+                  props.onFresh()
+                })
+              },
+            });
+          }
+       })
+      }else{
+        const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+        Modal.confirm({
+          title: titleMessahe,
+          okText: '确认',
+          cancelText: '取消',
+          onOk () {
+            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
+              message.info('操作成功')
+              props.onFresh()
+            })
+          },
+        });
+      }
     } else {
       Modal.confirm({
         title: '确认启用该角色？',
         okText: '确认',
         cancelText: '取消',
         onOk () {
-          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(data => {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
             message.info('操作成功')
             props.onFresh()
           })
@@ -63,6 +94,14 @@ const CartBody = props => {
     }
   }
 
+  //迁移私客成功回调
+  const moveSuccess = (e) => {
+    setVisible(false)
+    if(e === 'success'){
+      confirm(data)()
+    }
+  }
+
   // 员工离职
   const departure = row => {
     // 是置业顾问
@@ -95,45 +134,55 @@ const CartBody = props => {
   }
 
   return (
+    <div>
+      <Card className={Styles.card}>
+        <div>
+          <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
+          <AuthButton name="admin.user.put" noRight={null}>
+          <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
+            编辑
+                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button>
+          </AuthButton>
+          {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
+            离职
+                  <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button> */}
+          <AuthButton name="admin.user.publish" noRight={null}>
+          <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
+            {data.status === 1 ? '停用' : '启用'}
+            <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button>
+          </AuthButton>
+        </div>
+        <div>
 
-    <Card className={Styles.card}>
-      <div>
-        <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
-        <AuthButton name="admin.user.put" noRight={null}>
-        <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
-          编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button>
-        </AuthButton>
-        {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
-          离职
-                <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button> */}
-        <AuthButton name="admin.user.publish" noRight={null}>
-        <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
-          {data.status === 1 ? '停用' : '启用'}
-          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button>
-        </AuthButton>
-      </div>
-      <div>
+          <span>
+            {
+              data.taTagsList.map((item, index) => <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>)
+            }
+          </span>
 
-        <span>
-          {
-            data.taTagsList.map((item, index) => <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>)
-          }
-        </span>
-
-        <p className={Styles.cardText} >姓名 : {data.userName}
-        </p>
-        {/* <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p> */}
-        <p className={Styles.statusText} > 绑定状态 : {data.miniStatus === 1 ? '已绑定' : '未绑定'} </p>
-        <p className={Styles.phoneText} >
-          电话 : {data.phone}
-        </p>
-      </div>
+          <p className={Styles.cardText} >姓名 : {data.userName}
+          </p>
+          {/* <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p> */}
+          <p className={Styles.statusText} > 绑定状态 : {data.miniStatus === 1 ? '已绑定' : '未绑定'} </p>
+          <p className={Styles.phoneText} >
+            电话 : {data.phone}
+          </p>
+        </div>
 
-    </Card>
+      </Card>
+      <Modal
+        visible={visible}
+        title="分配归属"
+        onCancel={() => setVisible(false)}
+        footer={null}
+        width={900}
+      >
+          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
+      </Modal>
+    </div>
   )
 }
 
@@ -219,6 +268,16 @@ const header = props => {
           )}
         </Form.Item>
 
+        <Form.Item>
+
+          {getFieldDecorator('miniStatus')(
+            <Select style={{ width: '180px' }} placeholder="是否绑定" >
+              <Option value="0">未绑定</Option>
+              <Option value="1">已绑定</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
         <Form.Item>
         <AuthButton name="admin.user.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>

src/pages/staff/list/editStaff.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert, Modal } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import router from 'umi/router';
@@ -11,6 +11,7 @@ import channels from './channelList.less';
 import Tagss from '../components/Tagss.jsx';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
+import BuildingSelection from '../components/BuildingSelection'
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -38,6 +39,7 @@ const Edit = (props) => {
   const [tagData, setTagData] = useState([])
   const [roleData, setRoleData] = useState([])
   const [buildData, setBuildData] = useState([])
+  const [visible, setVisible] = useState(false)
 
   const getTagList = () => {
     request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
@@ -123,6 +125,29 @@ const Edit = (props) => {
     return isLt100k;
   }
 
+  //授权项目改变
+  const consultantBuildingChange =(e) => {
+    if(userData.isConsultant){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此置业顾问下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }
+     })
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
   const fields = [
     {
       label: '姓名',
@@ -190,7 +215,7 @@ const Edit = (props) => {
       type: FieldTypes.Text,
       placeholder: '请输入登录名',
       value: userData.loginName,
-      hidden: () => consultantChecked,
+      // hidden: () => consultantChecked,
       help: '默认密码：123456',
     },
     {
@@ -212,7 +237,7 @@ const Edit = (props) => {
     {
       label: '授权项目',
       name: 'buildingId',
-      render: <BuildSelect />,
+      render: <BuildingSelection userData={userData} />,
       value: userData.buildingId,
       hidden: () => !consultantChecked,
       rules: [
@@ -282,7 +307,18 @@ const Edit = (props) => {
 
   console.log('--------->', fields)
 
-  return <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+  return <div>
+            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+            {/* <Modal
+              visible={visible}
+              title="分配归属"
+              onCancel={() => setVisible(false)}
+              footer={null}
+              width={900}
+            >
+                <CustomerChange userId={userData.userId} consultantPersonId={userData.consultantPersonId} buildingId={userData.buildingId} onSuccess={moveSuccess} />
+            </Modal> */}
+        </div>
 }
 
 export default Edit

src/pages/statistical/activity/shareNum.jsx

@@ -36,6 +36,7 @@ let columns = [
       if (records.sharePersonType === 'drift') { return '游客' }
       if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+      if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
     },
   },
   {
@@ -217,6 +218,7 @@ class SharePersonNum extends React.Component {
                 <Option value="drift">游客</Option>
                 <Option value="customer">普通客户</Option>
                 <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="estate agent">专业经纪人</Option>
             </Select>
             )}
           </Form.Item>

src/pages/statistical/activity/sharePersonNum.jsx

@@ -95,6 +95,7 @@ let columns = [
       if (records.sharePersonType === 'drift') { return '游客' }
       if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+      if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
     },
   },
   {
@@ -306,6 +307,7 @@ class SharePersonNum extends React.Component {
                 <Option value="drift">游客</Option>
                 <Option value="customer">普通客户</Option>
                 <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="estate agent">专业经纪人</Option>
               </Select>
             )}
           </Form.Item>

src/pages/statistical/consultant/index.jsx

@@ -400,6 +400,7 @@ function record(props) {
     ]
     const list = data.records
     const _list = list && list.length > 0 ? [totalRow, ...list] : [];
+    let row = 0
     return (
 
         <>
@@ -454,7 +455,7 @@ function record(props) {
                     导出
                 </Button>
             </AuthButton>
-            <Table rowKey={(index => { index })}
+            <Table rowKey={record => data.current * data.size + (row++)}
                 style={{ marginTop: '30px' }}
                 dataSource={_list}
                 // dataSource={data.records}

src/services/apis.js

@@ -831,6 +831,16 @@ export default {
       method: 'PUT',
       action: 'admin.turn.taUser.put',
     },
+    check: {
+      url: `${prefix}/consultant/customer/list`,
+      method: 'GET',
+      action: 'admin.consultant.customer.list.put',
+    },
+    move: {
+      url: `${prefix}/consultant/customer/move`,
+      method: 'PUT',
+      action: 'admin.user.departure.put',
+    },
     departure: {
       url: `${prefix}/user/departure/:id`,
       method: 'PUT',