Merge branch 'dev'

src/components/uploadImage/ImageUpload.jsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import { Upload, Icon, message, Modal } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
+
+class ImageUpload extends React.Component {
+
+  state = {
+    loading: false,
+    previewVisible: false,
+    previewImage: '',
+    fileList: this.getPropsFileList(),
+  };
+
+  componentDidUpdate(prevProps) {
+    // 直接 setState 会死循环
+    if (prevProps.value !== this.props.value) {
+      this.setState({ fileList: this.getPropsFileList() })
+    }
+  }
+
+  getPropsFileList() {
+    return !this.props.value ? [] : [{
+      uid: '-1',
+      name: 'image.png',
+      status: 'done',
+      url: this.props.value,
+    }]
+  }
+
+
+  handleChange = ({ file, fileList }) => {
+    const { status, response } = file
+    this.setState({ fileList, loading: status === "uploading" })
+
+    if (typeof this.props.onChange === 'function' && status != "uploading") {
+      const image = status === 'done' ? response : undefined
+      this.props.onChange(image);
+    }
+  };
+
+  handleCancel = () => this.setState({ previewVisible: false });
+
+  handlePreview = async file => {
+    console.log(file)
+    this.setState({
+      previewImage: file.url,
+      previewVisible: true,
+    });
+  };
+
+  render() {
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+      </div>
+    );
+
+    return (
+      <>
+      <Upload
+        {...uploaderProps}
+        listType="picture-card"
+        className="avatar-uploader"
+        onChange={this.handleChange}
+        fileList={this.state.fileList}
+        onPreview={this.handlePreview}
+      >
+        {this.state.fileList.length >= 1 ? null : uploadButton}  
+      </Upload>
+      <Modal visible={this.state.previewVisible} footer={null} onCancel={this.handleCancel}>
+      <img alt="example" style={{ width: '100%' }} src={this.state.previewImage} />
+      </Modal>
+      </>
+    );
+  }
+}
+
+export default ImageUpload;

src/components/uploadImage/style.less

@@ -0,0 +1,8 @@
+:global {
+  .avatar-uploader {
+    & > .ant-upload {
+      width: 128px;
+      height: 128px;
+    }
+  }
+}

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

@@ -7,6 +7,7 @@ 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'
@@ -202,11 +203,14 @@ function AddBuilding(props) {
       data.buildingRestaurant = tagFilter(data.buildingRestaurant, 'Restaurant')
     }
   
-    if(typeof(data.highlights) != "undefined" && (typeof(data.highlightsCover) == "undefined" || data.highlightsCover == null)){
-      openNotificationWithIcon('error', '请上传项目亮点封面')
-      return;
+    // 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 => {
@@ -587,11 +591,11 @@ function AddBuilding(props) {
           </Form.Item>*/}
           <Form.Item label="亮点封面" help="建议尺寸：比例3:1 690*230px，用于项目详情-项目亮点封面图">
             {getFieldDecorator('highlightsCover')(
-              <ImageUpload />,
+              <NewImageUpload onChange={e => console.log(e,"66")}/>,
             )}
           </Form.Item>
-          <Form.Item label="亮点类型">
-            {getFieldDecorator('highlightsType', {
+          <Form.Item label="亮点类型" help="说明：项目亮点必须上传封面图才会在小程序端展示">
+            {getFieldDecorator('highlightsType',{
               initialValue: "rich",
             })(
             <Radio.Group onChange={e => highlightsTypeChange(e)}>

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

@@ -121,7 +121,7 @@ const Poster = props => {
             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' }}>元/m²</span></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',