合并

.eslintrc.js

@@ -5,5 +5,6 @@ module.exports = {
   globals: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
     page: true,
+    AMap: true,
   },
 };

config/config.js

@@ -479,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://localhost:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

package.json

@@ -56,6 +56,7 @@
     "qs": "^6.7.0",
     "react": "^16.8.6",
     "react-amap": "^1.2.8",
+    "react-amap-plugin-autocomplete": "0.0.4",
     "react-copy-to-clipboard": "^5.0.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.8.6",

src/pages/activity/ActivityList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/iBuildingDynamicList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -124,11 +120,7 @@ const toEditGoods = (dynamicId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10 })
@@ -143,11 +135,7 @@ const toEditGoods = (dynamicId) => () => {
 //   置顶
   const topDynamic = (row) => () => {
       const weight = Math.abs(row.weight - 1)
-      request({
-          url: '/api/admin/buildingDynamic/weight',
-          method: 'PUT',
-          params: {dynamicId: row.dynamicId, weight},
-      }).then((data) => {
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -167,10 +155,7 @@ const toEditGoods = (dynamicId) => () => {
   
   // 取消活动
   const cancelDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
       }).catch((err) => {
@@ -181,10 +166,7 @@ const toEditGoods = (dynamicId) => () => {
   
   //发布活动
   const sendDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
       }).catch((err) => {

src/pages/activity/SignList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -50,11 +50,7 @@ const header = (props) => {
 
   // 查询列表
   const getSignList = (params) => {
-    request({
-        url: '/api/admin/SignList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/activity/editActivity.jsx

@@ -2,6 +2,7 @@ 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 styles from '../style/GoodsList.less';
+import apis from '../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
@@ -36,11 +37,7 @@ const Edit = (props) => {
 
     // 查询列表
     const getDynamicData = (dynamicId) => {
-      request({
-        url: '/api/admin/buildingDynamic/Details',
-        method: 'GET',
-        params: { dynamicId },
-      }).then((data) => {
+      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
         console.log(data)
         setDynamicData(data)
       })
@@ -143,22 +140,14 @@ const Edit = (props) => {
       console.log('submit data --->', submitValue)
       if (dynamicId) {
         submitValue.dynamicId = dynamicId
-        request({
-          url: '/api/admin/buildingDynamic/update',
-          method: 'PUT',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.update, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       } else {
-        request({
-          url: '/api/admin/buildingDynamic/add',
-          method: 'POST',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.add, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
@@ -178,11 +167,7 @@ const Edit = (props) => {
 
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/poster',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.poster, params: {targetId: dynamicId,targetType: 'activity'} }).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setPosterId(data[0].posterId)
@@ -199,21 +184,13 @@ const Edit = (props) => {
     const submitPoster  = () => {
        if(dynamicId){
         if(posterId){
-          request({
-            url: '/api/admin/poster/'+posterId,
-            method: 'PUT',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/poster',
-            method: 'POST',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.addPoster, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -290,11 +267,7 @@ const Edit = (props) => {
     
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/shareContent',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.shareContent, params: {targetId: dynamicId,targetType: 'activity'},}).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setShareContentId(data[0].shareContentId)
@@ -310,21 +283,13 @@ const Edit = (props) => {
     const submitShare = () => {
       if(dynamicId){
         if(shareContentId){
-          request({
-            url: '/api/admin/shareContent/'+shareContentId,
-            method: 'PUT',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/shareContent',
-            method: 'POST',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/building/list/add/amap.css

@@ -0,0 +1,401 @@
+html {
+  font-size: 12px;
+}
+.amap-copyright {
+  box-sizing: content-box;
+}
+* {
+  box-sizing: border-box;
+}
+.input-textarea {
+  color: grey;
+  height: 8em;
+  overflow: auto;
+  border-radius: 0.4rem;
+  border: 1px solid #ced4da;
+  margin-bottom: 1rem;
+}
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  line-height: 1.5;
+  font-weight: 300;
+  color: #111213;
+}
+hr {
+  margin: 0.5rem 0;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+label {
+  display: inline-block;
+  margin-bottom: 0.4rem;
+}
+label,
+.btn {
+  margin-left: 0;
+  font-size: 1rem;
+}
+button,
+input,
+select {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  overflow: visible;
+  text-transform: none;
+}
+[type=button]::-moz-focus-inner,
+[type=reset]::-moz-focus-inner,
+[type=submit]::-moz-focus-inner,
+button::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+input[type=checkbox],
+input[type=radio] {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0 0.5rem 0 0;
+}
+h4 {
+  font-family: inherit;
+  line-height: 1.8;
+  font-weight: 300;
+  color: inherit;
+  font-size: 1.1rem;
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+}
+.btn {
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  background-color: transparent;
+  background-image: none;
+  color: #25A5F7;
+  border-color: #25A5F7;
+  padding: .25rem .5rem;
+  line-height: 1.5;
+  border-radius: 1rem;
+  -webkit-appearance: button;
+  cursor: pointer;
+}
+.btn:hover {
+  color: #fff;
+  background-color: #25A5F7;
+  border-color: #25A5F7;
+}
+.btn:hover {
+  text-decoration: none;
+}
+.input-item {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -ms-flex-align: center;
+  align-items: center;
+  width: 100%;
+  height: 3rem;
+}
+.input-item:last-child {
+  margin-bottom: 0;
+}
+.input-item > select,
+.input-item > input[type=text],
+.input-item > input[type=date] {
+  position: relative;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 1%;
+  margin-bottom: 0;
+}
+.input-item > select:not(:last-child),
+.input-item > input[type=text]:not(:last-child),
+.input-item > input[type=date]:not(:last-child) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-item > select:not(:first-child),
+.input-item > input[type=text]:not(:first-child),
+.input-item > input[type=date]:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.input-item-prepend {
+  margin-right: -1px;
+}
+.input-item-text,
+input[type=text],
+input[type=date],
+select {
+  height: calc(4.2rem);
+}
+.input-item-text {
+  width: 6rem;
+  text-align: justify;
+  padding: 0.4rem 0.7rem;
+  display: inline-block;
+  text-justify: distribute-all-lines;
+  /*ie6-8*/
+  text-align-last: justify;
+  /* ie9*/
+  -moz-text-align-last: justify;
+  /*ff*/
+  -webkit-text-align-last: justify;
+  /*chrome 20+*/
+  -ms-flex-align: center;
+  align-items: center;
+  margin-bottom: 0;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #495057;
+  text-align: center;
+  white-space: nowrap;
+  background-color: #e9ecef;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.input-item-text input[type=checkbox],
+.input-item-text input[type=radio] {
+  margin-top: 0;
+}
+.input-card {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border-radius: .25rem;
+  width: 22rem;
+  border-width: 0;
+  border-radius: 0.4rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  position: fixed;
+  bottom: 1rem;
+  right: 1rem;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 0.75rem 1.25rem;
+}
+.input-text {
+  line-height: 2rem;
+  margin-right: 2rem;
+}
+.info hr {
+  margin-right: 0;
+  margin-left: 0;
+  border-top-color: grey;
+}
+.info {
+  padding: .75rem 1.25rem;
+  margin-bottom: 1rem;
+  border-radius: .25rem;
+  position: fixed;
+  top: 1rem;
+  background-color: white;
+  width: auto;
+  min-width: 22rem;
+  border-width: 0;
+  right: 1rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  position: absolute;
+  z-index: 100;
+}
+.code {
+  left: 1.5rem;
+  right: 1.5rem;
+  top: 1.5rem;
+  bottom: 1.5rem;
+  overflow: auto;
+  margin-bottom: 0rem;
+}
+.code .btn {
+  top: 1rem;
+  position: absolute;
+  right: 1rem;
+}
+.code .result {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  bottom: 1rem;
+  position: absolute;
+  top: 5.5rem;
+  right: 1rem;
+  left: 1rem;
+  overflow: auto;
+}
+.code .status {
+  color: #80adff;
+  display: inline-block;
+  font-size: 14px;
+}
+.code h4 {
+  display: inline-block;
+  max-width: 20rem;
+  margin-right: 1rem;
+  margin-bottom: 1rem;
+}
+select,
+input[type=text],
+input[type=date] {
+  display: inline-block;
+  width: 100%;
+  padding: .375rem 1.75rem .375rem .75rem;
+  line-height: 1.5;
+  color: #495057;
+  vertical-align: middle;
+  background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center;
+  background-size: 8px 10px;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+input[type=text],
+input[type=date] {
+  background: #fff;
+  padding: .375rem .75rem;
+}
+select:focus,
+input[type=text]:focus,
+input[type=date]:focus {
+  border-color: #80bdff;
+  outline: 0;
+  box-shadow: 0 0 0 0.1rem rgba(128, 189, 255, 0.1);
+}
+.btn:focus {
+  outline: 0;
+  box-shadow: none;
+}
+select:focus::-ms-value,
+input[type=text]:focus::-ms-value,
+input[type=date]:focus::-ms-value {
+  color: #495057;
+  background-color: #fff;
+}
+/* native toastr */
+.native-toast {
+  position: fixed;
+  background-color: rgba(50, 50, 50, 0.8);
+  border-radius: 33px;
+  color: white;
+  left: 50%;
+  text-align: center;
+  padding: 6px 12px;
+  opacity: 0;
+  z-index: 99999;
+  transition: transform .25s, opacity .25s, top .25s;
+  box-sizing: border-box;
+}
+.native-toast-bottom {
+  bottom: 50px;
+  -ms-transform: translateX(-50%) translateY(50px);
+  transform: translateX(-50%) translateY(50px);
+}
+.native-toast-bottom.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+  transform: translateX(-50%) translateY(0);
+}
+.native-toast-bottom.native-toast-edge {
+  bottom: 0;
+}
+.native-toast-top {
+  top: 50px;
+  -ms-transform: translateX(-50%) translateY(-50px);
+  transform: translateX(-50%) translateY(-50px);
+}
+.native-toast-top.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+  transform: translateX(-50%) translateY(0);
+}
+.native-toast-top.native-toast-edge {
+  top: 0;
+}
+.native-toast-center {
+  top: 0;
+  -ms-transform: translateX(-50%) translateY(-50px);
+  transform: translateX(-50%) translateY(-50px);
+}
+.native-toast-center.native-toast-shown {
+  opacity: 1;
+  top: 50%;
+  -ms-transform: translateX(-50%) translateY(-50%);
+  transform: translateX(-50%) translateY(-50%);
+}
+.native-toast-edge {
+  border-radius: 0;
+  width: 100%;
+  text-align: left;
+}
+@media screen and (min-width: 40rem) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 18rem;
+  }
+}
+/*
+  max-width does not seem to work in small screen?
+*/
+/*@media screen and (max-width: 768px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 400px;
+  }
+}
+
+@media screen and (max-width: 468px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 300px;
+  }
+}*/
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/amap.less

@@ -0,0 +1,434 @@
+html {
+  font-size: 12px;
+}
+.amap-copyright{
+  box-sizing: content-box
+}
+* {
+  box-sizing: border-box
+}
+.input-textarea{
+   color:grey;
+   height:8em;
+   overflow:auto;
+   border-radius:0.4rem;
+   border:1px solid #ced4da;
+   margin-bottom:1rem;
+}
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  line-height: 1.5;
+  font-weight: 300;
+  color: #111213;
+}
+
+hr {
+  margin: 0.5rem 0;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, .1)
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: 0.4rem;
+}
+
+label, .btn {
+  margin-left: 0;
+  font-size: 1rem;
+}
+
+button, input, select {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  overflow: visible;
+  text-transform: none
+}
+
+[type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+input[type=checkbox], input[type=radio] {
+  box-sizing: border-box;
+  padding: 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0 0.5rem 0 0;
+}
+
+h4 {
+  font-family: inherit;
+  line-height: 1.8;
+  font-weight: 300;
+  color: inherit;
+  font-size: 1.1rem;
+  margin-top: 0;
+  margin-bottom: .5rem
+}
+
+.btn {
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+  background-color: transparent;
+  background-image: none;
+  color: #25A5F7;
+  border-color: #25A5F7;
+  padding: .25rem .5rem;
+  line-height: 1.5;
+  border-radius: 1rem;
+  -webkit-appearance: button;
+  cursor:pointer;
+}
+
+.btn:hover {
+  color: #fff;
+  background-color: #25A5F7;
+  border-color: #25A5F7
+}
+
+.btn:hover {
+  text-decoration: none
+}
+
+.input-item {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -ms-flex-align: center;
+  align-items: center;
+  width: 100%;
+  height: 3rem;
+}
+
+.input-item:last-child {
+  margin-bottom: 0;
+}
+
+.input-item>select, .input-item>input[type=text], .input-item>input[type=date] {
+  position: relative;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 1%;
+  margin-bottom: 0;
+}
+
+.input-item>select:not(:last-child), .input-item>input[type=text]:not(:last-child), .input-item>input[type=date]:not(:last-child) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0
+}
+
+.input-item>select:not(:first-child), .input-item>input[type=text]:not(:first-child), .input-item>input[type=date]:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0
+}
+
+.input-item-prepend {
+  margin-right: -1px;
+}
+
+.input-item-text, input[type=text],input[type=date], select {
+  height: calc(2.2rem + 2px);
+}
+
+.input-item-text {
+  width: 6rem;
+  text-align: justify;
+  padding: 0.4rem 0.7rem;
+  display: inline-block;
+  text-justify: distribute-all-lines;
+  /*ie6-8*/
+  text-align-last: justify;
+  /* ie9*/
+  -moz-text-align-last: justify;
+  /*ff*/
+  -webkit-text-align-last: justify;
+  /*chrome 20+*/
+  -ms-flex-align: center;
+  align-items: center;
+  margin-bottom: 0;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #495057;
+  text-align: center;
+  white-space: nowrap;
+  background-color: #e9ecef;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+.input-item-text input[type=checkbox], .input-item-text input[type=radio] {
+  margin-top: 0
+}
+
+.input-card {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border-radius: .25rem;
+  width: 22rem;
+  border-width: 0;
+  border-radius: 0.4rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+  position: fixed;
+  bottom: 1rem;
+  right: 1rem;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 0.75rem 1.25rem;
+}
+
+.input-text {
+  line-height: 2rem;
+  margin-right: 2rem;
+}
+
+.info hr {
+  margin-right: 0;
+  margin-left: 0;
+  border-top-color: grey;
+}
+
+.info {
+  padding: .75rem 1.25rem;
+  margin-bottom: 1rem;
+  border-radius: .25rem;
+  position: fixed;
+  top: 1rem;
+  background-color: white;
+  width: auto;
+  min-width: 22rem;
+  border-width: 0;
+  right: 1rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+  position: absolute;
+  z-index: 100;
+}
+
+.code {
+  left: 1.5rem;
+  right: 1.5rem;
+  top: 1.5rem;
+  bottom: 1.5rem;
+  overflow: auto;
+  margin-bottom: 0rem;
+}
+
+.code .btn {
+  top: 1rem;
+  position: absolute;
+  right: 1rem;
+}
+
+.code .result {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  bottom: 1rem;
+  position: absolute;
+  top: 5.5rem;
+  right: 1rem;
+  left: 1rem;
+  overflow: auto;
+}
+
+.code .status {
+  color: #80adff;
+  display: inline-block;
+  font-size: 14px;
+}
+
+.code h4 {
+  display: inline-block;
+  max-width: 20rem;
+  margin-right: 1rem;
+  margin-bottom: 1rem;
+}
+
+select, input[type=text], input[type=date] {
+  display: inline-block;
+  width: 100%;
+  padding: .375rem 1.75rem .375rem .75rem;
+  line-height: 1.5;
+  color: #495057;
+  vertical-align: middle;
+  background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;
+  background-size: 8px 10px;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none
+}
+
+input[type=text],input[type=date] {
+  background: #fff;
+  padding: .375rem .75rem;
+}
+
+select:focus, input[type=text]:focus, input[type=date]:focus {
+  border-color: #80bdff;
+  outline: 0;
+  box-shadow: 0 0 0 .1rem rgba(128, 189, 255, .1)
+}
+
+.btn:focus {
+  outline: 0;
+  box-shadow: none;
+}
+
+select:focus::-ms-value, input[type=text]:focus::-ms-value,input[type=date]:focus::-ms-value {
+  color: #495057;
+  background-color: #fff
+}
+
+
+/* native toastr */
+.native-toast {
+  position: fixed;
+  background-color: rgba(50, 50, 50, .8);
+  border-radius: 33px;
+  color: white;
+  left: 50%;
+  text-align: center;
+  padding: 6px 12px;
+  opacity: 0;
+  z-index: 99999;
+  transition: transform .25s, opacity .25s, top .25s;
+  box-sizing: border-box;
+}
+
+.native-toast-bottom {
+  bottom: 50px;
+  -ms-transform: translateX(-50%) translateY(50px);
+      transform: translateX(-50%) translateY(50px)
+}
+
+.native-toast-bottom.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+      transform: translateX(-50%) translateY(0);
+}
+
+.native-toast-bottom.native-toast-edge {
+  bottom: 0;
+}
+
+.native-toast-top {
+  top: 50px;
+  -ms-transform: translateX(-50%) translateY(-50px);
+      transform: translateX(-50%) translateY(-50px)
+}
+
+.native-toast-top.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+      transform: translateX(-50%) translateY(0);
+}
+
+.native-toast-top.native-toast-edge {
+  top: 0;
+}
+
+.native-toast-center {
+  top: 0;
+  -ms-transform: translateX(-50%) translateY(-50px);
+      transform: translateX(-50%) translateY(-50px)
+}
+
+.native-toast-center.native-toast-shown {
+  opacity: 1;
+  top: 50%;
+  -ms-transform: translateX(-50%) translateY(-50%);
+      transform: translateX(-50%) translateY(-50%);
+}
+
+.native-toast-edge {
+  border-radius: 0;
+  width: 100%;
+  text-align: left;
+}
+
+@media screen and (min-width: 40rem) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 18rem;
+  }
+}
+
+/*
+  max-width does not seem to work in small screen?
+*/
+
+/*@media screen and (max-width: 768px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 400px;
+  }
+}
+
+@media screen and (max-width: 468px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 300px;
+  }
+}*/
+
+/* types */
+
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px
+}
+
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/amap.wxss

@@ -0,0 +1,401 @@
+html {
+  font-size: 12px;
+}
+.amap-copyright {
+  box-sizing: content-box;
+}
+* {
+  box-sizing: border-box;
+}
+.input-textarea {
+  color: grey;
+  height: 8em;
+  overflow: auto;
+  border-radius: 0.4rem;
+  border: 1px solid #ced4da;
+  margin-bottom: 1rem;
+}
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  line-height: 1.5;
+  font-weight: 300;
+  color: #111213;
+}
+hr {
+  margin: 0.5rem 0;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+label {
+  display: inline-block;
+  margin-bottom: 0.4rem;
+}
+label,
+.btn {
+  margin-left: 0;
+  font-size: 1rem;
+}
+button,
+input,
+select {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  overflow: visible;
+  text-transform: none;
+}
+[type=button]::-moz-focus-inner,
+[type=reset]::-moz-focus-inner,
+[type=submit]::-moz-focus-inner,
+button::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+input[type=checkbox],
+input[type=radio] {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0 0.5rem 0 0;
+}
+h4 {
+  font-family: inherit;
+  line-height: 1.8;
+  font-weight: 300;
+  color: inherit;
+  font-size: 1.1rem;
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+}
+.btn {
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  background-color: transparent;
+  background-image: none;
+  color: #25A5F7;
+  border-color: #25A5F7;
+  padding: .25rem .5rem;
+  line-height: 1.5;
+  border-radius: 1rem;
+  -webkit-appearance: button;
+  cursor: pointer;
+}
+.btn:hover {
+  color: #fff;
+  background-color: #25A5F7;
+  border-color: #25A5F7;
+}
+.btn:hover {
+  text-decoration: none;
+}
+.input-item {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -ms-flex-align: center;
+  align-items: center;
+  width: 100%;
+  height: 3rem;
+}
+.input-item:last-child {
+  margin-bottom: 0;
+}
+.input-item > select,
+.input-item > input[type=text],
+.input-item > input[type=date] {
+  position: relative;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 1%;
+  margin-bottom: 0;
+}
+.input-item > select:not(:last-child),
+.input-item > input[type=text]:not(:last-child),
+.input-item > input[type=date]:not(:last-child) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-item > select:not(:first-child),
+.input-item > input[type=text]:not(:first-child),
+.input-item > input[type=date]:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.input-item-prepend {
+  margin-right: -1px;
+}
+.input-item-text,
+input[type=text],
+input[type=date],
+select {
+  height: calc(4.2rem);
+}
+.input-item-text {
+  width: 6rem;
+  text-align: justify;
+  padding: 0.4rem 0.7rem;
+  display: inline-block;
+  text-justify: distribute-all-lines;
+  /*ie6-8*/
+  text-align-last: justify;
+  /* ie9*/
+  -moz-text-align-last: justify;
+  /*ff*/
+  -webkit-text-align-last: justify;
+  /*chrome 20+*/
+  -ms-flex-align: center;
+  align-items: center;
+  margin-bottom: 0;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #495057;
+  text-align: center;
+  white-space: nowrap;
+  background-color: #e9ecef;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.input-item-text input[type=checkbox],
+.input-item-text input[type=radio] {
+  margin-top: 0;
+}
+.input-card {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border-radius: .25rem;
+  width: 22rem;
+  border-width: 0;
+  border-radius: 0.4rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  position: fixed;
+  bottom: 1rem;
+  right: 1rem;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 0.75rem 1.25rem;
+}
+.input-text {
+  line-height: 2rem;
+  margin-right: 2rem;
+}
+.info hr {
+  margin-right: 0;
+  margin-left: 0;
+  border-top-color: grey;
+}
+.info {
+  padding: .75rem 1.25rem;
+  margin-bottom: 1rem;
+  border-radius: .25rem;
+  position: fixed;
+  top: 1rem;
+  background-color: white;
+  width: auto;
+  min-width: 22rem;
+  border-width: 0;
+  right: 1rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  position: absolute;
+  z-index: 100;
+}
+.code {
+  left: 1.5rem;
+  right: 1.5rem;
+  top: 1.5rem;
+  bottom: 1.5rem;
+  overflow: auto;
+  margin-bottom: 0rem;
+}
+.code .btn {
+  top: 1rem;
+  position: absolute;
+  right: 1rem;
+}
+.code .result {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  bottom: 1rem;
+  position: absolute;
+  top: 5.5rem;
+  right: 1rem;
+  left: 1rem;
+  overflow: auto;
+}
+.code .status {
+  color: #80adff;
+  display: inline-block;
+  font-size: 14px;
+}
+.code h4 {
+  display: inline-block;
+  max-width: 20rem;
+  margin-right: 1rem;
+  margin-bottom: 1rem;
+}
+select,
+input[type=text],
+input[type=date] {
+  display: inline-block;
+  width: 100%;
+  padding: .375rem 1.75rem .375rem .75rem;
+  line-height: 1.5;
+  color: #495057;
+  vertical-align: middle;
+  background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center;
+  background-size: 8px 10px;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+input[type=text],
+input[type=date] {
+  background: #fff;
+  padding: .375rem .75rem;
+}
+select:focus,
+input[type=text]:focus,
+input[type=date]:focus {
+  border-color: #80bdff;
+  outline: 0;
+  box-shadow: 0 0 0 0.1rem rgba(128, 189, 255, 0.1);
+}
+.btn:focus {
+  outline: 0;
+  box-shadow: none;
+}
+select:focus::-ms-value,
+input[type=text]:focus::-ms-value,
+input[type=date]:focus::-ms-value {
+  color: #495057;
+  background-color: #fff;
+}
+/* native toastr */
+.native-toast {
+  position: fixed;
+  background-color: rgba(50, 50, 50, 0.8);
+  border-radius: 33px;
+  color: white;
+  left: 50%;
+  text-align: center;
+  padding: 6px 12px;
+  opacity: 0;
+  z-index: 99999;
+  transition: transform .25s, opacity .25s, top .25s;
+  box-sizing: border-box;
+}
+.native-toast-bottom {
+  bottom: 50px;
+  -ms-transform: translateX(-50%) translateY(50px);
+  transform: translateX(-50%) translateY(50px);
+}
+.native-toast-bottom.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+  transform: translateX(-50%) translateY(0);
+}
+.native-toast-bottom.native-toast-edge {
+  bottom: 0;
+}
+.native-toast-top {
+  top: 50px;
+  -ms-transform: translateX(-50%) translateY(-50px);
+  transform: translateX(-50%) translateY(-50px);
+}
+.native-toast-top.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+  transform: translateX(-50%) translateY(0);
+}
+.native-toast-top.native-toast-edge {
+  top: 0;
+}
+.native-toast-center {
+  top: 0;
+  -ms-transform: translateX(-50%) translateY(-50px);
+  transform: translateX(-50%) translateY(-50px);
+}
+.native-toast-center.native-toast-shown {
+  opacity: 1;
+  top: 50%;
+  -ms-transform: translateX(-50%) translateY(-50%);
+  transform: translateX(-50%) translateY(-50%);
+}
+.native-toast-edge {
+  border-radius: 0;
+  width: 100%;
+  text-align: left;
+}
+@media screen and (min-width: 40rem) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 18rem;
+  }
+}
+/*
+  max-width does not seem to work in small screen?
+*/
+/*@media screen and (max-width: 768px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 400px;
+  }
+}
+
+@media screen and (max-width: 468px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 300px;
+  }
+}*/
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

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

@@ -1,20 +1,98 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Map } from 'react-amap';
+import { Map, Marker } from 'react-amap';
+import '../amap.less'
 
 class Amap extends React.Component {
   constructor(props) {
-    super(props)
-    this.state = { coordinates: [] }
+    super(props);
+    this.amapEvents = {
+      created: mapInstance => {
+        console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
+        console.log(mapInstance.getZoom());
+        AMap.plugin(['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.CitySearch'], () => {
+          // 实例化Autocomplete
+          const autoOptions = {
+            // city 限定城市，默认全国
+            city: '全国',
+            // input 为绑定输入提示功能的input的DOM ID
+            input: 'amapInput',
+          }
+          const autoComplete = new AMap.Autocomplete(autoOptions);
+          // 无需再手动执行search方法，autoComplete会根据传入input对应的DOM动态触发search
+
+          const placeSearch = new AMap.PlaceSearch({
+            city: '南京',
+            map: mapInstance,
+          })
+          AMap.event.addListener(autoComplete, 'select', e => {
+            // TODO 针对选中的poi实现自己的功能
+            placeSearch.setCity(e.poi.adcode)
+            placeSearch.search(e.poi.name)
+          })
+
+
+          const citySearch = new AMap.CitySearch()
+          citySearch.getLocalCity((status, result) => {
+            if (status === 'complete' && result.info === 'OK') {
+              // 查询成功，result即为当前所在城市信息
+              console.log('当前所在城市：', result)
+              if (result && result.city && result.bounds) {
+                // 当前城市名称
+                // const cityinfo = result.city;
+
+                // 当前城市位置信息
+                const citybounds = result.bounds;
+                // document.getElementById('info').innerHTML = '您当前所在城市：'+cityinfo;
+                // 地图显示当前城市
+                mapInstance.setBounds(citybounds);
+            }
+            }
+          })
+        })
+
+        mapInstance.on('click', e => {
+          const lngLat = `${e.lnglat.getLng()},${e.lnglat.getLat()}`
+          console.log('坐标位置:', lngLat)
+          this.props.onChange(lngLat)
+        });
+      },
+    };
+    this.markerEvents = {
+      created: markerInstance => {
+        console.log('高德地图 Marker 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
+        console.log(markerInstance.getPosition());
+
+        // 地理坐标位置定位
+        // markerInstance.setPosition();
+      },
+    }
+    this.markerPosition = { longitude: 120, latitude: 30 };
   }
 
   render() {
     return (
-      <div style={{ width: '100%', height: '400px' }}>
-        <Map amapkey="f0d1d4f82432504003ebf46e5e36ff03"/>
-      </div>
+      <>
+        <div style={{ width: '100%', height: '400px' }}>
+          <Map events={this.amapEvents} amapkey="f0d1d4f82432504003ebf46e5e36ff03">
+            <Marker position={this.markerPosition} events={this.markerEvents} />
+          </Map>
+          {
+              <div className="info">
+                <div className="input-item">
+                  <div className="input-item-prepend">
+                    <span className="input-item-text" style={{ width: '8rem' }}>请输入关键字</span>
+                  </div>
+                  <input id="amapInput" type="text" />
+                </div>
+            </div>
+            }
+        </div>
+      </>
     )
   }
 }
 
+// f0d1d4f82432504003ebf46e5e36ff03
+
 export default Amap

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

@@ -125,7 +125,7 @@ function AddBuilding(props) {
           <Form.Item label="销售状态" hasFeedback>
             {getFieldDecorator('marketStatus')(<Input />)}
           </Form.Item>
-          <Form.Item label="标签" hasFeedback>
+          <Form.Item label="标签" hasFeedback style={{ display: 'none' }}>
             {getFieldDecorator('tags')(
               <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
                 <Option value="未知">未知</Option>
@@ -178,7 +178,7 @@ function AddBuilding(props) {
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" hasFeedback>
-            {(<Amap />)}
+            {getFieldDecorator('coordinate')(<Amap />)}
           </Form.Item>
           <Form.Item label="周边交通" hasFeedback>
             {getFieldDecorator('buildingTransport')(

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

@@ -13,6 +13,7 @@ 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;
@@ -23,6 +24,7 @@ const Poster = props => {
   const [imgValue, changeImg] = useState('')
   const [posterId, setPosterId] = useState('')
 
+  const [building, setBuilding] = useState({})
   const { buildingId } = props.building
 
   if (buildingId) {
@@ -43,9 +45,21 @@ const Poster = props => {
       }).catch(err => {
         message.info(err.msg || err.message)
       })
+
+      getById(buildingId)
     }, [])
   }
 
+  // 获取详情信息
+  function getById(currentId) {
+    const { url, method } = apis.building.buildingGetById
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
+
+    request({ url: tempUrl, method }).then(res => {
+      setBuilding(res)
+    })
+  }
+
   const submitPoster = () => {
     if (buildingId) {
       if (posterId) {
@@ -81,7 +95,11 @@ const Poster = props => {
         <div style={{ width: '375px', height: '785px', 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 || poster1} alt="" />
 
-          <p className={Styles.tagLabel}><span>全朝南</span><span>品牌开发商</span><span>轨交房</span></p>
+          <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',
@@ -89,8 +107,8 @@ const Poster = props => {
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
-          }}>{inputValue || '海报标题'}</p>
-          <p style={{ color: '#999',padding:' 0 20px' }}>约<span style={{ color: '#fd0d0c', fontSize: '24px',marginLeft:'6px' }}>41505</span><span style={{ color: '#fd0d0c', fontSize: '20px' }}>元/m²</span></p>
+          }}>{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>
 
           <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} alt="" />
           <p style={{

src/pages/carouselFigure/advertisingList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
@@ -123,11 +115,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {

src/pages/carouselFigure/carouselFigureList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
@@ -123,11 +115,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {

src/pages/carouselFigure/editAdvertising.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'screen'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/carouselFigure/editCarousel.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'banner'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/integralMall/GoodsList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -20,11 +20,7 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taGoods',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -62,11 +58,7 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taGoods/change',
-          method: 'PUT',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
         })

src/pages/integralMall/achieve.jsx

@@ -5,6 +5,7 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { TabPane } = Tabs;
@@ -28,11 +29,7 @@ useEffect(() => {
 
 // 查询列表
 const getList = (params) => {
-  request({
-      url: '/api/admin/tdPointsRules',
-      method: 'GET',
-      params: { ...params },
-  }).then((data) => {
+  request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
       console.log(data)
       setData(data)
   })
@@ -54,11 +51,7 @@ const changePageNum = (pageNumber) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/tdPointsRules/change',
-      method: 'PUT',
-      data: { ...row },
-    }).then((data) => {
+    request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10, type: carType})
     })

src/pages/integralMall/editGoods.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { TextArea } = Input;
@@ -21,10 +22,7 @@ const header = props => {
 
   // 查询列表
   const getGoodsData = (goodsId) => {
-    request({
-        url: '/api/admin/taGoods/' + goodsId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
         console.log(data)
         setGoodsData(data)
     })
@@ -111,21 +109,13 @@ const header = props => {
   const handleSubmit = (values) => {
     if(goodsId){
       values.goodsId = goodsId
-      request({
-        url: '/api/admin/taGoods',
-        method: 'PUT',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
       }else{
-      request({
-        url: '/api/admin/taGoods/add',
-        method: 'POST',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)

src/pages/integralMall/exchangeRecords.jsx

@@ -5,7 +5,7 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 /**
@@ -27,11 +27,7 @@ function record(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPointsExchange',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }

src/pages/integralMall/verifyList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -19,11 +19,7 @@ const header = (props) => {
 
   // 查询列表
   const getVerifyList = (params) => {
-    request({
-      url: '/api/admin/taPointsExchange',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }
@@ -39,11 +35,7 @@ const header = (props) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/taPointsExchange/change',
-      method: 'PUT',
-      data: row
-    }).then((data) => {
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
         message.info("操作成功")
         getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
     })

src/pages/staff/list/StaffList.jsx

@@ -5,6 +5,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import { Card, Avatar } from 'antd';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
 
@@ -22,6 +23,7 @@ const toEditStaff = (userId) => () => {
   });
 }
 
+
 /**
  *卡片
  *
@@ -30,18 +32,34 @@ const toEditStaff = (userId) => () => {
 const CartBody = (props) => {
   const { data } = props
 
-  const confirm = () => {
-    Modal.confirm({
-      title: '确认停用该角色？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        console.log('OK');
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
+  const confirm = (data) => () => {
+    console.log(data,"11111")
+    if(data.status === 1){
+      Modal.confirm({
+        title: '确认停用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'off'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }else{
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'on'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }
+    
   }
   return (
 
@@ -53,14 +71,14 @@ const CartBody = (props) => {
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </Button>
-        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
-          停用
+        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm(data)}>
+          {data.status === 1 ? '停用' : '启用'}
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </Button>
-        <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
+        {/* <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
           启用
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-        </Button>
+        </Button> */}
 
       </div>
       <div>
@@ -75,7 +93,7 @@ const CartBody = (props) => {
 
         <p className={Styles.cardText} >姓名 : {data.userName}
         </p>
-        <p className={Styles.statusText} > 状态 : {data.status === '1' ? '启用' : '停用'} </p>
+        <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p>
         <p className={Styles.phoneText} >
           电话 : {data.phone}
         </p>
@@ -85,7 +103,6 @@ const CartBody = (props) => {
   )
 }
 
-
 const header = (props) => {
   const [tempData, setTempData] = useState([])
   useEffect(() => {
@@ -93,11 +110,7 @@ const header = (props) => {
   }, [])
 
   const getList = (params) => {
-    request({
-      url: '/api/admin/taUser',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
+    request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
       setTempData(data.records)
     })
@@ -162,7 +175,7 @@ const header = (props) => {
         {
           tempData.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} />
+              <CartBody data={item} onFresh={()=> getList({ pageNum: 1, pageSize: 10 })}/>
             </Col>
           ))
         }

src/pages/staff/list/editStaff.jsx

@@ -9,6 +9,7 @@ import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import channels from './channelList.less';
 import Tagss from '../components/Tagss.jsx';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { TextArea } = Input;
@@ -27,21 +28,14 @@ const Edit = (props) => {
   const [tagData, setTagData] = useState([])
 
   const getTagList = () => {
-    request({
-      url: '/api/admin/taTags',
-      method: 'GET',
-      params: {pageNum:1,pageSize:999}
-    }).then((data) => {
+    request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
       setTagData(data.records)
     })
   }
 
   // 查询列表
   const getUserData = (userId) => {
-    request({
-      url: '/api/admin/taUser/'+userId,
-      method: 'GET',
-    }).then((data) => {
+    request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
       console.log(data,"tauser")
       setUserData(data)
     })
@@ -60,21 +54,13 @@ const Edit = (props) => {
 
   const handleSubmit = val => {
     if(userId){
-      request({
-        url: '/api/admin/taUser/' + userId,
-        method: 'PUT',
-        data: val,
-      }).then((data) => {
+      request({ ...apis.staff.updateTaUser, urlData: {id:userId},data: val, }).then((data) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)
       })
     }else{
-      request({
-        url: '/api/admin/taUser',
-        method: 'POST',
-        data: val,
-      }).then((data) => {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)

src/pages/system/editPolicy.jsx

@@ -8,6 +8,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import SelectCity from '../../components/SelectButton/CitySelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getPolicyData = (policyId) => {
-    request({
-        url: '/api/admin/taPolicy/' + policyId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taPolicy, urlData: {id: policyId} }).then((data) => {
         console.log(data)
         setPolicyData(data)
     })
@@ -80,22 +78,14 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       console.log('submit data --->', val)
       if(policyId){
         val.policyId = policyId
-        request({
-          url: '/api/admin/taPolicy/'+policyId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/taPolicy',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {

src/pages/system/housingPolicy.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -21,11 +21,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPolicy',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.getTaPolicy, params: { ...params }, }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -104,10 +100,7 @@ const deletePolicy = (policyId) => () => {
     okText: '确定',
     cancelText: '取消',
     onOk() {
-        request({
-            url: '/api/admin/taPolicy/'+policyId,
-            method: 'DELETE',
-        }).then((data) => {
+        request({ ...apis.system.deleteTaPolicy, urlData: {id: policyId }, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10,cityId: '' });
         }).catch((err) => {
@@ -123,11 +116,7 @@ const deletePolicy = (policyId) => () => {
   const topPolicy = (row) => () => {
       const weight = Math.abs(row.weight - 1)
       row.weight = weight
-      request({
-          url: '/api/admin/taPolicy/'+row.policyId,
-          method: 'PUT',
-          data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });
@@ -144,11 +133,7 @@ const deletePolicy = (policyId) => () => {
         row.publishStatus = 1
       }
 
-      request({
-        url: '/api/admin/taPolicy/'+row.policyId,
-        method: 'PUT',
-        data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });

src/pages/system/intention.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 import SelectCity from '../../components/SelectButton/CitySelect'
 
@@ -23,11 +24,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const changBuilding = (buildingId) => {
     setBuildingIdData(buildingId)
-    request({
-      url: '/api/admin/tdBizEventIntention',
-      method: 'GET',
-      params: {pageNum: 1, pageSize: 999,buildingId}
-    }).then((data) => {
+    request({ ...apis.system.tdBizEventIntention, params: {pageNum: 1, pageSize: 999,buildingId}}).then((data) => {
       console.log(data)
       setData(data.records)
     })
@@ -50,11 +47,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     if(buildingIdValue === ''){
       return
     }
-    request({
-      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
-      method: 'POST',
-      data
-    }).then((data) => {
+    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: {id: buildingIdValue}, data,}).then((data) => {
       message.info("保存成功")
     })
   }

src/pages/system/messageList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taCustomerMessage',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.taCustomerMessage, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/system/report.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,19 +28,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询数据
   const getReportList = () => {
-    request({
-        url: '/api/admin/tdReports',
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.tdReports, }).then((data) => {
         setData((data.records || []).map(x => ({label: x.reportName, value: x.reportCode}) ))
     })
   }
 
   const getCheckedList = () => {
-    request({
-      url: '/api/admin/taBuildingReports',
-      method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taBuildingReports, }).then((data) => {
       setCheckData((data.records || []).map((x) => x.reportCode))
     })
   }
@@ -51,11 +46,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const saveCheckedReport = () => {
     console.log(checkData)
-    request({
-      url: '/api/admin/taBuildingReport/add',
-      method: 'POST',
-      data: {list: checkData}
-    }).then((data) => {
+    request({ ...apis.system.addTaBuildingReports, data: {list: checkData}}).then((data) => {
       message.info("保存成功")
     })
   }

src/services/apis.js

@@ -161,6 +161,200 @@ export default {
       url: `${prefix}/selectUserResource`
     },
 
+  },
+  activity: {
+      list: {
+        method: 'GET',
+        url: `${prefix}/iBuildingDynamicList`,
+      },
+      weight: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/weight`,
+      },
+      cancel: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/cancel/:id`,
+      },
+      send: {
+        url: `${prefix}/buildingDynamic/send/:id`,
+        method: 'PUT',
+      },
+      finish: {
+        url: `${prefix}/buildingDynamic/finish`,
+        method: 'PUT',
+      },
+      details: {
+        url: `${prefix}/buildingDynamic/Details`,
+        method: 'GET',
+      },
+      update: {
+        url: `${prefix}/buildingDynamic/update`,
+        method: 'PUT',
+      },
+      add: {
+        url: `${prefix}/buildingDynamic/add`,
+        method: 'POST',
+      },
+      poster: {
+        url: `${prefix}/poster`,
+        method: 'GET',
+      },
+      updatePoster: {
+        url: `${prefix}/poster/:id`,
+        method: 'PUT',
+      },
+      addPoster: {
+        url: `${prefix}/poster`,
+        method: 'POST',
+      },
+      shareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'GET',
+      },
+      updateShareContent: {
+        url: `${prefix}/shareContent/:id`,
+        method: 'PUT',
+      },
+      addShareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'POST',
+      },
+      signList: {
+        url: `${prefix}/SignList`,
+        method: 'GET',
+      }
+  },
+  integralMall: {
+    tdPointsRules: {
+      url: `${prefix}/tdPointsRules`,
+      method: 'GET',
+    },
+    change: {
+      url: `${prefix}/tdPointsRules/change`,
+      method: 'PUT',
+    },
+    taGoods: {
+      url: `${prefix}/taGoods/:id`,
+      method: 'GET',
+    },
+    updateTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'PUT',
+    },
+    addTaGoods: {
+      url: `${prefix}/taGoods/add`,
+      method: 'POST',
+    },
+    taPointsExchange: {
+      url: `${prefix}/taPointsExchange`,
+        method: 'GET',
+    },
+    getTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'GET',
+    },
+    changeTaGoods: {
+      url: `${prefix}/taGoods/change`,
+      method: 'PUT',
+    },
+    changeTaPointsExchange: {
+      url: `${prefix}/taPointsExchange/change`,
+      method: 'PUT',
+    }
+  },
+  carsuseFigure: {
+    extendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'GET',
+    },
+    finish: {
+      url: `${prefix}/buildingDynamic/finish`,
+      method: 'PUT',
+    },
+    updataExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'PUT',
+    },
+    getExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'GET',
+    },
+    addExtendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'POST',
+    }
+  },
+  system: {
+    taPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'GET',
+    },
+    updateTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'PUT',
+    },
+    addTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'POST',
+    },
+    getTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'GET',
+    },
+    deleteTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'DELETE',
+    },
+    tdBizEventIntention: {
+      url: `${prefix}/tdBizEventIntention`,
+      method: 'GET',
+    },
+    taBuildingIntentionAddOrUpdate: {
+      url: `${prefix}/taBuildingIntentionAddOrUpdate/:id`,
+      method: 'POST',
+    },
+    taCustomerMessage: {
+      url: `${prefix}/taCustomerMessage`,
+      method: 'GET',
+    },
+    tdReports: {
+      url: `${prefix}/tdReports`,
+      method: 'GET',
+    },
+    taBuildingReports: {
+      url: `${prefix}/taBuildingReports`,
+      method: 'GET',
+    },
+    addTaBuildingReports: {
+      url: `${prefix}/taBuildingReport/add`,
+      method: 'POST',
+    }
+  },
+  staff: {
+    taUser: {
+      url: `${prefix}/taUser`,
+      method: 'GET',
+    },
+    taTags: {
+      url: `${prefix}/taTags`,
+      method: 'GET',
+    },
+    getTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'GET',
+    },
+    updateTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'PUT',
+    },
+    addTaUser: {
+      url: `${prefix}/taUser`,
+      method: 'POST',
+    },
+    change: {
+      url: `${prefix}/turn/taUser/:id/:type`,
+      method: 'PUT',
+    }
   }
   // indexEcharts:{
   //   list:{