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

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

@@ -586,12 +586,12 @@ function AddBuilding(props) {
             {getFieldDecorator('preSalePermit')(
               <ImageUpload />,
             )}
-          </Form.Item>
-          <Form.Item label="项目备注" >
-            {getFieldDecorator('remark')(
+          </Form.Item>*/}
+          <Form.Item label="项目亮点" >
+            {getFieldDecorator('highlights')(
               <Wangedit />,
             )}
-          </Form.Item> */}
+          </Form.Item> 
           <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
             <Button type="primary" htmlType="submit">
                 确定

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

@@ -40,7 +40,27 @@ class TypeForm extends React.Component {
         }
         
         values.buildingTypeName = this.props.type.buildingTypeName
-        console.log('valuesvaluesvaluesvalues: ', values)
+        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)
       }
     });
@@ -82,8 +102,8 @@ class TypeForm extends React.Component {
                 )}
               </Form.Item>
             <Form.Item label="价格区间" help='最高价与最低价一致时，只展示一个'>
-              {getFieldDecorator('startPrice')(<Input placeholder="最低价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
-              {getFieldDecorator('endPrice')(<Input placeholder="最高价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
+              {getFieldDecorator('startPrice')(<Input type="number" placeholder="最低价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
+              {getFieldDecorator('endPrice')(<Input type="number" placeholder="最高价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
             </Form.Item>
             <Form.Item label="销售状态" >
             {getFieldDecorator('marketStatus')(

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

@@ -100,7 +100,8 @@ class ModalImage extends React.Component {
 
   // 弹框取消按钮
   handleCancel() {
-    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+    // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+    this.props.onSuccess()
   }
 
   getById(params) {
@@ -237,7 +238,7 @@ class ModalImage extends React.Component {
               <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.closeModal()}>取消</Button>
+                <Button onClick={() => this.handleCancel()}>取消</Button>
               </Form.Item>
             </Form>
         </Modal>

src/pages/building/list/index.jsx

@@ -128,7 +128,7 @@ function CartBody(props) {
         <p className={Styles.cardItem}>
           <span className={Styles.title}>均价</span>
           <span >
-            ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>元/m²
+            ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>{data.priceType == "total" ? "万元/套" : "元/m²"}
         </span>
         </p>
         <p className={Styles.cardItem}>

src/pages/news/list/editNewsList.jsx

@@ -117,11 +117,12 @@ const Basic = (props) => {
   ]
 
   const handleSubmit = val => { 
+    console.log(dynamicData,'12312345')
     let {...submitValue} = val
     
-    if(newsId){
-      submitValue.newsId = newsId
-      request({ ...apis.news.put, urlData: {id: newsId}, data: { ...submitValue },}).then((data) => {
+    if(dynamicData.newsId){
+      submitValue.newsId = dynamicData.newsId
+      request({ ...apis.news.put, urlData: {id: dynamicData.newsId}, data: { ...submitValue },}).then((data) => {
         // cancelPage();
         message.info("保存成功")
         console.log(data,'data1')