manage

estateagents-admin-manager/src/pages/building/list/add/components/base.jsx

@@ -0,0 +1,647 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber, notification } from 'antd';
+import moment from 'moment';
+import { router } from 'umi';
+import { ifError } from 'assert';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import NewImageUpload from '../../../../../components/uploadImage/ImageUpload';
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import TagGroup from './tags'
+import Amap from './amap'
+import BudildingProjectType from './buildingProjectType'
+import DragableUploadImageList from '@/components/DragableUploadImageList'
+import SelectCity from '../../../../../components/SelectButton/CitySelect'
+import AreaSelect from '../../../../../components/SelectButton/AreaSelect'
+import FileUpload from '@/components/XForm/FileUpload';
+import { POI_TYPES_KETY, getAroundData, getPOIType, POI_TYPES } from './amapAroundData'
+
+const { Option } = Select
+const { TabPane } = Tabs;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+
+function AddBuilding(props) {
+  const { getFieldDecorator } = props.form;
+
+  const [poi, setPoi] = useState([])
+  const [videoImage, setVideoImage] = useState(false)
+  const [typeState, setTypeState] = useState("rich")
+  const [cityId, setCityId] = useState("")
+
+  // 存放所以 buildingData 基础信息
+  const [buildingData, setBuildingData] = useState({})
+
+  // console.log('props.building: ', props.building)
+  const { buildingId } = props.building
+     // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+      if (buildingId && buildingId !== '') {
+        getById(buildingId)
+      }
+  }, [buildingId])
+
+  useEffect(() => {
+    setPoiTagValue()
+  }, [poi])
+
+
+  // 把地图设置在的数据设置在 tag控件上 上
+  function setPoiTagValue() {
+    if (poi) {
+      console.log('poi: ', poi)
+
+
+      poi.map(x => {
+        const ty = Object.prototype.toString
+        // console.log('x.data: ', JSON.parse(x.data))
+        // console.log('x.data: ', typeof x.data, x.data instanceof String, ty.call(x.data))
+        if (ty.call(x.data) === '[object String]') {
+          setFormMapScopeTagValue(x.key, { data: JSON.parse(x.data) })
+        }
+      })
+    }
+  }
+
+   // 获取详情信息
+   function getById(currentId) {
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
+      // if (res.openingDate !== null) {
+      //   res.openingDate = moment(res.openingDate)
+      // }
+      setTypeState(res.highlightsType)
+      if (res.receivedDate !== null) {
+        res.receivedDate = moment(res.receivedDate)
+      }
+      if (res.buildingTag !== null) {
+        res.tag = res.buildingTag.map((item, _) => item.tagName)
+      }
+      if (res.buildingImg !== null) {
+        res.avatarImage = res.buildingImg.map(item => item.url)
+      }
+
+      if (res.buildingListImg) {
+        // res.listImage = res.buildingListImg.map(item => item.url)
+        res.listImage = res.buildingListImg.map(item => item.url)[0]
+      }
+      res.mapCoordinate = res.coordinate
+      if (res.videoUrl) {
+        res.videoUrl = [].concat(res.videoUrl)
+        setVideoImage(true)
+      }
+      if (res.videoImage) {
+        res.videoImage = res.videoImage[0].url
+      }
+
+      res.buildingTransport = stringHandleTag(res.buildingTransport)
+      res.buildingMall = stringHandleTag(res.buildingMall)
+      res.buildingEdu = stringHandleTag(res.buildingEdu)
+      res.buildingHospital = stringHandleTag(res.buildingHospital)
+      res.buildingBank = stringHandleTag(res.buildingBank)
+      res.buildingRestaurant = stringHandleTag(res.buildingRestaurant)
+
+      setBuildingData(res)
+
+      props.form.setFieldsValue(res)
+      // console.log('mapJson: ', JSON.parse(res.mapJson))
+      setPoi((res.mapJson && JSON.parse(res.mapJson)) || [])
+      props.onSuccess(res)
+    })
+  }
+
+  /**
+   * 把 xxx,xxx,xxx  这样的格式转换成 [{ tagName: xxx, delete: true, automatic: false }, { tagName: xxx, delete: true, automatic: false }]
+   * @param {*} str
+   * @return 如果返回 str 为空 或者 非 string，则返回 str 本身，否则返回转换成功的数组
+   */
+  function stringHandleTag(str) {
+    if (typeof str === 'string' && str !== '') {
+      const arr = str.split(',')
+      return arrayTransition(arr)
+    }
+
+    return str
+  }
+
+  /**
+   * 把 [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, automatic: false }))
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        addBuilding(values)
+      }
+    });
+  }
+
+  function addBuilding(data) {
+    // console.log('poi: ', poi)
+    if (poi.length !== 0) {
+      data.mapJson = poi
+    }
+
+    // data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
+    data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
+    // 项目主图
+    data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
+    // 列表图
+    data.listImg = data.listImage && [{ imgType: 'list', url: data.listImage, orderNo: 1 }]
+    if (data.videoUrl) {
+      // console.log(data.videoUrl[0])
+      data.videoUrl = data.videoUrl[0]
+    }
+
+    if (data.tag) {
+      data.tag = data.tag.map((item, _) => ({ tagName: item }))
+    }
+
+    if (data.videoImage) {
+      data.videoImage = [{ imgType: 'videoImage', url: data.videoImage, orderNo: 1 }]
+    }
+
+    if (data.buildingTransport) {
+      data.buildingTransport = tagFilter(data.buildingTransport, 'Transport')
+    }
+    if (data.buildingMall) {
+      
+      data.buildingMall = tagFilter(data.buildingMall, 'Mall')
+    }
+    if (data.buildingEdu) {
+      data.buildingEdu = tagFilter(data.buildingEdu, 'Edu')
+    }
+    if (data.buildingHospital) {
+      data.buildingHospital = tagFilter(data.buildingHospital, 'Hospital')
+    }
+    if (data.buildingBank) {
+      data.buildingBank = tagFilter(data.buildingBank, 'Bank')
+    }
+    if (data.buildingRestaurant) {
+      data.buildingRestaurant = tagFilter(data.buildingRestaurant, 'Restaurant')
+    }
+  
+    // if(typeof(data.highlights) != "undefined" && (typeof(data.highlightsCover) == "undefined" || data.highlightsCover == null)){
+    //   openNotificationWithIcon('error', '请上传项目亮点封面')
+    //   return;
+    // }
+    console.log(data,"datadataddata")
+    if(typeof(data.highlights) == "undefined"){
+      data.highlights = null;
+    }
+    
+    const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
+    request({ ...api, data: { ...data } }).then(res => {
+      openNotificationWithIcon('success', '操作成功')
+      // router.go(-1)
+      getById(res.buildingId)
+    }).catch(err => {
+      // openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  /**
+   * 过滤 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))
+        } else {
+          p.data = 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)
+    return new Promise((resolve, reject) => {
+      if (file.type === 'video/mp4' || file.type === '.mp4') {
+          setVideoImage(true)
+          resolve(file)
+      } else {
+        openNotificationWithIcon('error', '项目视频，仅支持MP4格式')
+        reject()
+      }
+    })
+  }
+
+  // 周边设施 回调
+  function getMapScope(e) {
+    const coordinateValue = props.form.getFieldValue('coordinate')
+    if (!coordinateValue) {
+      openNotificationWithIcon('error', '请先选择项目坐标位置')
+      return
+    }
+    const coordinate = props.form.getFieldValue('coordinate').split(',')
+    const poiData = [].concat(POI_TYPES)
+    poiData.map(item => {
+      getAroundData({ types: item.key, location: `${coordinate[1]},${coordinate[0]}`, radius: e }).then(res => {
+        const { pois } = res
+        setFormMapScopeValue(item.key, pois)
+      }).catch(err => {
+        console.log(err.message)
+        openNotificationWithIcon('error', '周边数据获取失败')
+      })
+    })
+  }
+
+  function highlightsTypeChange(e) {
+    console.log(e.target.value,"ee")
+    setTypeState(e.target.value)
+  }
+
+  function setFormMapScopeValue(key, pois) {
+    const poiArray = pois.map(p => ({
+        address: p.address,
+        adname: p.adname,
+        cityname: p.cityname,
+        distance: p.distance,
+        id: p.id,
+        location: p.location,
+        name: p.name,
+        pname: p.pname,
+        shopinfo: p.shopinfo,
+        type: p.type,
+        typecode: p.typecode,
+      }))
+
+    // 设置表单值
+    setFormMapScopeTagValue(key, { data: poiArray })
+
+    const poiData = [].concat(POI_TYPES)
+    const newPoi = poiData.map(m => {
+      if (m.key === key) {
+        m.data = poiArray
+      }
+      return m
+    })
+
+    setPoi(newPoi)
+    return newPoi
+  }
+
+  function cityChange(e) {
+    setCityId(e)
+    if(buildingData.cityId === e){
+      setTimeout(()=>{
+        props.form.setFieldsValue({
+            'buildingArea': buildingData.buildingArea
+        })
+    },0)
+    }
+  }
+
+  function setFormMapScopeTagValue(keyType, item) {
+    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) || [])
+        props.form.setFieldsValue({ buildingTransport: tag.concat(buildingTransportValue) })
+        return 'buildingTransport';
+      case POI_TYPES_KETY.Bank:
+        const buildingBankValue = (stringHandleTag(buildingData.buildingBank) || [])
+        props.form.setFieldsValue({ buildingBank: tag.concat(buildingBankValue) })
+        return 'buildingBank';
+      case POI_TYPES_KETY.Edu:
+        const buildingEduValue = (stringHandleTag(buildingData.buildingEdu) || [])
+        props.form.setFieldsValue({ buildingEdu: tag.concat(buildingEduValue) })
+        return 'buildingEdu';
+      case POI_TYPES_KETY.Hospital:
+        const buildingHospitalValue = (stringHandleTag(buildingData.buildingHospital) || [])
+        props.form.setFieldsValue({ buildingHospital: tag.concat(buildingHospitalValue) })
+        return 'buildingHospital';
+      case POI_TYPES_KETY.Restaurant:
+        const buildingRestaurantValue = (stringHandleTag(buildingData.buildingRestaurant) || [])
+        props.form.setFieldsValue({ buildingRestaurant: tag.concat(buildingRestaurantValue) })
+        return 'buildingRestaurant';
+      case POI_TYPES_KETY.Mall:
+        const buildingMallValue = (stringHandleTag(buildingData.buildingMall) || [])
+        props.form.setFieldsValue({ buildingMall: tag.concat(buildingMallValue) })
+        return 'buildingMall';
+      default:
+        return ''
+    }
+  }
+
+  return (
+        <Form {...formItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="项目Id" style={{ display: 'none' }}>
+            {getFieldDecorator('buildingId')(<Input disabled />)}
+          </Form.Item>
+          <Form.Item label="楼盘编号" >
+            {getFieldDecorator('code', {
+              rules: [{ required: true, message: '请输入楼盘编号' }],
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="楼盘名称" >
+            {getFieldDecorator('buildingName', {
+              rules: [{ required: true, message: '请输入楼盘名' }],
+            })(<Input />)}
+          </Form.Item>
+          {/* <Form.Item label="别名" >
+            {getFieldDecorator('name')(<Input />)}
+          </Form.Item> */}
+          <Form.Item label="项目类型">
+            {getFieldDecorator('buildingProjectType', {
+              rules: [{ required: true, message: '请选择项目类型' }],
+            })(<BudildingProjectType />)}
+          </Form.Item>
+          <Form.Item label="列表展示均价" help="项目列表展示价格，示例：约10000元/㎡、约1000万元/套起">
+            {/* {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m² */}
+            {getFieldDecorator('price')(<Input />)}
+          </Form.Item>
+          <Form.Item label="开盘时间" >
+            {getFieldDecorator('openingDate')(<Input placeholder="预计xxxx年xx月开盘" maxLength = "15"/>)}
+          </Form.Item>
+          <Form.Item label="电话" >
+            {getFieldDecorator('tel', {
+              initialValue: '',
+              rules: [
+                  {
+                      pattern: new RegExp('^[0-9]*$'),
+                      message: '请输入正确的电话号码',
+                  },
+              ],
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目说明" >
+            {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过30个字" maxLength = "30"/>)}
+          </Form.Item>
+          <Form.Item label="物业类型" >
+            {getFieldDecorator('propertyType')(
+              // <Select mode="multiple" placeholder="物业类型" style={{ width: '1016px' }}>
+              //   <Option value="未知">未知</Option>
+              // </Select>,
+              <Input />,
+            )}
+          </Form.Item>
+          <Form.Item label="销售状态" >
+            {getFieldDecorator('marketStatus', {
+              rules: [{ required: true, message: '请选择销售状态' }],
+            })(
+              <Select placeholder="销售状态" style={{ width: '1016px' }}>
+                {/* <Option value="待定">待定</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售完">售完</Option> */}
+                <Option value="在线选房">在线选房</Option>
+                <Option value="待售">待售</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="项目标签" >
+            {getFieldDecorator('tag')(
+              <Select mode="tags" placeholder="输入后选中" style={{ width: '1016px' }}>
+
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：750*600，比例5:4，用于楼盘详情">
+            {getFieldDecorator('videoUrl')(
+              // disabled={fileUploadDisabled}
+              <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,
+            )}
+          </Form.Item>
+          <Form.Item label="视频封面图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于视频封面" >
+            {getFieldDecorator('videoImage', {
+              rules: [{ required: videoImage, message: '请选择视频封面图' }],
+            })(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘详情">
+            {getFieldDecorator('avatarImage', {
+              rules: [{ required: true, message: '请选择项目主图' }],
+            })(
+              <DragableUploadImageList multiple={true} />,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘封面图" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于楼盘列表">
+            {getFieldDecorator('listImage', {
+              rules: [{ required: true, message: '请选择列表图' }],
+            })(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          {/* <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
+            {getFieldDecorator('mapImg')(
+              <ImageUpload />,
+            )}
+          </Form.Item> */}
+          {/* <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
+            {getFieldDecorator('poster')(
+              <ImageUpload />,
+            )}
+          </Form.Item> */}
+          <Form.Item label="排序" help="数值越大，楼盘在小程序列表页中展示越靠前">
+            {getFieldDecorator('orderNo')(<Input />)}
+          </Form.Item>
+          {/* <Form.Item label="优惠信息" >
+            {getFieldDecorator('discount')(<Input />)}
+          </Form.Item> */}
+          <Form.Item label="首页推荐" >
+            {getFieldDecorator('isMain', {
+              initialValue: 1,
+            })(
+            <Radio.Group>
+              <Radio value={1}>是</Radio>
+              <Radio value={2}>否</Radio>
+            </Radio.Group>,
+            )}
+          </Form.Item>
+          <Form.Item label="所在城市" >
+            {getFieldDecorator('cityId', {
+              rules: [{ required: true, message: '请选择城市' }],
+            })(
+              <SelectCity onChange={(e) => cityChange(e)}/>,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘区域" >
+            {getFieldDecorator('buildingArea', {
+              rules: [{ required: true, message: '请输入楼盘区域' }],
+            })(<AreaSelect cityId={cityId}/>)}
+          </Form.Item>
+          <Form.Item label="项目地址" >
+            {getFieldDecorator('address', {
+              rules: [{ required: true, message: '请输入项目地址' }],
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目坐标" >
+            {getFieldDecorator('coordinate', {
+              rules: [{ required: true, message: '请输入项目坐标' }],
+            })(<Input disabled />)}
+          </Form.Item>
+          <Form.Item label="地图位置" >
+            {getFieldDecorator('mapCoordinate')(<Amap onChange={e => props.form.setFieldsValue({ coordinate: e })}/>)}
+          </Form.Item>
+          <Form.Item label="周边设施搜索范围" style={{ width: '2000px' }}>
+            {getFieldDecorator('mapScope', {
+              rules: [{ required: true, message: '请选择周边设施搜索范围' }],
+            })(
+              <Select placeholder="请选择周边设施搜索范围" style={{ width: '970px' }} onChange={e => getMapScope(e)}>
+                <Option value={1000}>1公里</Option>
+                <Option value={3000}>3公里</Option>
+                <Option value={5000}>5公里</Option>
+                <Option value={10000}>10公里</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="周边交通" >
+            {getFieldDecorator('buildingTransport')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边商业" >
+            {getFieldDecorator('buildingMall')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边学校" >
+            {getFieldDecorator('buildingEdu')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边医院" >
+            {getFieldDecorator('buildingHospital')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边银行" >
+            {getFieldDecorator('buildingBank')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边餐饮" >
+            {getFieldDecorator('buildingRestaurant')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="绿化率" >
+            {getFieldDecorator('greeningRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="容积率" >
+            {getFieldDecorator('volumeRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="车位比" >
+            {getFieldDecorator('parkingRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="规划户数" >
+            {getFieldDecorator('familyNum')(<InputNumber />)}
+          </Form.Item>
+          <Form.Item label="物业公司" >
+            {getFieldDecorator('serviceCompany')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
+          </Form.Item>
+          <Form.Item label="物业费" >
+            {getFieldDecorator('serviceFee')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
+          </Form.Item>
+          <Form.Item label="装修标准" >
+            {getFieldDecorator('decoration')(<Input />)}
+          </Form.Item>
+          <Form.Item label="开发商" >
+            {getFieldDecorator('propertyDeveloper')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
+          </Form.Item>
+          <Form.Item label="备案名" >
+            {getFieldDecorator('recordName')(<Input placeholder="不超过30个字" maxLength = "30"/>)}
+          </Form.Item>
+          <Form.Item label="楼栋总数" >
+            {getFieldDecorator('buildingNum')(<Input min={0} type="number" style={{ width: 80}}/>)}
+          </Form.Item>
+          {/* <Form.Item label="交房时间" >
+            {getFieldDecorator('receivedDate')(<DatePicker />)}
+          </Form.Item> */}
+          {/* <Form.Item label="产权年限" >
+            {getFieldDecorator('rightsYear')(<InputNumber />)}
+          </Form.Item> */}
+          {/* <Form.Item label="预售许可证" >
+            {getFieldDecorator('preSalePermit')(
+              <ImageUpload />,
+            )}
+          </Form.Item>*/}
+          <Form.Item label="亮点封面" help="建议尺寸：比例3:1 690*230px，用于项目详情-项目亮点封面图">
+            {getFieldDecorator('highlightsCover')(
+              <NewImageUpload onChange={e => console.log(e,"66")}/>,
+            )}
+          </Form.Item>
+          <Form.Item label="亮点类型" help="说明：项目亮点必须上传封面图才会在小程序端展示">
+            {getFieldDecorator('highlightsType',{
+              initialValue: "rich",
+            })(
+            <Radio.Group onChange={e => highlightsTypeChange(e)}>
+              <Radio value="rich">自定义</Radio>
+              <Radio value="link">公众号链接</Radio>
+            </Radio.Group>,
+            )}
+          </Form.Item>
+          {typeState === 'link' && <Form.Item label="公众号链接" help="只能填写同一主体公众号的文章链接">
+            {getFieldDecorator('highlightsLink')(<Input placeholder="请输入公众号链接" />)}
+          </Form.Item>}
+          {typeState === 'rich' && <Form.Item label="亮点内容" >
+            {getFieldDecorator('highlights')(
+              <Wangedit />,
+            )}
+          </Form.Item> }
+          <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit">
+                确定
+            </Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>
+                取消
+            </Button>
+          </Form.Item>
+        </Form>
+  )
+}
+
+const WrappedAddBuildingForm = Form.create({ name: 'addBuilding' })(AddBuilding);
+
+export default WrappedAddBuildingForm

estateagents-admin-manager/src/pages/building/list/add/components/buildingImage.jsx

@@ -0,0 +1,290 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal, Layout } from 'antd';
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import router from 'umi/router';
+import DragableUploadImageList from '@/components/DragableUploadImageList'
+
+const { Header, Footer, Sider, Content } = Layout;
+
+const modalEdiFormItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+};
+
+/**
+ * 弹框
+ */
+function ModalEdi(props) {
+  const { apartment, buildingId, apartmentId } = props.visibleData
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+
+  if (!props.visibleData) {
+    console.error('缺少visibleData参数!')
+  }
+
+  useEffect(() => {
+    setVisibleData(props.visibleData)
+    props.form.setFieldsValue({ apartmentId, apartmentName: apartment !== '' ? apartment.apartmentName : '' })
+  }, [props.visibleData.visible])
+
+  function handleOk(e) {
+    // console.log(e);
+    props.onCancel();
+    props.form.resetFields();
+  }
+
+  function handleCancel(e) {
+    // console.log(e);
+    props.onCancel();
+    props.form.resetFields();
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        submitData(values)
+      }
+    });
+  }
+
+  function submitData(data) {
+    if (buildingId === '' || buildingId === undefined) {
+      return
+    }
+    if (data.img) {
+        // 如果是 名称 和 图片一起编辑，就穿最新的图片
+      data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    } else {
+        // 如果是 名称 和 图片一起编辑，就穿最新的图片
+      data.img = visibleData.apartment.buildingImgList
+    }
+    data.buildingId = buildingId;
+    data.apartmentType = 'photo'
+    const api = (data.apartmentId !== undefined && data.apartmentId !== '') ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      handleCancel()
+      props.onSuccess()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('error', err)
+    })
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Modal
+          title="编辑"
+          visible={visibleData.visible}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          width={700}
+          footer={null}
+        >
+         <Form {...modalEdiFormItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="编号" style={{ display: 'none' }}>
+              {getFieldDecorator('apartmentId')(<Input />)}
+          </Form.Item>
+          <Form.Item label="相册名称">
+            {getFieldDecorator('apartmentName', {
+              rules: [
+                {
+                  required: true,
+                  message: '请输入相册名称',
+                },
+                {
+                  max: 10,
+                  message: '不超过10个字符',
+                },
+              ],
+            })(<Input />)}
+          </Form.Item>
+          {
+            !props.noImage && <Form.Item label="选择图片" help="建议图片尺寸750px*562px，比例4:3,格式：jpg">
+            {getFieldDecorator('img', {
+              rules: [
+                {
+                  required: true,
+                  message: '请选择图片',
+                },
+              ],
+            })(<ImageListUpload />)}
+          </Form.Item>
+          }
+          <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+            </Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => handleCancel()}>
+              取消
+            </Button>
+          </Form.Item>
+         </Form>
+        </Modal>
+    </>
+  )
+}
+
+const WrappedModalEdiForm = Form.create({ name: 'ModalEdi' })(ModalEdi);
+
+/**
+ * 模块
+ */
+function BuildingImageModel(props) {
+  const [imageList, setImageList] = useState([])
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+
+  useEffect(() => {
+    setImageList(getImgUrl())
+  }, [props.apartment.apartmentId])
+
+  function getImgUrl() {
+    return ((props.apartment.buildingImgList || [])).map(item => item.url)
+  }
+
+  function submitData(data) {
+    const { apartmentId } = props.apartment
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    data.buildingId = props.apartment.buildingId;
+    data.apartmentType = 'photo'
+    const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      // openNotificationWithIcon('error', err)
+    })
+  }
+
+  function onImageChange(e) {
+    setImageList(e)
+       
+    // 新增加图片后，更新后端数据
+    const img = e.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    submitData({ ...props.apartment, img })
+  }
+
+  function edi() {
+    setVisibleData({ visible: true, buildingId: props.apartment.buildingId, apartmentId: props.apartment.apartmentId, apartment: props.apartment })
+  }
+
+  function onCancel(e) {
+    setVisibleData({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  }
+
+  function deletePhoto() {
+    Modal.confirm({
+      title: '确认删除当前相册',
+      // content: 'Bla bla ...',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        request({ ...apis.building.buildingApartmentDelete, urlData: { id: props.apartment.apartmentId } }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+          props.onSuccess()
+        }).catch(err => {
+    
+        })
+      },
+    });
+    
+  }
+
+  return (
+    <>
+      <Button style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+      <span style={{ marginTop: '10px', marginBottom: '10px' }}>{props.apartment.apartmentName}({imageList.length})</span>
+      <Button type="link" style={{ color: 'blue' }} onClick={() => edi()}>重命名</Button>
+      <Button type="link" style={{ color: 'blue' }} onClick={() => deletePhoto()}>删除相册</Button>
+      <DragableUploadImageList value={imageList} onChange={onImageChange} unlimited/>
+      {/* <ImageListUpload value={imageList} onChange={onImageChange} unlimited/> */}
+
+       {/* 编辑页 */}
+       <WrappedModalEdiForm visibleData={visibleData} onCancel={e => onCancel(e)} onSuccess={() => props.onSuccess()} noImage/>
+       <hr />
+    </>
+  )
+}
+
+/**
+ * 主体
+ */
+function buildingImage(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  const [imageList, setImageList] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList()
+  }, [props.building.buildingId])
+ 
+
+  function edi() {
+    setVisibleData({ visible: true, buildingId: props.building.buildingId, apartmentId: '', apartment: '' })
+  }
+
+  function onCancel(e) {
+    setVisibleData({ visible: false, buildingId: '', apartmentId: '', apartment: '' })
+  }
+
+  function onSuccess(e) {
+    getList()
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'photo' } }).then(res => {
+      setImageList(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  return (
+    <>
+      <Button type="primary" onClick={() => edi()}>新增</Button>
+      <Layout style={{ background: '#fff' }}>
+        {
+          imageList.map(item => <Content><BuildingImageModel apartment={item} key={item.apartmentId} onSuccess={e => onSuccess(e)}/></Content>)
+        }
+      </Layout>
+
+      {/* 编辑页 */}
+      <WrappedModalEdiForm visibleData={visibleData} onCancel={e => onCancel(e)} onSuccess={e => onSuccess(e)}/>
+    </>
+  )
+}
+
+export default buildingImage

estateagents-admin-manager/src/pages/building/list/add/components/buildingProjectType.jsx

@@ -0,0 +1,305 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, Select, InputNumber } from 'antd';
+import { render } from 'react-dom';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+/**
+ * 项目类型 form 表单子组件
+ *
+ * @param {*} props
+ */
+class TypeForm extends React.Component {
+
+  componentDidMount() {
+    this.props.form.setFieldsValue(this.props.type)
+  }
+
+  onChange(e, name) {
+    // console.log(e)
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        // console.log('Received values of form: ', values);
+        const currentValue = name === 'marketStatus' ? e : e.target.value
+        if (currentValue === '') {
+          values[name] = null
+        } else {
+          values[name] = currentValue
+        }
+        
+        values.buildingTypeName = this.props.type.buildingTypeName
+        if(values["startPrice"] === "") {
+          values["startPrice"] = null
+        }
+        if(values["endPrice"] === "") {
+          values["endPrice"] = null
+        }
+
+        if(values["endPrice"] != null && values["startPrice"] == null){
+          notification['warn']({
+            message: "请填写最低价！",
+            description: '',
+          })
+          return
+        }
+        if(values["startPrice"] != null && values["endPrice"] != null && Number(values["startPrice"]) > Number(values["endPrice"])){
+          notification['warn']({
+            message: "最低价不得高于最高价！",
+            description: '',
+          })
+          return
+        }
+        this.props.onSuccess(values)
+      }
+    });
+  }
+
+  close() {
+    this.props.onClose(this.props.form.getFieldsValue(['buildingTypeId']))
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+
+    // this.props.form.setFieldsValue(this.props.type)
+    // console.log(this.props.type,"33333333")
+    return (
+      <>
+        <Col span={11} style={{
+          position: 'relative',
+          border: '1px solid #eee',
+          borderRadius: '4px',
+          marginTop: '16px',
+        }}>
+
+          <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
+
+          <Form {...formItemLayout} style={{ padding: '5px 0px 5px 5px' }}>
+            <Form.Item label="类型编号" style={{ display: 'none' }}>
+              {getFieldDecorator('buildingTypeId')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="状态" style={{ display: 'none' }}>
+              {getFieldDecorator('status')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="价格类型">
+                {getFieldDecorator('priceType')(
+                  <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" ? "元/㎡" : this.props.type.priceType === "lease" ? "元/㎡/天" : "万元/套"}
+            </Form.Item>
+            <Form.Item label="销售状态" >
+            {getFieldDecorator('marketStatus')(
+              <Select placeholder="销售状态" onChange={e => this.onChange(e, 'marketStatus')} >
+                <Option value="待售">待售</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
+              </Select>,
+            )}
+          </Form.Item>
+            <Form.Item label="装修标准">
+              {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
+            </Form.Item>
+            <Form.Item label="产权年限">
+              {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')} />)}
+            </Form.Item>
+          </Form>
+        </Col>
+      </>
+    )
+  }
+}
+
+const WrappedTypeForm = Form.create({ name: 'TypeForm' })(TypeForm);
+
+/**
+ *项目类型组件
+ *
+ * @param {*} props
+ */
+class ProjectTypeBody extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      one: false,
+      projectType: [],
+      defaultCheckboxValue: [], // 多选框默认选中的值
+      visible: false,
+      data: [],
+      // data: [{ buildingTypeId: '1', buildingTypeName: '公寓', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '2', buildingTypeName: '住宅', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '3', buildingTypeName: '太平房', price: '10', decoration: '全包', rightsYear: '10', status: '1' }],
+    }
+  }
+
+  componentDidMount() {
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  componentDidUpdate(prevProps) {
+    // 典型用法（不要忘记比较 props）：
+    if (this.props.value !== prevProps.data && !this.state.one) {
+      this.setValue()
+      this.setState({ one: true })
+    }
+  }
+
+  onSuccess = (values, item) => {
+    const newData = this.getNewProjectType(values)
+    this.setState({ data: newData })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(newData)
+    }
+  }
+
+  onCheckboxChange = checkedValues => {
+    // console.log('checkedValues: ', checkedValues)
+    const checked = (`${checkedValues}` || '').split(',')
+    const { projectType } = this.state
+    const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, startPrice: null,endPrice: null,priceType: "average", decoration: null, rightsYear: null, status: '1' }))
+    const updateProjectDate = this.updateProjectType(tempDate)
+    console.log('updateProjectDate: ', updateProjectDate)
+    this.setState({ data: updateProjectDate })
+    this.setState({ defaultCheckboxValue: updateProjectDate.map(item => item.buildingTypeId) })
+  }
+
+  onClose = e => {
+    console.log(2)
+    const { data } = this.state
+    console.log('onClose——data: ', data)
+    console.log('onClose: ', e.buildingTypeId)
+    const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    console.log('onClose——data111: ', buildingType)
+    this.setState({ data: buildingType })
+    this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(buildingType)
+    }
+  }
+
+  getNewProjectType = values => {
+    const data = []
+    this.state.data.map(item => {
+      if (item.buildingTypeId === values.buildingTypeId) {
+        data.push(values)
+      } else {
+        data.push(item)
+      }
+    })
+
+    return data
+  }
+
+  updateProjectType = values => {
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
+
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
+  }
+
+  getList = params => {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      this.setState({ projectType: res.records })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  setValue = () => {
+    let tempData = []
+    let tempCheckboxValue = []
+    const { value } = this.props
+    // console.log('value: ', value)
+    if (value !== undefined && value !== null) {
+      tempData = value
+      tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+      this.setState({ defaultCheckboxValue: tempCheckboxValue })
+      this.setState({ data: tempData })
+    }
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    })
+  }
+
+  handleOk = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  handleCancel = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  showMadel = () => {
+    this.setState({ visible: true })
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  render() {
+    return (
+      <>
+        <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />
+        <Modal
+          title="项目类型"
+          visible={this.state.visible}
+          // onOk={this.handleOk}
+          onCancel={this.handleCancel}
+          footer={
+            [
+            <Button key="submit" type="primary" onClick={this.handleOk}>
+             确定  
+            </Button>] 
+          }
+        >
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
+        </Modal>
+        <Row type="flex" justify="space-between">
+          {
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.buildingTypeId} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+          }
+        </Row>
+      </>
+    )
+  }
+}
+
+export default ProjectTypeBody

estateagents-admin-manager/src/pages/building/list/add/components/imageSet.jsx

@@ -0,0 +1,197 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import { router } from 'umi';
+import ModalImage from './modalImage';
+
+const { confirm } = Modal;
+
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+  {
+    id: 4,
+    name: '在租',
+  },
+]
+
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function imageSet(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, apartmentId: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'apart' } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
+  /**
+   *打开编辑页
+   *
+   * @param {*} record
+   */
+  function showEdi(record) {
+    setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId })
+  }
+
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteApartment(record) {
+    confirm({
+      title: '确认删除当前数据?',
+      content: '确定后成功删除，点击取消则放弃当前操作',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
+          getList()
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() { },
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '户型名称',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '销售状态',
+      dataIndex: 'marketStatus',
+      key: 'marketStatus',
+      render: (_, record) => <span>{(saleType.filter(x => x.id == record.marketStatus)[0] || {}).name}</span>,
+    },
+    {
+      title: '户型',
+      dataIndex: 'houseType',
+      key: 'houseType',
+      render: (_, record) => <span>{(houseType.filter(x => x.id == record.houseType)[0] || {}).name}</span>,
+    },
+    {
+      title: '面积',
+      dataIndex: 'buildingArea',
+      key: 'buildingArea',
+      render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
+    },
+    {
+      title: '使用面积',
+      dataIndex: 'insideArea',
+      key: 'insideArea',
+      render: (insideArea, _) => <span>{`${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}`}</span>,
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi(record)}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+        </>
+      ),
+    },
+  ]
+
+  return (
+    <>
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
+        <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+      <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
+
+      {/* 编辑页 */}
+      {/*  onSuccess是子组件传递事件信息  */}
+      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
+    </>
+  )
+}
+
+export default imageSet

estateagents-admin-manager/src/pages/building/list/add/components/modalImage.jsx

@@ -0,0 +1,259 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const { TextArea } = Input;
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+  {
+    id: 4,
+    name: '在租',
+  },
+]
+
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+]
+
+/**
+ * 图片信息
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalImage extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       visibleData: { visible: false, apartmentId: '', buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  // componentDidMount() {
+  //
+  // }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
+      this.getById()
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+    this.props.onSuccess()
+  }
+
+  getById(params) {
+    const { apartmentId } = this.props.visibleData
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
+      // res.img = res.buildingImgList.map(item => item.url)
+      if (res.buildingImgList) {
+        res.img = res.buildingImgList[0].url
+      }
+      
+      this.props.form.setFieldsValue(res)
+    }).catch(err => {
+     this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 提交
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        this.submitData(values)
+      }
+    });
+  }
+
+  submitData(data) {
+    // TODO 这里应该是要支持多图，但是封装的控件没有
+    // data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 0 }]
+    data.buildingId = this.props.visibleData.buildingId;
+    data.apartmentType = 'apart'
+    const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+
+      // 传递父组件事件
+      // onSuccess() 是自定义
+      this.props.onSuccess()
+
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  /**
+   * 取消按钮
+   *
+   * @memberof ModalImage
+   */
+  closeModal() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <>
+        <Modal
+            title="户型设置"
+            width={1100}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onOk={() => this.handleOk()}
+            onCancel={e => this.handleCancel(e)}
+          >
+            <Form {...formItemLayout} onSubmit={e => this.handleSubmit(e)}>
+              <Form.Item label="编号" style={{ display: 'none' }}>
+                  {getFieldDecorator('apartmentId')(<Input />)}
+              </Form.Item>
+              <Form.Item label="户型名称">
+                {getFieldDecorator('apartmentName', {
+                  rules: [
+                    { required: true, message: '请填写户型名称' },
+                    { max: 10, message: '户型名称不超过10个字符' },
+                  ],
+                })(<Input placeholder="户型名称不超过10个字符"/>)}
+              </Form.Item>
+              <Form.Item label="销售状态">
+                {getFieldDecorator('marketStatus', {
+                  rules: [{ required: true, message: '请选择销售状态' }],
+                })(
+                  <Select placeholder="销售状态">
+                    {
+                      saleType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item label="图片" help="建议图片尺寸336px*336px，比例1:1,格式：jpg">
+              {getFieldDecorator('img', {
+                  rules: [{ required: true, message: '请上传户型图片' }],
+              })(
+                // <ImageListUpload />,
+                <ImageUpload />,
+              )}
+              </Form.Item>
+              <Form.Item label="户型">
+                {getFieldDecorator('houseType', {
+                  rules: [{ required: true, message: '请选择户型' }],
+                })(
+                  <Select placeholder="户型">
+                    {
+                      houseType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item label="面积" help="单位 ㎡">
+                {getFieldDecorator('buildingArea')(<Input type="number" precision = '2' min='0.00' step='0.01'/>)}
+              </Form.Item>
+              <Form.Item label="使用面积" help="单位 ㎡">
+                {getFieldDecorator('insideArea')(<Input type="number" precision = '2' min='0.00' step='0.01'/>)}
+              </Form.Item>
+              <Form.Item label="权重" help="数值越大越靠前">
+                {getFieldDecorator('orderNo')(<Input type="number" />)}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => this.handleCancel()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
+      </>
+    );
+  }
+}
+
+const WrappedModalImageForm = Form.create({ name: 'modalImage' })(ModalImage);
+
+export default WrappedModalImageForm

estateagents-admin-manager/src/pages/building/list/add/components/modalPanoramaImage.jsx

@@ -0,0 +1,250 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+]
+  
+/**
+ * 图片信息
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalPanoramaImage extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       visibleData: { visible: false, apartmentId: '', buildingId: '',panoramaType: "apartment" },
+    }
+  }
+
+  // 挂载之后
+  // componentDidMount() {
+  //
+  // }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
+      this.getById()
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+    this.props.onSuccess()
+  }
+
+  getById(params) {
+    const { apartmentId } = this.props.visibleData
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
+      // res.img = res.buildingImgList.map(item => item.url)
+      if (res.buildingImgList) {
+        res.img = res.buildingImgList[0].url
+      }
+      
+      this.props.form.setFieldsValue(res)
+    }).catch(err => {
+     this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 提交
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        this.submitData(values)
+      }
+    });
+  }
+
+  submitData(data) {
+    data.buildingId = this.props.visibleData.buildingId;
+    const api = apis.paorama.add;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+
+      // 传递父组件事件
+      // onSuccess() 是自定义
+      this.props.onSuccess()
+
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  radioOnChange(e) {
+    this.setState({ visibleData: { ...this.state.visibleData, panoramaType: e.target.value } })
+  }
+
+  /**
+   * 取消按钮
+   *
+   * @memberof ModalImage
+   */
+  closeModal() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <>
+        <Modal
+            title="新增全景图"
+            width={1100}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onOk={() => this.handleOk()}
+            onCancel={e => this.handleCancel(e)}
+          >
+            <Form {...formItemLayout} onSubmit={e => this.handleSubmit(e)}>
+              <Form.Item label="全景类型" help="全景图展示位置: 项目详情Banner,户型介绍">
+                {getFieldDecorator('panoramaType', {
+                  rules: [
+                    {
+                      required: true,
+                      message: '请选择全景类型',
+                    },
+                  ],
+                })(
+                  <Radio.Group onChange={(e) => this.radioOnChange(e)}>
+                    <Radio value="apartment">户型</Radio>
+                    <Radio value="building">项目</Radio>
+                  </Radio.Group>,
+                )}
+              </Form.Item>
+              { this.state.visibleData.panoramaType == "apartment" && <Form.Item label="全景内容">
+                {getFieldDecorator('apartmentId', {
+                  rules: [{ required: true, message: '请选择全景内容' }],
+                })(
+                  <Select placeholder="户型">
+                    {
+                      (this.state.visibleData.panoramaList || []).map((item, _) => <Option value={item.apartmentId}>{item.apartmentName}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>}
+              { this.state.visibleData.panoramaType == "building" && <Form.Item label="全景内容">
+                {getFieldDecorator('content', {
+                  rules: [{ required: true, message: '请输入全景内容' }],
+                })(
+                  <Input />,
+                )}
+              </Form.Item>}
+              <Form.Item label="选择封面" help="建议图片尺寸750px*600px，比例5:4,格式：jpg">
+              {getFieldDecorator('coverImg', {
+                  rules: [{ required: true, message: '请上传封面图片' }],
+              })(
+                // <ImageListUpload />,
+                <ImageUpload />,
+              )}
+              </Form.Item>
+              <Form.Item label="链接地址">
+                {getFieldDecorator('panoramaLink', {
+                  rules: [{ required: true, message: '请输入链接地址' }],
+                })(<Input />)}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => this.handleCancel()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
+      </>
+    );
+  }
+}
+
+const WrappedModalPanoramaImageForm = Form.create({ name: 'modalPanoramaImage' })(ModalPanoramaImage);
+
+export default WrappedModalPanoramaImageForm

estateagents-admin-manager/src/pages/building/list/add/components/panoramaImage.jsx

@@ -0,0 +1,184 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import { router } from 'umi';
+import ModalPanoramaImage from './modalPanoramaImage';
+
+const { confirm } = Modal;
+
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function panoramaImage(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, apartmentId: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.paorama.list, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'apart' } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
+  /**
+   *打开编辑页
+   *
+   * @param {*} record
+   */
+  function showEdi(record) {
+    // 网路请求
+    request({ ...apis.paorama.panoramaApartList, params: { buildingId: props.building.buildingId } }).then(res => {
+      setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId, panoramaType: "apartment", panoramaList: res })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteApartment(record) {
+    confirm({
+      title: '确认删除当前数据?',
+      content: '确定后成功删除，点击取消则放弃当前操作',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.paorama.delete, urlData: { id: record.panoramaId } }).then(res => {
+          getList()
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() { },
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '封面图',
+      dataIndex: 'coverImg',
+      key: 'coverImg',
+      render: (x, record) => <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'panoramaType',
+      key: 'panoramaType',
+      render: (x, record) => <span>{x === "apartment" ? "户型" : "项目"}</span>,
+    },
+    {
+      title: '内容',
+      dataIndex: 'content',
+      key: 'content',
+    },
+    {
+      title: '链接地址',
+      dataIndex: 'panoramaLink',
+      key: 'panoramaLink',
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+        </>
+      ),
+    },
+  ]
+
+  return (
+    <>
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
+        <Button type="primary" onClick={() => showEdi()}>新增全景图</Button>
+        <Button onClick={() => router.go(-1)}>返回</Button>
+      </div>
+      <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
+
+      {/* 编辑页 */}
+      {/*  onSuccess是子组件传递事件信息  */}
+      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
+    </>
+  )
+}
+
+export default panoramaImage

estateagents-admin-manager/src/pages/building/list/add/components/poster.jsx

@@ -0,0 +1,164 @@
+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 moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import yinhao from '../../../../../assets/yinhao.png'
+import xiaochengxu from '../../../../../assets/xiaochengxu.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+import Styles from '../style.less';
+import apis from '../../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const Poster = props => {
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
+  const { buildingId } = props.building
+
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        ...apis.activity.poster,
+        params: { targetId: buildingId, targetType: 'building' },
+      }).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 => {
+        message.info(err.msg || err.message)
+      })
+
+      getById(buildingId)
+      getMiniappName()
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
+      setBuilding(res)
+      console.log('getById: ', res)
+    })
+  }
+  // 获取小程序名称
+  const [miniappName, setMiniappName] = useState('')
+  function getMiniappName() {
+
+    request({ ...apis.building.getMiniappName }).then(res => {
+    
+      setMiniappName(res)
+     
+    })
+  }
+
+  const submitPoster = () => {
+    if (buildingId) {
+      if (!imgValue) {
+        message.error('请选择海报图片')
+        return
+      }
+
+      if (posterId) {
+        request({
+          ...apis.activity.updatePoster,
+          urlData: { id: posterId },
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(() => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({
+          ...apis.activity.addPoster,
+          data: { targetId: buildingId, targetType: 'building', 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="" />
+
+          <p className={Styles.tagLabel}>
+            {
+              building.buildingTag && building.buildingTag.map(item => <span>{item.tagName}</span>)
+            }
+          </p>
+          <p style={{
+            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+            display: '-webkit-box', lineClamp: '3', height: '36px', lineHeight: '36px',
+            WebkitLineClamp: '1',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{inputValue || (building.buildingName || '海报标题')}</p>
+          <p style={{ color: '#999', padding: ' 0 20px' }}><span style={{ color: '#fd0d0c', fontSize: '24px', marginLeft: '6px' }}>{building.price} </span><span style={{ color: '#fd0d0c', fontSize: '20px' }}></span></p>
+          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} 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: '30px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 楼盘海报图</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘海报</p>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+          <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+        </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>
+    </div>
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Poster

estateagents-admin-manager/src/pages/building/list/add/components/share.jsx

@@ -0,0 +1,96 @@
+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 moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import logo from '../../../../../assets/logo.png';
+import touxiang from '../../../../../assets/touxiang.jpg';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+import apis from '../../../../../services/apis';
+
+const Share = props => {
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
+
+  const { buildingId } = props.building
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        ...apis.activity.shareContent,
+        params: { targetId: buildingId, targetType: 'building' },
+      }).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 (buildingId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: { targetId: buildingId, shareContentType: 'building', shareContentImg: imgValue,shareContentTitle: inputValue },
+        }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+       } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: { targetId: buildingId, shareContentType: 'building', 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 : '精准获客平台'}</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)} />
+    </div>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘分享好友</p>
+    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Share

estateagents-admin-manager/src/pages/building/list/add/components/tags.jsx

@@ -0,0 +1,107 @@
+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,
+    inputValue: '',
+  };
+
+  // 每次取值，都从 this.props.value 获取最新值
+  getTags = () => {
+    // (this.props.value || '').split(',')
+    if (this.props.value) {
+      // return this.props.value.split(',')
+      return this.props.value
+    }
+
+    return []
+  }
+
+  toggleOnChange = tags => {
+    if (typeof this.props.onChange === 'function') {
+      // this.props.onChange(tags.join(','))
+      this.props.onChange(tags)
+    }
+  }
+
+  handleClose = removedTag => {
+    const tags = this.getTags().filter(tag => tag.tagName !== removedTag);
+    // this.setState({ tags });
+    this.toggleOnChange(tags)
+  };
+
+  showInput = () => {
+    this.setState({ inputVisible: true }, () => this.input.focus());
+  };
+
+  handleInputChange = e => {
+    this.setState({ inputValue: e.target.value });
+  };
+
+  handleInputConfirm = () => {
+    const { inputValue } = this.state;
+
+    const tags = this.getTags()
+    const tagList = tags.map(x => x.tagName)
+    if (inputValue && tagList.indexOf(inputValue) === -1) {
+      // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
+      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true, automatic: false }]))
+    }
+
+    this.setState({
+      inputVisible: false,
+      inputValue: '',
+    });
+  };
+
+  saveInputRef = input => (this.input = input);
+
+  render() {
+    const { inputVisible, inputValue } = this.state;
+    console.log('this.getTags(): ', this.getTags())
+    return (
+      <div>
+        {this.getTags().map((tag, index) => {
+          const isLongTag = tag.length > 20;
+          const tagElem = (
+            <Tag key={`${tag.tagName}${index}`} closable={ tag.delete } onClose={() => this.handleClose(tag.tagName)}>
+              {isLongTag ? `${tag.slice(0, 20)}...` : tag.tagName}
+            </Tag>
+          );
+          return isLongTag ? (
+            <Tooltip title={tag.tagName} key={`${tag.tagName}${index}`}>
+              {tagElem}
+            </Tooltip>
+          ) : (
+            tagElem
+          );
+        })}
+        {inputVisible && (
+          <Input
+            ref={this.saveInputRef}
+            type="text"
+            size="small"
+            style={{ width: 78 }}
+            value={inputValue}
+            onChange={this.handleInputChange}
+            onBlur={this.handleInputConfirm}
+            onPressEnter={this.handleInputConfirm}
+          />
+        )}
+        {!inputVisible && (
+          <Tag onClick={this.showInput} style={{ background: '#fff', borderStyle: 'dashed' }}>
+            <Icon type="plus" /> 新建
+          </Tag>
+        )}
+      </div>
+    );
+  }
+}
+
+export default EditableTagGroup

estateagents-admin-manager/src/pages/building/type/edi.jsx

@@ -0,0 +1,118 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, Row, Col, Form, Alert, notification } from 'antd';
+import router from 'umi/router';
+import Styles from './style.less';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+function body(props) {
+  const { getFieldDecorator } = props.form;
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  let data = {}
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // 提交数据
+        submitData(values)
+      }
+    });
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
+      data = res
+      props.form.setFieldsValue(res)
+    })
+  }
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function submitData(dataSources) {
+    if (id !== '') {
+      // 修改
+      updateType(dataSources)
+      return
+    }
+
+    dataSources.status = 1
+    dataSources.createDate = new Date()
+    request({ ...apis.buildingType.add, data: { ...dataSources } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
+    }).catch(err => {
+      
+    })
+  }
+
+    // 修改
+    function updateType(row) {
+      // const { url, method } = apis.buildingType.update
+      // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+
+      // request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      //   router.go(-1)
+      // })
+      request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功')
+        router.go(-1)
+      }).catch(err => {
+        
+      })
+    }
+
+  return (
+    <>
+        <Form onSubmit={handleSubmit} style={{ width: '500px', margin: 'auto' }}>
+          <Form.Item style={{ display: 'none' }}>
+            {getFieldDecorator('buildingTypeId')(
+              <Input
+                placeholder="buildingTtypeId"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('buildingTypeName', {
+              rules: [{ required: true, message: '请输入名称' }],
+            })(
+              <Input
+                placeholder="名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit" className={ Styles.addButton } style={{ margin: '0' }}>
+              确定
+            </Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>
+              取消
+            </Button>
+          </Form.Item>
+        </Form>
+    </>
+  )
+}
+
+const WrappedBuidingTypeForm = Form.create({ name: 'body' })(body);
+
+export default WrappedBuidingTypeForm

estateagents-admin-manager/src/pages/building/type/index.jsx

@@ -0,0 +1,125 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Table, Pagination, Alert, Icon, Tag, notification, Modal } from 'antd'
+import router from 'umi/router';
+import moment from 'moment';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+export default function BuildType() {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{ records: [] }])
+
+  const columns = [
+    {
+      title: '编号',
+      dataIndex: 'index',
+      key: 'index',
+      render: (text, record, index) => <span>{index + 1}</span>,
+    },
+    {
+      title: '类型名称',
+      dataIndex: 'buildingTypeName',
+      key: 'buildingTypeName',
+      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{record.buildingTypeName}</Tag>,
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD')}</span>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'row',
+      key: 'row',
+      render: withActions((_, record) => [
+        <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={() => deleteType(record)} />
+        </AuthButton>,
+        <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={() => toEdi(record.buildingTypeId)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [])
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      // openNotificationWithIcon('error', err)
+    })
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line no-console
+    console.log('Page: ', pageNumber);
+    getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  function deleteType(row) {
+    row.status = -1
+    const modal = Modal.confirm();
+    modal.update({
+      content: '确认删除？',
+      okText: '确认',
+      cancelText: '关闭',
+      onOk: () => {
+        request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
+          getList({ pageNum: data.current, pageSize: 10 })
+        }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+
+        modal.destroy();
+      },
+      onCancel: () => {
+        modal.destroy();
+      },
+    });
+  }
+
+  // 跳转修改页
+  function toEdi(currentId) {
+    router.push({
+      pathname: '/building/type/edi',
+      query: {
+        id: currentId || '',
+      },
+    });
+  }
+
+  return (
+    <>
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+        <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      </AuthButton>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType" />
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} current={data.current} />
+      </div>
+    </>
+  )
+}

