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

src/components/SelectButton/CitySelect.jsx

@@ -32,7 +32,7 @@ const CitySelect = (props) => {
   return (
       <Select value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
           {data.map(city => (
-            <Option key={city.id}>{city.name}</Option>
+            <Option key={city.id} value={city.id}>{city.name}</Option>
           ))}
       </Select>
   )

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

@@ -61,7 +61,7 @@ class Amap extends React.Component {
 
         // 实例点击事件
         mapInstance.on('click', e => {
-          const lngLat = `${e.lnglat.getLng()},${e.lnglat.getLat()}`
+          const lngLat = `${e.lnglat.getLat()},${e.lnglat.getLng()}`
           console.log('坐标位置:', lngLat)
           this.props.onChange(lngLat)
         });

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

@@ -54,8 +54,13 @@ function AddBuilding(props) {
    function getById(currentId) {
 
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
-      res.openingDate = moment(res.openingDate)
-      res.receivedDate = moment(res.receivedDate)
+      if (res.openingDate !== null) {
+        res.openingDate = moment(res.openingDate)
+      }
+      if (res.receivedDate !== null) {
+        res.receivedDate = moment(res.receivedDate)
+      }
+
       res.avatarImage = res.buildingImg.map(item => item.url)
       props.form.setFieldsValue(res)
     })

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

@@ -8,7 +8,14 @@ class EditableTagGroup extends React.Component {
   };
 
   // 每次取值，都从 this.props.value 获取最新值
-  getTags = () => (this.props.value || '').split(',')
+  getTags = () => {
+    // (this.props.value || '').split(',')
+    if (this.props.value) {
+      return this.props.value.split(',')
+    }
+
+    return []
+  }
 
   toggleOnChange = tags => {
     if (typeof this.props.onChange === 'function') {
@@ -49,7 +56,7 @@ class EditableTagGroup extends React.Component {
 
   render() {
     const { inputVisible, inputValue } = this.state;
-
+    console.log('this.getTags(): ', this.getTags())
     return (
       <div>
         {this.getTags().map((tag, index) => {

src/pages/building/type/edi.jsx

@@ -56,11 +56,11 @@ function body(props) {
     dataSources.createDate = new Date()
     request({ ...apis.buildingType.add, data: { ...dataSources } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('success', '操作成功')
+      openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('error', err)
+      openNotificationWithIcon('error', err)
     })
   }
 

src/pages/building/type/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, Table, Pagination, Alert, Icon, Tag } from 'antd'
+import { Button, Table, Pagination, Alert, Icon, Tag, notification } from 'antd'
 import router from 'umi/router';
 import moment from 'moment';
 import Styles from './style.less'
@@ -67,6 +67,14 @@ function body() {
     })
   }
 
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line no-console
@@ -76,12 +84,13 @@ function body() {
 
   // 删除
   function deleteType(row) {
-    const { url, method } = apis.buildingType.update
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
-
     row.status = -1
-    request({ url: tempUrl, method, data: { ...row } }).then(() => {
+    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)
     })
   }