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

src/components/Cards/PosterCard.jsx

 import React, { useState, useEffect } from 'react';
-import { Card, Checkbox, Button } from 'antd';
+import { Card, Checkbox, Button,Upload } from 'antd';
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import { uploaderProps } from '../../utils/upload';
 
 const { Meta } = Card;
 
  */
 const PosterCard = (props) => {
   const [ data, setData ] = useState([])
+  const [indexOneUrl, setIndexOneUrl] = useState('')
+  const [indexTwoUrl, setIndexTwoUrl] = useState('')
+  const [indexThreeUrl, setIndexThreeUrl] = useState('')
+  let resultData = []
 
   useEffect(() => {  
   },[])
 
- 
+  const handleUploadIndexOneSucess = url => {
+    console.log(url,"第一张图上传回调");
+    setIndexOneUrl(url)
+    resultData[0] = url
+    resultData[1] = indexTwoUrl
+    resultData[2] = indexThreeUrl
+    props.onChange(resultData)
+  }
+
+  const handleUploadIndexTwoSucess = url => {
+    console.log(url,"第二张图上传回调");
+    setIndexTwoUrl(url)
+    resultData[0] = indexOneUrl
+    resultData[1] = url
+    resultData[2] = indexThreeUrl
+    props.onChange(resultData)
+  }
 
-  const onChange = (template) => (e) => {
+  const handleUploadIndexThreeSucess = url => {
+    console.log(url,"第三张图上传回调");
+    setIndexThreeUrl(url)
+    resultData[0] = indexOneUrl
+    resultData[1] = indexTwoUrl
+    resultData[2] = url
+    props.onChange(resultData)
   }
 
   return (
     <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' }} alt="" />
-          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} 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'
-          }}>海报标题</p>
-
-          <img 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'
-          }}>海报描述</p>
+          <img style={{ width: '100%', height: '300px' }} src={indexOneUrl} alt="" />
+           
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>置业V顾问</span>报名活动</p>
           </div>
         </div>
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <Upload showUploadList={false}
+        {...uploaderProps}
+        onSuccess={handleUploadIndexOneSucess}>
+          <Button>
+            上传图片
+          </Button>
+        </Upload>
       </div>
     </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' }} alt="" />
-          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} 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'
-          }}>海报标题</p>
-
-          <img 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'
-          }}>海报描述</p>
+          <img style={{ width: '100%', height: '300px' }} src={indexTwoUrl} alt="" />
+           
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>置业V顾问</span>报名活动</p>
           </div>
         </div>
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <Upload showUploadList={false}
+        {...uploaderProps}
+        onSuccess={handleUploadIndexTwoSucess}>
+          <Button>
+            上传图片
+          </Button>
+        </Upload>
       </div>
     </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' }} alt="" />
-          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} 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'
-          }}>海报标题</p>
-
-          <img 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'
-          }}>海报描述</p>
+          <img style={{ width: '100%', height: '300px' }} src={indexThreeUrl} alt="" />
+           
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>置业V顾问</span>报名活动</p>
           </div>
         </div>
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <Upload showUploadList={false}
+        {...uploaderProps}
+        onSuccess={handleUploadIndexThreeSucess}>
+          <Button>
+            上传图片
+          </Button>
+        </Upload>
       </div>
     </div>
   </div>

src/pages/activity/editActivity.jsx

       }
     }
 
-    return <div>
-      <PosterCard/>
-      <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' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>{miniappName || '置业V顾问'}</span>报名活动</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
-          </div>
-          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </div>
-
-        <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
-            <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} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-          </div>
+    const changePoster = e => {
+      console.log(e,"返回出来的数据")
+    }
 
-        </div>
-      </div>
+    return <div>
+      <PosterCard onChange={changePoster}/>
       <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
       <Button onClick={() => cancelPage()}>
         取消

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

   }
 
   /**
-   * 把 xxx,xxx,xxx  这样的格式转换成 [{ tagName: xxx, delete: true }, { tagName: xxx, delete: true }]
+   * 把 xxx,xxx,xxx  这样的格式转换成 [{ tagName: xxx, delete: true, automatic: false }, { tagName: xxx, delete: true, automatic: false }]
    * @param {*} str
    * @return 如果返回 str 为空 或者 非 string，则返回 str 本身，否则返回转换成功的数组
    */
   }
 
   /**
-   * 把 [xxx,xxx,xxx]  这样的格式转换成 [{ tagName: xxx, delete: true }, { tagName: xxx, delete: true }]
+   * 把 [xxx,xxx,xxx]  这样的格式转换成 [{ tagName: xxx, delete: true, automatic: false }, { tagName: xxx, delete: true, automatic: false }]
    * @param {*} arr
    */
   function arrayTransition(arr) {
-    return arr.map(x => ({ tagName: x, delete: true }))
+    return arr.map(x => ({ tagName: x, delete: true, automatic: false }))
   }
 
   function handleSubmit(e) {
     }
 
     if (data.buildingTransport) {
-      data.buildingTransport = data.buildingTransport.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingTransport = tagFilter(data.buildingTransport, 'Transport')
     }
     if (data.buildingMall) {
-      data.buildingMall = data.buildingMall.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingMall = tagFilter(data.buildingMall, 'Mall')
     }
     if (data.buildingEdu) {
-      data.buildingEdu = data.buildingEdu.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingEdu = tagFilter(data.buildingEdu, 'Edu')
     }
     if (data.buildingHospital) {
-      data.buildingHospital = data.buildingHospital.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingHospital = tagFilter(data.buildingHospital, 'Hospital')
     }
     if (data.buildingBank) {
-      data.buildingBank = data.buildingBank.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingBank = tagFilter(data.buildingBank, 'Bank')
     }
     if (data.buildingRestaurant) {
-      data.buildingRestaurant = data.buildingRestaurant.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingRestaurant = tagFilter(data.buildingRestaurant, 'Restaurant')
     }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     })
   }
 