estateagents-admin-manager/src/pages/building/type/style.css

@@ -0,0 +1,48 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+
+  color: #666;
+  display: flex;
+  align-items: center;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}

estateagents-admin-manager/src/pages/building/type/style.less

@@ -0,0 +1,49 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #FF4A4A;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center;  
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}

estateagents-admin-manager/src/pages/building/type/style.wxss

@@ -0,0 +1,47 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size:  0.106rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size:  0.106rem;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size:  0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}

estateagents-admin-manager/src/pages/carouselFigure/LiveGroup.jsx

@@ -0,0 +1,124 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Search } = Input;
+
+const getGroupList = fetch(apis.taliveActivity.taLiveActivity)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择直播活动' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        source: 2,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+       const getGroupTitle = val => {
+        return (data.records.filter(x => x.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+      }
+      const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+      updateGroup(buildingId ? undefined : value);
+
+      // updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        source: 2,
+        liveActivityTitle: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      // const getGroupTitle = val => {
+      //   return (data.records.filter(x => x.liveActivityId == val)[0] || {}).liveActivityTitle || '请选择直播活动'
+      // }
+      // const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'liveActivityTitle',
+      key: 'liveActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.liveActivityId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+             <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.liveActivityId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/SalesBatchGroup.jsx

@@ -0,0 +1,110 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Search } = Input;
+
+const getGroupList = fetch(apis.house.taSalesBatch)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择销售批次' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.salesBatchId == val)[0] || {}).salesBatchName || '请选择销售批次'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        salesBatchName: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.salesBatchId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+       <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.salesBatchId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/SelectActivity.jsx

