Merge commit 'b66ff350adbae9a3447e07aeada0746d30eedd9b'

config/routes.js

@@ -521,6 +521,30 @@ export default [
               },
             ],
           },
+          {
+            path: '/house',
+            name: '在线选房',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/house/list',
+                name: '房源管理',
+                component: './house/list/index',
+              },
+              {
+                path: '/house/add',
+                name: '新增', 
+                hideInMenu: true,
+                component: './house/add/index',
+              },
+              {
+                path: '/house/edit',
+                name: '编辑', 
+                hideInMenu: true,
+                component: './house/edit/index',
+              },
+            ],
+          },
           // {
           //   path: '/miniapp',
           //   name: '小程序管理',

src/components/HouseSelect/BlockSelect.jsx

@@ -0,0 +1,64 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const BuildingSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getBuildList();
+  }, [props.value])
+
+
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data.records)
+        checkValue(data.records)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择项目"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(building => (
+            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default BuildingSelect

src/pages/activity/SignList.jsx

@@ -167,10 +167,10 @@ const handleSubmit = (e, props) => {
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
       <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
-      <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity"/>
+      {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
-      </div>
+      </div> */}
     </>
   )
 }

src/pages/house/add/index.jsx

@@ -0,0 +1,29 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../style/GoodsList.less';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+   
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <span>新增业</span>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/house/edit/components/base.jsx

@@ -0,0 +1,15 @@
+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 apis from '../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const Base = props => {
+  return <div><span>销售批次信息</span></div>
+}
+
+export default Base

src/pages/house/edit/components/house.jsx