+  /**
+   * 过滤 tag
+   * @param {*} tags 
+   */
+  function tagFilter(tags, keyType) {
+    console.log(tags)
+    if (!tags) {
+      return null
+    }
+
+    // 过滤 tag 更新 useState()
+
+    // 获取地图周边
+    const automaticTag = tags.filter(f => f.automatic === true).map(x => x.tagName)
+    const determineTag = poi.map(p => {
+      if (p.key === keyType) {
+        if (typeof p.data === 'string') {
+          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name))
+        }
+      }
+      return p
+    })
+
+    setPoi(determineTag)
+    return tags.filter(f => f.automatic === false).map(x => x.tagName).join(',')
+  }
+
   // 视频文件上传前 回调
   function fileUploadBeforeUpload(file, fileList) {
     // console.log('视频文件上传前 回调: ', file, fileList)
   }
 
   function setFormMapScopeTagValue(keyType, item) {
-    const tag = item.data.map(t => ({ tagName: t.name, delete: false }))
+    const tag = item.data.map(t => ({ tagName: t.name, delete: true, automatic: true }))
     switch (keyType) {
       case POI_TYPES_KETY.Transport:
         const buildingTransportValue = (stringHandleTag(buildingData.buildingTransport) || [])
               ],
             })(<Input />)}
           </Form.Item>
-          <Form.Item label="项目动态" >
-            {getFieldDecorator('dynamic')(<Input />)}
+          <Form.Item label="项目说明" >
+            {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过15个字" maxLength = "15"/>)}
           </Form.Item>
           <Form.Item label="物业类型" >
             {getFieldDecorator('propertyType')(
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议图片尺寸：750*600，比例5:4，用于楼盘详情">
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：750*600，比例5:4，用于楼盘详情">
             {getFieldDecorator('videoUrl')(
               // disabled={fileUploadDisabled}
               <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,
           <Form.Item label="排序" >
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
-          <Form.Item label="优惠信息" >
+          {/* <Form.Item label="优惠信息" >
             {getFieldDecorator('discount')(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="首页推荐" >
             {getFieldDecorator('isMain', {
               initialValue: 1,
               <SelectCity />,
             )}
           </Form.Item>
-          <Form.Item label="楼盘区域" >
+          {/* <Form.Item label="楼盘区域" >
             {getFieldDecorator('buildingArea', {
               rules: [{ required: true, message: '请输入楼盘区域' }],
             })(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="项目地址" >
             {getFieldDecorator('address', {
               rules: [{ required: true, message: '请输入项目地址' }],
           <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
-          <Form.Item label="交房时间" >
+          {/* <Form.Item label="交房时间" >
             {getFieldDecorator('receivedDate')(<DatePicker />)}
-          </Form.Item>
-          <Form.Item label="产权年限" >
+          </Form.Item> */}
+          {/* <Form.Item label="产权年限" >
             {getFieldDecorator('rightsYear')(<InputNumber />)}
-          </Form.Item>
-          <Form.Item label="预售许可证" >
+          </Form.Item> */}
+          {/* <Form.Item label="预售许可证" >
             {getFieldDecorator('preSalePermit')(
               <ImageUpload />,
             )}
             {getFieldDecorator('remark')(
               <Wangedit />,
             )}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
             <Button type="primary" htmlType="submit">
                 确定

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

               </Form.Item>
               <Form.Item label="套内面积" help="单位 ㎡">
                 {getFieldDecorator('insideArea', {
-                  rules: [{ required: true, message: '请填写套内面积' },
+                  rules: [
+                    // { required: true, message: '请填写套内面积' },
                           {
                             pattern: new RegExp('^[0-9]*$'),
                             message: '只允许输入数字',

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

 import React from 'react'
 import { Tag, Input, Tooltip, Icon } from 'antd';
 
+/**
+ * 数据格式：[{ tagName: inputValue, delete: true, automatic: false }]
+ * @param delete 是否删除
+ * @param automatic 是否自动数据（比如获取地图数据就是自动的true，手动输入的是手动false）
+ */
 class EditableTagGroup extends React.Component {
   state = {
     inputVisible: false,
     const tagList = tags.map(x => x.tagName)
     if (inputValue && tagList.indexOf(inputValue) === -1) {
       // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
-      console.log(tags.concat([{ tagName: inputValue, delete: true }]))
-      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true }]))
+      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true, automatic: false }]))
     }
 
     this.setState({

src/pages/staff/list/editStaff.jsx

     //   </Select>,
     //   value: userData.taTags,
     // },
-    {
-      label: '地址',
-      name: 'address',
-      type: FieldTypes.Text,
-      placeholder: '请输入地址',
-      value: userData.address,
-      rules: [
-        { required: true, message: '请输入地址' },
-      ]
-    },
+    // {
+    //   label: '地址',
+    //   name: 'address',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入地址',
+    //   value: userData.address,
+    //   rules: [
+    //     { required: true, message: '请输入地址' },
+    //   ]
+    // },
     {
       label: '授权项目',
       name: 'buildingId',