@@ -0,0 +1,114 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const getActivities = fetch(apis.activity.listSelected)
+const { Search } = Input;
+
+export default (props) => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [activity, setActivity] = useState({ dynamicId: undefined, title: '请选择活动' })
+  const getActTitle = val => ((list.filter(x => x.dynamicId === val)[0]) || {}).title || '请选择活动'
+  const setAct = val => setActivity({ dynamicId: val, title: getActTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      setAct(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== activity.dynamicId) {
+    setAct(value);
+  }
+  const searchActivity =(e)=>{
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name:e
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+
+  let chooseVal = value
+
+  const handleChange = val => chooseVal = val
+
+  const setData = val => {
+    setAct(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'dynamicId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'name',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.dynamicId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{activity.title}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.dynamicId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/SelectGroup.jsx

@@ -0,0 +1,110 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Search } = Input;
+
+const getGroupList = fetch(apis.groupActivity.EffectiveList)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择拼团' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.groupActivityId == val)[0] || {}).activityName || '请选择拼团'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'activityName',
+      key: 'groupActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+         <Navigate onClick={() => setData(record.groupActivityId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div><Navigate onClick={() => setVisible(true)} >{group.groupName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/carouselFigure/advertisingList.jsx

@@ -0,0 +1,286 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editAdvertising',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)}><img src={image} className={styles.imgSmall} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '报名活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力活动' : contentType === 'group' ? '拼团活动' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '在线选房' : contentType === 'live' ? '直播活动' : '无'}</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.advert.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架' : '上架'} type={row.status === 1 ? 'down' : 'up'}  onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)}/>
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="activity">报名活动</Option>
+              <Option value="help">助力活动</Option>
+              <Option value="group">拼团活动</Option>
+              <Option value="h5">H5活动</Option>
+              <Option value="live">直播活动</Option>
+              <Option value="salesBatch">在线选房</Option>
+              <Option value="nothing">无</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="index">首页</Option>
+              <Option value="building">项目</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.advert.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.advert.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/carouselFigure/carouselFigureList.jsx

@@ -0,0 +1,284 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑页面
+  const toEditCarouse = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editCarousel',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.extendContent.publish" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'down' : 'up'} text={row.status === 1 ? '下架' : '上架'} onClick={changeStatus(row)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditCarouse(row.contentId)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+          }).catch((err) => {
+            console.log(err)
+            row.status = 0
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+          }).catch((err) => {
+            console.log(err)
+            row.status = 1
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
+              {/* <Option value="other">其他</Option> */}
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">积分商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.extendContent.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.extendContent.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/carouselFigure/editAdvertising.jsx

@@ -0,0 +1,426 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { FieldTypes, createForm } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit';
+import SelectActivity from './SelectActivity';
+import SelectNews from './SelectNews';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectH5 from './SelectH5';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const createEditor = () => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId = ''
+  let isHaveActive = false
+  let isCanChoose = true
+  let isHavePosition = false
+  let islet = true
+
+  const setExtraData = (data) => {
+    if (data.isHaveActive !== undefined) {
+      isHaveActive = data.isHaveActive
+      if (!isHaveActive) {
+        // data.contentType=null
+        data.buildingId = null
+      }
+    }
+    islet = isHaveActive
+    if (data.showPosition == 'index') {
+      isHavePosition = true;
+    } else {
+      isHavePosition = false;
+    }
+
+    // if (data.contentType == 'h5' || data.contentType=='live') {
+    //   isHaveActive = true;
+    // } else {
+    //   isHaveActive = false;
+    // }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    cityId = data.cityId
+    // console.log(data.buildingId, ' data.buildingId')
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = data => {
+    console.log(data, "data.buildingIddata.buildingId2")
+    islet = data.isHaveActive
+
+    if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
+      isHaveActive = false
+    } else {
+      isHaveActive = true
+    }
+    // if (!isHaveActivea && data.contentType === 'h5') {
+    //   // data.contentType=null
+    //   data.buildingId = null
+    // }
+
+    // if (data.isHaveActive !== undefined) {
+    //   isHaveActive = data.isHaveActive
+    //   if (!isHaveActive) {
+    //     // data.contentType=null
+    //     data.buildingId = null
+    //   }
+    // }
+    if (data.showPosition == 'index') {
+      isHavePosition = true;
+    } else {
+      isHavePosition = false;
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    console.log(data.buildingId, ' data.buildingId')
+    buildingId = data.buildingId
+  }
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+    // const [tab, changeTab] = useState('basic')
+    const contentId = props.location.query.contentId
+    const [data, setData] = useState({})
+    const formRef = useRef(null);
+
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then((data) => {
+        setExtraData1(data)
+        setData(data)
+      })
+    }
+    useEffect(() => {
+      if (contentId) {
+        isCanChoose = false
+        getDetail(contentId);
+      } else {
+        isCanChoose = true
+      }
+    }, [])
+
+    const cancelPage = () => {
+      isCanChoose = true
+      router.push({
+        pathname: '/carouselFigure/advertisingList',
+      });
+    }
+
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value: isHaveActive,
+        hidden: () => !isCanChoose,
+        props: {
+          onChange: () => {
+            const type = formRef.current.props.form.getFieldValue('contentType')
+            if (formRef.current && (type !== 'live' && type !== 'h5')) {
+              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
+              formRef.current.props.form.resetFields(['contentType', []]);
+            }
+          },
+        },
+        rules: [
+          { required: true, message: '是否城市活动' },
+        ],
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        value: isHaveActive,
+        dict: [{
+          label: '首页',
+          value: 'index',
+        },
+        {
+          label: '项目',
+          value: 'building',
+        }],
+        value: data.showPosition,
+        rules: [
+          { required: true, message: '请选择发布位置' },
+        ],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive && isHavePosition,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ],
+      },
+      {
+        label: '展示城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => !isHavePosition || isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
+      {
+        label: '开屏广告',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
+        rules: [
+          { required: true, message: '请上传图片' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [{
+          label: 'H5活动详情',
+          value: 'h5',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        hidden: true,
+        value: data.title,
+        rules: [
+          { required: true, message: '请输入标题' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        hidden: () => !isHaveActive,
+        type: FieldTypes.Select,
+        dict: [{
+          label: '报名活动详情',
+          value: 'activity'
+        },
+        {
+          label: '项目详情',
+          value: 'project'
+        },
+        {
+          label: '资讯详情',
+          value: 'news'
+        },
+        {
+          label: '拼团活动详情',
+          value: 'group'
+        },
+        {
+          label: '助力活动详情',
+          value: 'help'
+        },
+        {
+          label: 'H5活动详情',
+          value: 'h5',
+        },
+        {
+          label: '在线选房详情',
+          value: 'salesBatch',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '发布H5活动',
+        name: 'targetId',
+        render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
+        hidden: () => !h5Visible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布H5' },
+        ],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布活动' },
+        ],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布资讯' },
+        ],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [
+          { required: true, message: '请选择发布内容' },
+        ],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布助力' },
+        ],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布拼团' },
+        ],
+      },
+      {
+        label: '发布销售批次',
+        name: 'targetId',
+        render: <SalesBatchGroup buildingId={() => buildingId} />,
+        hidden: () => !salesBatchVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布销售批次' },
+        ],
+      },
+      {
+        label: '发布直播活动',
+        name: 'targetId',
+        render: <LiveGroup buildingId={() => islet ? buildingId : ''} />,
+        hidden: () => !liveVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布直播活动' },
+        ],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "上架",
+          value: 1
+        },
+        {
+          label: "下架",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+
+    const handleSubmit = val => {
+      val.showType = 'screen'
+      if (!isHaveActive && val.targetId) {
+        if (!val.contentType) {
+          val.contentType = 'h5'
+        }
+      }
+      if (!isHaveActive && !val.targetId) {
+        val.contentType = ''
+      }
+      if (contentId) {
+        request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val, }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val, }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+
+    return (
+      <XForm wrappedComponentRef={formRef} onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+    );
+  }
+}
+
+export default createEditor()

estateagents-admin-manager/src/pages/carouselFigure/editCarousel.jsx

@@ -0,0 +1,393 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
+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/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { createForm, FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+import SelectNews from './SelectNews';
+import SelectActivity from './SelectActivity';
+import SelectH5 from './SelectH5';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = props => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId=''
+  let locationType = false
+  let isHaveActive=false
+  let isCanChoose=true
+
+  const setExtraData = (data) => {
+    console.log(data, 'data');
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        // data.contentType=null
+        data.buildingId=null
+      }
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+
+    cityId=data.cityId
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
+  }
+
+  const setExtraData1 = (data) => {
+     if((data.contentType=='h5'  && data.buildingId == null) || data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
+        isHaveActive=false
+     }else{
+        isHaveActive=true
+     }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    h5Visible = data.contentType === 'h5';
+    console.log(locationType, 'locationType');
+  }
+
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+      setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return props => {
+    const [tab, changeTab] = useState('basic')
+    const { contentId } = props.location.query
+    const [data, setData] = useState({})
+
+    if (contentId) {
+      isCanChoose=false
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      useEffect(() => {
+        getDetail(contentId);
+      }, [])
+
+      // 查询列表
+      const getDetail = contentId => {
+        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+            console.log(data)
+            setExtraData1(data)
+            setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
+    }
+
+    const cancelPage = () => {
+      router.push({
+        pathname: '/carouselFigure/carouselFigureList',
+      });
+    }
+
+      const fields = [
+        {
+          label: '是否关联项目',
+          name: 'isHaveActive',
+          type: FieldTypes.Switch,
+          value:isHaveActive,
+          hidden: () => !isCanChoose,
+          rules: [
+            { required: true,message: '是否城市活动' },
+          ],
+        },
+        {
+          label: '所属项目',
+          name: 'buildingId',
+          render: <BuildSelect />,
+          hidden: () => !isHaveActive,
+          value: data.buildingId,
+          rules: [
+            { required: true, message: '请选择所属项目' },
+          ],
+        },
+        {
+          label: '展示城市',
+          name: 'cityId',
+          render: <CitySelect />,
+          hidden: () => isHaveActive,
+          value: data.cityId,
+          rules: [
+            { required: true, message: '请选择展示城市' },
+          ],
+        },
+        {
+          label: '发布位置',
+          name: 'showPosition',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '积分商城',
+            value: 'mall',
+          }],
+          value: data.showPosition,
+          rules: [
+            { required: true, message: '请选择发布位置' },
+          ],
+        },
+        {
+          label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
+          name: 'image',
+          type: FieldTypes.ImageUploader,
+          value: data.image,
+          help: () => (locationType ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
+          rules: [
+            { required: true, message: '请上传轮播图' },
+          ],
+        },
+        {
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          hidden: () => isHaveActive,
+          dict: [{
+            label: 'h5',
+            value: 'h5',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          }],
+          value: data.contentType,
+          rules: [
+            { required: true, message: '请选择类型' },
+          ],
+        },
+        {
+          label: '标题',
+          name: 'title',
+          type: FieldTypes.Text,
+          value: data.title,
+          hidden: true,
+          rules: [
+            { required: true, message: '请输入标题' },
+          ],
+        },
+        {
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
+          dict: [{
+            label: '常规活动',
+            value: 'activity',
+          },
+          {
+            label: '项目',
+            value: 'project',
+          },
+          {
+            label: '资讯',
+            value: 'news',
+          },
+          // {
+          //   label: '其他',
+          //   value: 'other',
+          // },
+          {
+            label: '拼团',
+            value: 'group',
+          },
+          {
+            label: '助力',
+            value: 'help',
+          },
+          {
+            label: 'h5',
+            value: 'h5',
+          },
+          {
+            label: '销售批次详情',
+            value: 'salesBatch',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          }],
+          value: data.contentType,
+          rules: [
+            { required: true, message: '请选择类型' },
+          ],
+        },
+        {
+          label: '发布活动',
+          name: 'targetId',
+          render: <SelectActivity buildingId={() => buildingId} />,
+          hidden: () => !activityVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布活动' },
+          ],
+        },
+        {
+          label: '是否发布H5',
+          name: 'targetId',
+          render: <SelectH5 buildingId={() => buildingId}/>,
+          hidden: () => !h5Visible,
+          value: data.targetId,
+          rules: [
+            { required: false, message: '请选择发布H5' },
+          ],
+        },
+        {
+          label: '发布资讯',
+          name: 'targetId',
+          render: <SelectNews buildingId={() => buildingId} />,
+          hidden: () => !newsVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布资讯' },
+          ],
+        },
+        {
+          label: '发布内容',
+          name: 'content',
+          render: <Wangedit />,
+          value: data.content,
+          hidden: () => !contentVisible,
+          rules: [
+            { required: true, message: '请输入发布内容' },
+          ],
+        },
+        {
+          label: '发布助力',
+          name: 'targetId',
+          render: <SelectHelp buildingId={() => buildingId} />,
+          hidden: () => !helpVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布助力' },
+          ],
+        },
+        {
+          label: '发布拼团',
+          name: 'targetId',
+          render: <SelectGroup buildingId={() => buildingId} />,
+          hidden: () => !groupVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布拼团' },
+          ],
+        },
+        {
+          label: '发布销售批次',
+          name: 'targetId',
+          render: <SalesBatchGroup buildingId={() => buildingId} />,
+          hidden: () => !salesBatchVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布销售批次' },
+          ],
+        },
+        {
+          label: '发布直播活动',
+          name: 'targetId',
+          render: <LiveGroup buildingId={() => buildingId} />,
+          hidden: () => !liveVisible,
+          value: data.targetId, 
+          rules: [
+            { required: true, message: '请选择发布直播活动' },
+          ],
+        },
+        {
+          label: '状态',
+          name: 'status',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '上架',
+            value: 1,
+          },
+          {
+            label: '下架',
+            value: 0,
+          }],
+          value: data.status != null ? data.status : 1,
+        },
+        {
+          label: '权重',
+          name: 'orderNo',
+          type: FieldTypes.Number,
+          value: data.orderNo,
+          help: "数值越大越靠前",
+        },
+      ]
+
+      const handleSubmit = val => {
+        console.log(val,"232323")
+        val.showType = 'banner'
+        if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+        }
+        if(!isHaveActive&&!val.targetId){
+          val.contentType=''
+        }
+        if (contentId) {
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    );
+  }
+ }
+
+
+export default Edit()

