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

# Conflicts:
#	src/pages/house/edit/index.jsx

src/components/HouseSelect/ApartmentSelect.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 ApartmentSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getList();
+  }, [props.value])
+
+
+  const getList = e => {
+    request({ ...apis.house.apartmentList, params: { pageNum: 1, pageSize: 999, buildingId: props.buildingId} }).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(apartment => (
+            <Option key={apartment.apartmentId} value={apartment.apartmentId}>{apartment.apartmentName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default ApartmentSelect

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

@@ -25,16 +25,14 @@ const Poster = props => {
   const [posterId, setPosterId] = useState('')
 
   const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
-  const { buildingId } = props.building
-   // ============这边改造下就可以饿============================
-  if (buildingId) {
+  const { salesBatchId } = props.salesBatchId
+  if (salesBatchId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       request({
         ...apis.activity.poster,
-        params: { targetId: buildingId, targetType: 'building' },
+        params: { targetId: salesBatchId, targetType: 'house' },
       }).then(data => {
-        console.log(data, '2222')
         if (data.length > 0) {
           setPosterId(data[0].posterId)
           changeImg(data[0].posterImg)
@@ -45,7 +43,7 @@ const Poster = props => {
         message.info(err.msg || err.message)
       })
 
-      getById(buildingId)
+      // getById(salesBatchId)
       getMiniappName()
     }, [])
   }
@@ -70,7 +68,7 @@ const Poster = props => {
   }
 
   const submitPoster = () => {
-    if (buildingId) {
+    if (salesBatchId) {
       if (!imgValue) {
         message.error('请选择海报图片')
         return
@@ -80,7 +78,7 @@ const Poster = props => {
         request({
           ...apis.activity.updatePoster,
           urlData: { id: posterId },
-          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+          data: { targetId: salesBatchId, targetType: 'house', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
         }).then(() => {
           message.info('保存成功')
         }).catch(err => {
@@ -89,7 +87,7 @@ const Poster = props => {
       } else {
         request({
           ...apis.activity.addPoster,
-          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+          data: { targetId: salesBatchId, targetType: 'house', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
         }).then(data => {
           setPosterId(data.posterId)
           message.info('保存成功')

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

@@ -19,14 +19,13 @@ const Share = props => {
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
-// ============这边改造下就可以饿============================
-  const { buildingId } = props.building
-  if (buildingId) {
+  const { salesBatchId } = props.salesBatchId
+  if (salesBatchId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       request({
         ...apis.activity.shareContent,
-        params: { targetId: buildingId, targetType: 'building' },
+        params: { targetId: salesBatchId, targetType: 'house' },
       }).then(data => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
@@ -40,12 +39,12 @@ const Share = props => {
   }
 
   const submitShare = () => {
-    if (buildingId) {
+    if (salesBatchId) {
       if (shareContentId) {
         request({
           ...apis.activity.updateShareContent,
           urlData: { id: shareContentId },
-          data: { targetId: buildingId, shareContentType: 'building', shareContentImg: imgValue,shareContentTitle: inputValue },
+          data: { targetId: salesBatchId, shareContentType: 'house', shareContentImg: imgValue,shareContentTitle: inputValue },
         }).then(data => {
           message.info('保存成功')
         }).catch(err => {
@@ -54,7 +53,7 @@ const Share = props => {
        } else {
         request({
           ...apis.activity.addShareContent,
-          data: { targetId: buildingId, shareContentType: 'building', shareContentImg: imgValue,shareContentTitle: inputValue },
+          data: { targetId: salesBatchId, shareContentType: 'house', shareContentImg: imgValue,shareContentTitle: inputValue },
         }).then(data => {
           setShareContentId(data.shareContentId)
           message.info('保存成功')

src/pages/house/edit/index.jsx

@@ -40,7 +40,7 @@ function openNotificationWithIcon(type, message) {
 function EditHouse(props) {
   const {salesBatchId} = props.location.query.id;
   console.log(props.location.query.id)
-  const [tab, setTab] = useState('house')
+  const [tab, setTab] = useState('base')
   const [salesBatchData, setSalesBatchData] = useState({ salesBatchId: undefined })
 
   function tabsCallback(e) {
@@ -67,8 +67,8 @@ function EditHouse(props) {
       <div style={{ marginTop: '20px' }}>
         { (tab === 'base' && <Base salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/>)} 
         { (tab === 'house' && <HouseTab salesBatchId={props.location.query.id} buildingId={props.location.query.buildingId}/>)}
-        { (tab === 'poster' && <Poster />)}
-        { (tab === 'share' && <Share />)}
+        { (tab === 'poster' && <Poster salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
+        { (tab === 'share' && <Share salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'preselectionImg' && <PreselectionImg />)}
         { (tab === 'preselectionRecord' && <PreselectionRecord />)}
         { (tab === 'shareRecord' && <ShareRecord />)}