@@ -0,0 +1,202 @@
+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';
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function House(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taHousingResources, params: { ...params,salesBatchId: props.salesBatchId,buildingId: props.buildingId } }).then(res => {
+      console.log(res,"resresres")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+    // 重置搜索
+    function handleReset () {
+      props.form.resetFields();
+      getList({ pageNumber: 1, pageSize: 10 })
+    }
+
+      // 分页
+  function changePageNum(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNumber, pageSize: 10})
+  }
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    },
+  };
+
+  function showEdi() {
+    window.location.href = "/house/add";
+  }
+
+  /**
+   * 删除
+   *
+   * @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: 'houseId',
+      key: 'houseId',
+    },
+    {
+      title: '楼栋',
+      dataIndex: 'blockName',
+      key: 'blockName',
+    },
+    {
+      title: '单元',
+      dataIndex: 'unitName',
+      key: 'unitName',
+    },
+    {
+      title: '层',
+      dataIndex: 'floorName',
+      key: 'floorName',
+    },
+    {
+      title: '房号',
+      dataIndex: 'roomName',
+      key: 'roomName',
+    },
+    {
+      title: '价格（万元）',
+      dataIndex: 'price',
+      key: 'price',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '预选基础热度',
+      dataIndex: 'heat',
+      key: 'heat',
+    },
+    {
+      title: '预选实际热度',
+      dataIndex: 'realHeat',
+      key: 'realHeat',
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: '最后修改人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+    },
+    {
+      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>
+        </>
+      ),
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="请输入标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="请输入标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => showEdi()}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量导入房源</Button>
+      <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量修改对应户型</Button>
+      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => this.changePageNum(e) }} rowKey="House" />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'House' })(House);
+export default WrappedHeader

src/pages/house/edit/components/houseTab.jsx

@@ -0,0 +1,47 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import { router } from 'umi';
+
+import House from './house'
+
+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 EditHouse(props) {
+
+  const [tab, setTab] = useState('house')
+
+  return (
+    <>
+      <div style={{ marginTop: '20px' }}>
+        { (tab === 'house' && <House salesBatchId="1" buildingId="1" />)} 
+      </div>
+    </>
+  )
+}
+
+const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
+
+export default WrappedEditHouseForm

src/pages/house/edit/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'}}>进入<span style={{margin:'0 5px',fontSize:'18px',color:'#333',fontWeight:'600'}}>{miniappName||'置业V顾问'}</span>报名活动</p>
+            <img style={{ width: '80px',position: 'absolute',right:'30px',top:'10px' }} src={xiaochengxu} alt="" />
+          </div>
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '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

src/pages/house/edit/components/preselectionImg.jsx

@@ -0,0 +1,15 @@
+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 apis from '../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const PreselectionImg = props => {
+  return <div><span>预选热度图</span></div>
+}
+
+export default PreselectionImg

src/pages/house/edit/components/preselectionRecord.jsx

@@ -0,0 +1,15 @@
+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 apis from '../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const PreselectionRecord = props => {
+  return <div><span>预选记录</span></div>
+}
+
+export default PreselectionRecord

src/pages/house/edit/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 : '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
+      </div>
+    </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>楼盘分享图</p>
+      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+    </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

src/pages/house/edit/components/shareRecord.jsx

@@ -0,0 +1,15 @@
+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 apis from '../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const ShareRecord = props => {
+  return <div><span>分享记录</span></div>
+}
+
+export default ShareRecord

src/pages/house/edit/components/style.less

@@ -0,0 +1,97 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 0.106rem;
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  margin-bottom: 0.08rem; 
+}
+
+.recommderTag{
+  position: absolute;
+  color: #fff;
+  line-height: 0.28rem;
+  width: 0.54rem;
+  background-color: rgba(0,0,0,0.4);
+  text-align: center;
+  border-radius: 12px 0 12px 0;
+  font-size: 0.09rem;
+}
+.cardItem{
+  font-size: 0.106rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.58rem;
+  
+    min-width: 0.58rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+}
+.cardText{
+  font-size: 0.106rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.58rem;
+  
+    min-width: 0.58rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  position: absolute;
+  right: 0;
+
+}
+
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+.cover{
+  width: 100%;
+
+  padding-bottom: 56.25%;
+  background-size: 100% 100% !important;
+ 
+  border-radius: 12px 12px 0 0;
+  
+    // height: '14vw';
+}

src/pages/house/edit/components/visitRecord.jsx

@@ -0,0 +1,15 @@
+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 apis from '../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const VisitRecord = props => {
+  return <div><span>访问记录</span></div>
+}
+
+export default VisitRecord

src/pages/house/edit/index.jsx

@@ -0,0 +1,76 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import { router } from 'umi';
+
+import Base from './components/base'
+import HouseTab from './components/houseTab'
+import Poster from './components/poster'
+import Share from './components/share'
+import PreselectionImg from './components/preselectionImg'
+import PreselectionRecord from './components/preselectionRecord'
+import ShareRecord from './components/shareRecord'
+import VisitRecord from './components/visitRecord'
+
+
+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 EditHouse(props) {
+
+  const [tab, setTab] = useState('house')
+  
+  function tabsCallback(e) {
+    setTab(e.target.value)
+  }
+
+  return (
+    <>
+      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+        <Radio.Button value="base">销售批次信息</Radio.Button>
+        <Radio.Button value="house">房源信息</Radio.Button>
+        <Radio.Button value="poster">海报设置</Radio.Button>
+        <Radio.Button value="share">分享设置</Radio.Button>
+        <Radio.Button value="preselectionImg">预选热度图</Radio.Button>
+        <Radio.Button value="preselectionRecord">预选记录</Radio.Button>
+        <Radio.Button value="shareRecord">分享记录</Radio.Button>
+        <Radio.Button value="visitRecord">访问记录</Radio.Button>
+      </Radio.Group>
+      <div style={{ marginTop: '20px' }}>
+        { (tab === 'base' && <Base />)} 
+        { (tab === 'house' && <HouseTab salesBatchId="1" buildingId="1"/>)}
+        { (tab === 'poster' && <Poster />)}
+        { (tab === 'share' && <Share />)}
+        { (tab === 'preselectionImg' && <PreselectionImg />)}
+        { (tab === 'preselectionRecord' && <PreselectionRecord />)}
+        { (tab === 'shareRecord' && <ShareRecord />)}
+        { (tab === 'visitRecord' && <VisitRecord />)}
+      </div>
+    </>
+  )
+}
+
+const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
+
+export default WrappedEditHouseForm

src/pages/house/list/index.jsx

@@ -0,0 +1,348 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../style/GoodsList.less';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [], total: 0 })
+  //   const [page, changePage] = useState({})
+  const [time, setTime] = useState('')
+
+  //==========看这里-- 新功能都用house为中间单词，我已经创建好了，你只要修改list的指向链接就行，看完删除=========
+  // 查询列表
+  const getList = params => {
+    request({ ...apis.house.list, params: { ...params } }).then(data => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 跳转到编辑商品
+  const toAddHouse = id => () => {
+    if(id) {
+      router.push({
+        pathname: '/house/edit',
+      });
+      return
+    }
+    router.push({
+      pathname: '/house/add',
+    });
+  }
+
+  const newQrcode = row => {
+    const x = new XMLHttpRequest();
+    const resourceUrl = row.qrCode
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response)
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none'
+      a.download = '活动二维码.png';
+      a.click();
+    }
+    x.send();
+  }
+
+  const getActivityDetail = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/detailActivity',
+      query: {
+        dynamicId,
+      },
+    });
+  }
+
+  const getJoinPeople = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+      // width: '15%',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(1)}>{row.title}</span></div></>,
+      // width: '300px',
+      // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
+// text-overflow: ellipsis; /*以省略号...显示*/
+// white-space: nowrap;
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      // width: '15%',
+      // width: '20%',
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
+    },
+    {
+      title: '已参加人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.dynamicId)}>{row.count}</span></div></>,
+      // width: '10%',
+      // width: '6%',
+    },
+    // {
+    //   title: '阅读量',
+    //   dataIndex: 'pvNum',
+    //   key: 'pvNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '转发量',
+    //   dataIndex: 'shareNum',
+    //   key: 'shareNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '收藏数',
+    //   dataIndex: 'saveNum',
+    //   key: 'saveNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    {
+      title: '报名状态',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
+      align: 'center',
+      // width: '10%',
+      render: activityStatus => <><span>{activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
+    },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
+    },
+  ];
+  const getSignList = dynamicId => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
+
+  const finishDynamic = row => {
+    Modal.confirm({
+      title: '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1)
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  //   推首页
+  const homeDynamic = row => () => {
+    const home = Math.abs(row.home - 1)
+    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } }).then(data => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  const sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
+  }
+
+  // 取消活动
+  const cancelDynamic = row => {
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  // 发布活动
+  const sendDynamic = row => {
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        if (time) {
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+        } else {
+          values.time = null
+        }
+        
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    setTime('')
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  // 时间回调
+  function timeOnChange(date, dateString) {
+    console.log(date, dateString)
+    setTime(date)
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      {/* style={{ display: 'none' }} */}
+      <div id="qrcode"></div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('time')(
+            <DatePicker onChange={timeOnChange}/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.buildingDynamic.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.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
+      </AuthButton>
+      <Table
+        // onRow={record => {
+        //   return {
+        //     onClick: getActivityDetail(record.dynamicId),
+        //   };
+        // }}
+       dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/services/apis.js

@@ -1082,5 +1082,17 @@ export default {
      url: `${amapPrefix}/place/around`,
      method: 'GET',
    },
- }
+ },
+ house: {
+  list: {
+    method: 'GET',
+    url: `${prefix}/iBuildingDynamicList`,
+    action: 'admin.iBuildingDynamicList.get',
+  },
+  taHousingResources: {
+    method: 'GET',
+    url: `${prefix}/taHousingResources`,
+    action: 'admin.taHousingResources.id.get',
+  }
+ },
 }