estateagents-admin-manager/src/pages/carouselFigure/propaganda.jsx

@@ -0,0 +1,361 @@
+import React, { useState, useEffect } from 'react';
+import { Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { FieldTypes, createForm } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit';
+import SelectActivity from './SelectActivity';
+import SelectNews from './SelectNews';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectH5 from './SelectH5';
+import SalesBatchGroup from './SalesBatchGroup';
+import LiveGroup from './LiveGroup';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const createEditor = () => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let salesBatchVisible = false
+  let liveVisible = false
+  let h5Visible = false
+  let buildingId = ''
+  let cityId = ''
+  let isHaveActive=false
+  let isCanChoose=true
+
+  const setExtraData = (data) => {
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        // data.contentType=null
+        data.buildingId=null
+      }
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+    cityId=data.cityId
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = (data) => {
+    console.log(data.buildingId,"data.buildingIddata.buildingId3")
+    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
+       isHaveActive=false
+    }else{
+       isHaveActive=true
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    salesBatchVisible = data.contentType === 'salesBatch';
+    liveVisible = data.contentType === 'live';
+    h5Visible = data.contentType === 'h5';
+    buildingId = data.buildingId
+  }
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+      setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+    const [ tab, changeTab ] = useState('basic')
+    const contentId = props.location.query.contentId
+    const [ data, setData ] = useState({})
+
+    if(contentId){
+      isCanChoose=false
+      useEffect(() => {
+        getDetail(contentId);
+      },[])
+
+      // 查询列表
+      const getDetail = (contentId) => {
+        request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
+          setExtraData1(data)
+          setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
+    }
+
+    const cancelPage = () =>{
+      router.push({
+        pathname: '/carouselFigure/propagandaList',
+      });
+    }
+
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ],
+      },
+      {
+        label: '所属城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
+      {
+        label: '主图',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: '建议图片尺寸：750*188px，比例4:1,格式：jpg，用于：首页宣传位',
+        rules: [
+          { required: true, message: '请上传图片' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [{
+          label: 'h5',
+          value: 'h5',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        hidden: true,
+        value: data.title,
+        rules: [
+          { required: true, message: '请输入标题' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        hidden: () => !isHaveActive,
+        type: FieldTypes.Select,
+        dict: [{
+          label: '常规活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '拼团',
+          value: 'group'
+        },
+        {
+          label: '助力',
+          value: 'help'
+        },
+        {
+          label: 'h5',
+          value: 'h5',
+        },
+        {
+          label: '销售批次详情',
+          value: 'salesBatch',
+        },
+        {
+          label: '直播活动详情',
+          value: 'live',
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布活动' },
+        ],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布资讯' },
+        ],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [
+          { required: true, message: '请选择发布内容' },
+        ],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布助力' },
+        ],
+      },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5 buildingId={() => buildingId}/>,
+        hidden: () => !h5Visible,
+        value: data.targetId,
+        rules: [
+          { required: false, message: '请选择发布H5' },
+        ],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布拼团' },
+        ],
+      },
+      {
+        label: '发布销售批次',
+        name: 'targetId',
+        render: <SalesBatchGroup buildingId={() => buildingId} />,
+        hidden: () => !salesBatchVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布销售批次' },
+        ],
+      },
+      {
+        label: '发布直播活动',
+        name: 'targetId',
+        render: <LiveGroup buildingId={() => buildingId} />,
+        hidden: () => !liveVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布直播活动' },
+        ],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "上架",
+          value: 1
+        },
+        {
+          label: "下架",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+      {
+        label: '权重',
+        name: 'orderNo',
+        type: FieldTypes.Number,
+        value: data.orderNo,
+        help: "数值越大越靠前",
+      },
+    ]
+
+    const handleSubmit = val => {
+      console.log(val,"valvalval")
+      val.showType = 'propaganda'
+      if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+      }
+      if(!isHaveActive&&!val.targetId){
+        val.contentType=''
+      }
+      if(contentId){
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+    );
+   }
+ }
+
+export default createEditor()

estateagents-admin-manager/src/pages/carouselFigure/propagandaList.jsx

@@ -0,0 +1,284 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import withActions from '@/components/ActionList';
+import Navigate from '@/components/Navigate';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/propaganda',
+      query: {
+        contentId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)} ><img src={image} className={styles.propaganda} /></Navigate>,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.propaganda.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架': '上架'} type={row.status === 1 ? 'down': 'up'} onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
+    },
+  ];
+
+  const finishDynamic = (row) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    } else if (row.status === 1) {
+
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
+
+  }
+
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        {/* <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item> */}
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.advert.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.propaganda.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader