feats

.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,11 @@ export default {
 
   proxy: {
     '/api/': {
+<<<<<<< HEAD
       target: 'http://192.168.0.11:8080/',
+=======
+      target: 'http://192.168.0.172:8080/',
+>>>>>>> 5f3c214db5ee93d6bb88af4038dd9cec7d528a43
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

package.json

@@ -55,6 +55,8 @@
     "path-to-regexp": "^3.0.0",
     "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/app.js

@@ -1,3 +1,21 @@
+// (function (doc, win) {
+//   var docEl = doc.documentElement,
+//     resizeEvt = 'onorientationchange' in window ? 'onorientationchange' : 'resize',
+//     recalc = function () {
+//       var clientWidth = docEl.clientWidth;
+//       if (!clientWidth) return;
+//       if (clientWidth >= 750) {
+//         docEl.style.fontSize = '100px';
+//       } else {
+//         docEl.style.fontSize = 100 * (clientWidth / 750) + 'px';
+//       }
+//     };
+
+//   if (!doc.addEventListener) return;
+//   win.addEventListener(resizeEvt, recalc, false);
+//   doc.addEventListener('DOMContentLoaded', recalc, false);
+// })(document, window);
+
 export const dva = {
   config: {
     onError(e) {

src/global.less

@@ -79,9 +79,12 @@ ol {
 .ant-menu-vertical-left .ant-menu-submenu-title,
 .ant-menu-vertical-right .ant-menu-submenu-title,
 .ant-menu-inline .ant-menu-submenu-title,
-.ant-input ,.ant-btn,.ant-select,.ant-table {
+.ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
   font-size: 16px;
 }
+.ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
+  min-width: 100px;
+}
 .ant-breadcrumb{
   font-size: 16px;
   .anticon {

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) => {
@@ -245,7 +222,7 @@ const Edit = (props) => {
               textOverflow: 'ellipsis'
             }}>{inputValue ? inputValue : '海报标题'}</p>
 
-            <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
             <p style={{
               margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
               display: '-webkit-box', lineClamp: '3', height: '76px',
@@ -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,437 @@
+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;
+}
+
+.infoBox {
+  padding: .75rem 1.25rem;
+  position: absolute;
+  top: 1rem;
+  background-color: white;
+  width: auto;
+  min-width: 22rem;
+  left: 1rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+  z-index: 100;
+  .inputText{
+    margin-right: 10px;
+  }
+  .input{
+    width: 200px;
+  }
+ 
+}
+
+.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

@@ -0,0 +1,107 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Map, Marker } from 'react-amap';
+import styles from '../amap.less'
+
+class Amap extends React.Component {
+  constructor(props) {
+    super(props);
+    // 高德地图 Marker 实例
+    this.markerInstance = undefined
+    // 高德地图 Map 实例
+    this.mapInstance = undefined
+    this.amapEvents = {
+      created: mapInstance => {
+        console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
+        console.log(mapInstance.getZoom());
+        this.mapInstance = mapInstance
+
+        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());
+
+        this.markerInstance = markerInstance
+      },
+    }
+    this.markerPosition = { longitude: 120, latitude: 30 };
+  }
+
+  render() {
+    const { value } = this.props
+    if (value) {
+      this.markerInstance.setPosition(value.split(','))
+    }
+
+    return (
+      <>
+        <div style={{ width: '100%', height: '400px', position: 'relative' }}>
+          <Map events={this.amapEvents} amapkey="f0d1d4f82432504003ebf46e5e36ff03">
+            <Marker position={this.markerPosition} events={this.markerEvents} />
+          </Map>
+          {
+          <div className={styles.infoBox}>
+            <span className={styles.inputText}>请输入关键字</span>
+            <input id="amapInput" className={styles.input} type="text" />
+          </div>
+          }
+        </div>
+      </>
+    )
+  }
+}
+
+// f0d1d4f82432504003ebf46e5e36ff03
+
+export default Amap

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

@@ -9,6 +9,7 @@ import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
+import Amap from './amap'
 import BudildingProjectType from './buildingProjectType'
 
 const { Option } = Select
@@ -79,6 +80,7 @@ function AddBuilding(props) {
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
@@ -123,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>
@@ -176,7 +178,7 @@ function AddBuilding(props) {
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" hasFeedback>
-            {(<Input />)}
+            {getFieldDecorator('coordinate')(<Amap />)}
           </Form.Item>
           <Form.Item label="周边交通" hasFeedback>
             {getFieldDecorator('buildingTransport')(

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

@@ -51,35 +51,33 @@ class TypeForm extends React.Component {
 
     return (
       <>
-        <div>
-          <Row>
-            <Col span={8}>{ this.props.type.buildingTypeName || ''}</Col>
-            <Col span={1}>
-              <Button type="link" icon="close" onClick={() => this.close()} />
-            </Col>
-          </Row>
-          <Row>
-            <Col span={12}>
-              <Form {...formItemLayout}>
-                <Form.Item label="类型编号" style={{ display: 'none' }}>
-                  {getFieldDecorator('buildingTypeId')(<Input disabled />)}
-                </Form.Item>
-                <Form.Item label="状态" style={{ display: 'none' }}>
-                  {getFieldDecorator('status')(<Input disabled />)}
-                </Form.Item>
-                <Form.Item label="价格">
-                  {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')}/>)}
-                </Form.Item>
-                <Form.Item label="装修标准">
-                  {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')}/>)}
-                </Form.Item>
-                <Form.Item label="产权年限">
-                  {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')}/>)}
-                </Form.Item>
-              </Form>
-            </Col>
-          </Row>
-        </div>
+        <Col span={11} style={{
+          position: 'relative',
+          border: '1px solid #eee',
+          borderRadius: '4px',
+          marginTop:'16px'
+        }}>
+
+          <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
+
+          <Form {...formItemLayout} style={{ padding: '10px 0px 10px 10px' }}>
+            <Form.Item label="类型编号" style={{ display: 'none' }}>
+              {getFieldDecorator('buildingTypeId')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="状态" style={{ display: 'none' }}>
+              {getFieldDecorator('status')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="价格">
+              {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')} />)}
+            </Form.Item>
+            <Form.Item label="装修标准">
+              {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
+            </Form.Item>
+            <Form.Item label="产权年限">
+              {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')} />)}
+            </Form.Item>
+          </Form>
+        </Col>
       </>
     )
   }
@@ -119,10 +117,7 @@ class ProjectTypeBody extends React.Component {
   }
 
   onSuccess = (values, item) => {
-    console.log('values: ', values)
-    console.log('data: ', this.state.data, 'item: ', item)
     const newData = this.getNewProjectType(values)
-    console.log('newData: ', newData)
     this.setState({ data: newData })
     if (typeof this.props.onChange === 'function') {
       this.props.onChange(newData)
@@ -130,22 +125,20 @@ class ProjectTypeBody extends React.Component {
   }
 
   onCheckboxChange = checkedValues => {
-      const checked = (`${checkedValues}` || '').split(',')
-      const { projectType } = this.state
-      const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+    // console.log('checkedValues: ', checkedValues)
+    const checked = (`${checkedValues}` || '').split(',')
+    const { projectType } = this.state
+    const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-      // 这里会把值替换掉
-
-      const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
-      const updateProjectDate = this.updateProjectType(checkedValues)
-      console.log('updateProjectDate: ', updateProjectDate)
-      this.setState({ data: updateProjectDate })
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+    const updateProjectDate = this.updateProjectType(tempDate)
+    console.log('updateProjectDate: ', updateProjectDate)
+    this.setState({ data: updateProjectDate })
   }
 
   onClose = e => {
     const { data } = this.state
     const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
-    console.log('buildingType: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
   }
@@ -153,7 +146,6 @@ class ProjectTypeBody extends React.Component {
   getNewProjectType = values => {
     const data = []
     this.state.data.map(item => {
-      console.log('item: ', item)
       if (item.buildingTypeId === values.buildingTypeId) {
         data.push(values)
       } else {
@@ -165,18 +157,22 @@ class ProjectTypeBody extends React.Component {
   }
 
   updateProjectType = values => {
-    const data = []
-    this.state.data.map(item => {
-      values.map(va => {
-        if (item.buildingTypeId === va.buildingTypeId) {
-          data.push(va)
-        } else {
-          data.push(item)
-        }
-      })
-    })
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
 
-    return data
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
   }
 
   getList = params => {
@@ -196,11 +192,7 @@ class ProjectTypeBody extends React.Component {
       tempData = value
       tempCheckboxValue = tempData.map(item => item.buildingTypeId)
       this.setState({ defaultCheckboxValue: tempCheckboxValue })
-      this.setState({ data: tempData }, () => {
-        console.log("state: ", this.state.data)
-      })
-
-      console.log("tempData: ", tempData, "tempCheckboxValue: ", tempCheckboxValue, "value: ", value)
+      this.setState({ data: tempData })
     }
   }
 
@@ -228,18 +220,7 @@ class ProjectTypeBody extends React.Component {
     this.getList({ pageNum: 1, pageSize: 999 })
   }
 
-  render () {
-
-    // let tempData = []
-    // let tempCheckboxValue = []
-    // const { value } = this.props
-    // if (value !== undefined && value !== null) {
-    //   tempData = value
-    // } else {
-    //   tempData = this.state.data
-    // }
-
-    // tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+  render() {
     return (
       <>
         <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />
@@ -251,9 +232,11 @@ class ProjectTypeBody extends React.Component {
         >
           <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
         </Modal>
-        {
-          this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
-        }
+        <Row type="flex" justify="space-between">
+          {
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+          }
+        </Row>
       </>
     )
   }

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

@@ -61,6 +61,15 @@ function imageSet(props) {
     })
   }
 
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
   /**
    *打开编辑页
    *
@@ -138,7 +147,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={1} onSuccess={getList}/>
+      <ModalImage visibleData={visibleData} key={1} onSuccess={() => onModalChange()}/>
     </>
   )
 }

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

@@ -5,6 +5,7 @@ import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 
 
@@ -61,8 +62,8 @@ class ModalImage extends React.Component {
   // }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
       this.getById()
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -91,7 +92,7 @@ class ModalImage extends React.Component {
 
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
-      res.img = res.buildingImgList[0].url
+      res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)
     }).catch(err => {
      this.openNotificationWithIcon('error', err)
@@ -118,7 +119,7 @@ class ModalImage extends React.Component {
 
   submitData(data) {
     // TODO 这里应该是要支持多图，但是封装的控件没有
-    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 1 }]
+    data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
     data.buildingId = this.props.visibleData.buildingId;
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
 
@@ -131,7 +132,7 @@ class ModalImage extends React.Component {
       // onSuccess() 是自定义
       this.props.onSuccess()
 
-      this.handleCancel()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('error', err)
@@ -186,7 +187,7 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="图片">
               {getFieldDecorator('img')(
-                <ImageUpload />,
+                <ImageListUpload />,
               )}
               </Form.Item>
               <Form.Item label="面积">

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

@@ -0,0 +1,147 @@
+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 moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+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;
+
+const Poster = props => {
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  const [building, setBuilding] = useState({})
+  const { buildingId } = props.building
+
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        url: '/api/admin/poster',
+        method: 'GET',
+        params: { targetId: buildingId, targetType: 'building' },
+      }).then(data => {
+        console.log(data, '2222')
+        if (data.length > 0) {
+          setPosterId(data[0].posterId)
+          changeImg(data[0].posterImg)
+          changeTextArea(data[0].posterDescription)
+          changeInput(data[0].posterTitle)
+        }
+      }).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) {
+        request({
+          url: `/api/admin/poster/${posterId}`,
+          method: 'PUT',
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(() => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({
+          url: '/api/admin/poster',
+          method: 'POST',
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      }
+    } else {
+      message.warn('请先保存基本信息数据')
+    }
+  }
+
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <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}>
+            {
+              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',
+            WebkitLineClamp: '1',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{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={{
+            margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+            display: '-webkit-box', lineClamp: '3', height: '76px',
+            WebkitLineClamp: '3',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{textAreaValue || '海报描述'}</p>
+          <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+          <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+        </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
+      </div>
+    </div>
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Poster

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

@@ -0,0 +1,97 @@
+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 moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import logo from '../../../../../assets/logo.png';
+import touxiang from '../../../../../assets/touxiang.jpg';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+
+const Share = props => {
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
+
+  const { buildingId } = props.building
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        url: '/api/admin/shareContent',
+        method: 'GET',
+        params: { targetId: buildingId, targetType: 'building' },
+      }).then(data => {
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }, [])
+  }
+
+  const submitShare = () => {
+    if (buildingId) {
+      if (shareContentId) {
+        request({
+          url: `/api/admin/shareContent/${shareContentId}`,
+          method: 'PUT',
+          data: { targetId: buildingId, shareContentType: 'building',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: buildingId, shareContentType: 'building',shareContentImg: imgValue,shareContentTitle: inputValue },
+        }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+       }
+     } else {
+      message.warn('请先保存基本信息数据')
+     }
+  }
+
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
+          知与行互动
+        </p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+      </div>
+    </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+      <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+    </div>
+    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Share

src/pages/building/list/add/index.jsx

@@ -12,6 +12,8 @@ import Wangedit from '../../../../components/Wangedit/Wangedit'
 import TagGroup from './components/tags'
 import Base from './components/base'
 import ImageSet from './components/imageSet'
+import Poster from './components/poster'
+import Share from './components/share'
 
 
 const { Option } = Select
@@ -29,25 +31,50 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  function tabsCallback(key) {
-    console.log(key);
+
+  const [tab, setTab] = useState('base')
+
+  function tabsCallback(e) {
+    console.log(e);
+    setTab(e.target.value)
   }
 
-  console.log(props.location)
+  // console.log(props.location)
 
   return (
-    <Tabs defaultActiveKey="1" onChange={tabsCallback}>
-      <TabPane tab="基本信息" key="1">
-        <Base building={{ buildingId: props.location.query && props.location.query.id }} />
-      </TabPane>
-      {
-        props.location.query.id &&
-        <TabPane tab="图片" key="2">
-          {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
-          <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
-        </TabPane>
-      }
-    </Tabs>
+    <>
+      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+        <Radio.Button value="base">基本信息</Radio.Button>
+        {
+          props.location.query.id &&
+          (
+            <>
+              <Radio.Button value="image">图片</Radio.Button>
+              <Radio.Button value="poster">海报图片</Radio.Button>
+              <Radio.Button value="share">分享设置</Radio.Button>
+            </>
+          )
+        }
+      </Radio.Group>
+      <div style={{ marginTop: '20px' }}>
+        { tab === 'base' && <Base building={{ buildingId: props.location.query && props.location.query.id }} /> }
+        { props.location.query.id && (tab === 'image' && <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'poster' && <Poster building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'share' && <Share building={{ buildingId: props.location.query && props.location.query.id }} />)}
+      </div>
+    </>
+    // <Tabs defaultActiveKey="1" onChange={tabsCallback}>
+    //   <TabPane tab="基本信息" key="1">
+    //     <Base building={{ buildingId: props.location.query && props.location.query.id }} />
+    //   </TabPane>
+    //   {
+    //     props.location.query.id &&
+    //     <TabPane tab="图片" key="2">
+    //       {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
+    //       <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
+    //     </TabPane>
+    //   }
+    // </Tabs>
   )
 }
 

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

@@ -0,0 +1,20 @@
+.tagLabel{
+  padding: 14px 20px 0 20px;
+  margin: 0 0 5px 0;
+  span{
+    padding: 2px 8px;
+    font-size: 10px;
+    background-color: #e1f7eb;
+    color: #3de180;
+    border-radius: 2px;
+    margin-right: 10px;
+  }
+  span:nth-child(3n+2){
+    color: #72a0d1;
+    background-color: #eaeff5;
+  }
+  span:nth-child(3n+3){
+    color: #ff5858;
+    background-color: #fff0f1;
+  }
+}

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/channel/channelList.jsx

@@ -80,7 +80,7 @@ const columns = [
     dataIndex: '',
     key: '',
     align: 'center',
-    render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toedit(record.channelId)} >编辑</a>,
+    render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>,
   },
 ];
 
@@ -93,16 +93,16 @@ function toAdd() {
     },
   });
 }
-  // 跳编辑页面
-  function toedit(channelId) {
-    // alert(channelId)
-    router.push({
-      pathname: '/channel/editChannel',
-      query: {
-        id: channelId,
-      },
-    });
-  }
+// 跳编辑页面
+function toedit(channelId) {
+  // alert(channelId)
+  router.push({
+    pathname: '/channel/editChannel',
+    query: {
+      id: channelId,
+    },
+  });
+}
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -118,11 +118,11 @@ const header = props => {
       url: '/api/admin/channel',
       method: 'GET',
       params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
       console.log(data)
       setData(data)
-  })
+    })
   }
   // value 的值
   function handleChange(value) {
@@ -133,48 +133,48 @@ const header = props => {
   function queryList() {
     getList({ pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
   }
- // 重置
- function reset() {
-  getList({ pageNum: 1, pageSize: 10 })
- }
+  // 重置
+  function reset() {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
- // 跳编辑页
- function toEdit() {
-  router.push({
-    pathname: '/integralMall/editGoods',
-    query: {
-      a: 'b',
-    },
-  });
-}
+  // 跳编辑页
+  function toEdit() {
+    router.push({
+      pathname: '/integralMall/editGoods',
+      query: {
+        a: 'b',
+      },
+    });
+  }
 
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9 })
   }
 
   return (
     <>
       <div className={channels.searchBox}>
-        <dvi>
+        <div>
           <span className={channels.selectName}>渠道名称</span>
           <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
-          <option value="">全部</option>
-              {data.channelNmae.map(Item =>
-                <Option value={ Item.channelId }> { Item.channelName } </Option>,
-              )}
-              {/* {listItems} */}
+            <option value="">全部</option>
+            {data.channelNmae.map(Item =>
+              <Option value={Item.channelId}> {Item.channelName} </Option>,
+            )}
+            {/* {listItems} */}
           </Select>
-        </dvi>
+        </div>
         <div >
-        <Button type="primary" onClick={() => queryList() }>查询</Button>
-        {/* <Button onClick={() => reset() }>重置</Button> */}
+          <Button type="primary" onClick={() => queryList()}>查询</Button>
+          {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
       <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
-  </>
+    </>
   )
 }
 

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/RoleList.jsx

@@ -25,15 +25,12 @@ const header = props => {
 function addRole(roleId) {
   router.push({
     pathname: '/staff/list/addRole',
-    query: {
-      id: roleId,
-    },
   });
 }
 
 function toEditRole(roleId) {
   router.push({
-    pathname: '/staff/list/editRole',
+    pathname: '/staff/list/addRole',
     query: {
       id: roleId,
     },
@@ -104,7 +101,7 @@ const columns = [
       <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
-      <span style={{ color: '#FF925C' }} onClick={toEditRole}>编辑
+      <span style={{ color: '#FF925C' }} onClick={() => toEditRole(record.roleId)} >编辑
       <Icon type="form" className={styles.edit} />
       </span>
     </>,

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) => () => {
   });
 }
 
+
 /**
  *卡片
  *
@@ -29,19 +31,35 @@ const toEditStaff = (userId) => () => {
  */
 const CartBody = (props) => {
   const { data } = props
+
+  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()
+          })
+        }
+      });
+    }
     
-  const confirm = () => {
-    Modal.confirm({
-      title: '确认停用该角色？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk () {
-        console.log('OK');
-      },
-      onCancel () {
-        console.log('Cancel');
-      },
-    });
   }
   return (
 
@@ -49,14 +67,18 @@ const CartBody = (props) => {
       <div>
 
         <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff(data.userId)}>
+        <Button type="link" style={{ marginLeft: '10px', color: '#FF925C', fontSize: '18px' }} onClick={toEditStaff(data.userId)}>
           编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
-        <span className={Styles.ediText} style={{ marginLeft: '50px' }} onClick={confirm}>
-          停用
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
+                <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(data)}>
+          {data.status === 1 ? '停用' : '启用'}
+                <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </Button>
+        {/* <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> */}
 
       </div>
       <div>
@@ -69,14 +91,11 @@ const CartBody = (props) => {
           }
         </span>
 
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>姓名:{data.userName}</span>
-
-          <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
-
+        <p className={Styles.cardText} >姓名 : {data.userName}
         </p>
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>电话:{data.phone}</span>
+        <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p>
+        <p className={Styles.phoneText} >
+          电话 : {data.phone}
         </p>
       </div>
 
@@ -84,21 +103,16 @@ const CartBody = (props) => {
   )
 }
 
-
 const header = (props) => {
-  const [tempData,setTempData] = useState([])
+  const [tempData, setTempData] = useState([])
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   const getList = (params) => {
-    request({
-      url: '/api/admin/taUser',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
-        console.log(data,"listData")
-        setTempData(data.records)
+    request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
+      console.log(data, "listData")
+      setTempData(data.records)
     })
   }
 
@@ -108,15 +122,15 @@ const header = (props) => {
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-      getList({ pageNum: 1, pageSize: 10, ...values })
-    }
-  });
-}
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -156,13 +170,12 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditStaff()}>新增</Button>
-
+      <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
           tempData.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} />
+              <CartBody data={item} onFresh={()=> getList({ pageNum: 1, pageSize: 10 })}/>
             </Col>
           ))
         }

src/pages/staff/list/addRole.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Input, Card } from 'antd';
+import { Checkbox, Input, Card, Form, Button,Row,Col } from 'antd';
 import { connect } from 'dva';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import request from '../../../utils/request';
 import channels from './channelList.less';
-import { resolve } from 'path';
+import { resolve, join } from 'path';
+import router from 'umi/router';
 
 const { TextArea } = Input;
 
@@ -15,174 +16,247 @@ const { TextArea } = Input;
  * @param {*} props
  * @returns
  */
-const add = props => {
-  const Poster = propses => {
-    console.log('props,props', props.user.currentUser)
-    const userMenus = props.user.currentUser.menus;
-    const userBtns = props.user.currentUser.buttons;
-    const [data, setData] = useState({ data: [] })
-   // 获取当前所有菜单
-    useEffect(() => {
-      localStorage.removeItem('value');
-      menuList({ pageNum: 1, pageSize: 100 })
-    }, [])
-  
-    function menuList(params) {
-      request({
-        url: '/api/admin/menuList',
-        method: 'GET',
-        params: { ...params },
-    // eslint-disable-next-line no-shadow
+const Poster = props => {
+  console.log('props,props', props.user.currentUser)
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+
+  // 获取当前所有菜单
+  const [data, setData] = useState({ data: [] })
+  const [buutonDate, setBuutonDate] = useState({})
+
+  // 展示要显示的菜单和按钮----（编辑）
+  const [dataMenuId, setDataMenuId] = useState([])
+  const [dataButtonId, setDataButtonId] = useState([])
+
+  useEffect(() => {
+    // 新增和编辑用一个页面，判断新增是否为0和null
+    if (props.location.query) {
+      const { id } = props.location.query
+      if (id) {
+        buttonAndMenuList('', id)
+      }
+    }
+    // menuList({ pageNum: 1, pageSize: 100 })
+    buttonList({ pageNum: 1, pageSize: 100 })
+  }, [])
+  // 当前所有的菜单
+  function menuList(params) {
+    request({
+      url: '/api/admin/menuList',
+      method: 'GET',
+      params: { ...params },
+      // eslint-disable-next-line no-shadow
     }).then(data => {
-        console.log(data)
-        setData(data)
+      setData(data)
     })
-    }
+  }
+  // 所有按钮
+  function buttonList(params) {
+    request({
+      url: '/api/admin/buttonList',
+      method: 'GET',
+      params: { ...params },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log(data)
+      setBuutonDate(data)
+    })
+  }
 
+  // 根据角色id查询当前的菜单及其按钮
+  function buttonAndMenuList(params, id) {
+    console.log('id: ', id)
+    request({
+      url: `/api/admin/taRole/details/${id}`,
+      method: 'GET',
+      params: { ...params },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log('data.roleName: ', data)
+      props.form.setFieldsValue({ roleName: data.roleName })
+      console.log(data)
+      setData(data)
 
-    // const [menus, setMenus] = useState([]);
-// 判断menus是否有值
-    const [menus, setMenus] = useState([]);
+      // 获取所有的权限Id
+      setDataMenuId(data.sysMenuList.map(item => item.menuId))
+      setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
+    })
+  }
+  // 添加角色
+  function addRole(params) {
+    request({
+      url: '/api/admin/taRole/',
+      method: 'GET',
+      params: { ...params },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log(data)
+      setData(data)
+    })
+  }
 
 
-    const addMenus = m => {
-      const newMenus = [...menus, m]
-      setMenus([...menus, m])
-    };
-    const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
-    const handleMenuChange = m => e => {
-      console.log('e', m)
-      if (e.target.checked) {
-        // setMenusData(m)
-        addMenus(m)
-      } else {
-        delMenus(m)
-      }
-      console.log('menus1111', menus)
+  // const [menus, setMenus] = useState([]);
+  // 判断menus是否有值
+  const [menus, setMenus] = useState([]);
+  const addMenus = m => {
+    const newMenus = [...menus, m]
+    setMenus([...menus, m])
+  };
+  const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+  const handleMenuChange = m => e => {
+    if (e.target.checked) {
+      setDataMenuId(dataMenuId.concat(m.menuId))
+      addMenus(m)
+    } else {
+      setDataMenuId([m.menuId])
+      delMenus(m)
     }
+    console.log('dataMenuId', dataMenuId)
+    console.log('menus', menus)
+  }
 
-    const [but, setBut] = useState([]);
-    // 判断menus是否有值
-        const addBut = m => setBut([...but, m]);
-        const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
-        const handleButChange = m => e => {
-          console.log('e', m)
-          if (e.target.checked) {
-            addBut(m)
-          } else {
-            delBut(m)
-          }
-          // console.log('menus', menus)
-
-          console.log('menus', menus)
-          console.log('but', but)
-        }
-
-    const dataSource = [
-      {
-        name: '员工管理',
-        per: [
-          '111111',
-          '22222',
-          '33333',
-        ],
-      },
-      {
-        name: '角色管理',
-        per: [
-          '444',
-          '555',
-          '666',
-        ],
-      },
-    ];
-
-
-    const gridStyle1 = {
-      width: '20%',
-      textAlign: 'left',
-    };
-    const gridStyle2 = {
-      width: '80%',
-      textAlign: 'left',
-      height: '69px',
-    };
-
-    return (
-    <>
-      <div >
-        {/* { console.log('userMenus', userMenus) }
-        { console.log('userBtns', userBtns) } */}
-        {userMenus.map(item => (
-          (item.parentCode === '-1') &&
-          <Card title={<Checkbox onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center' }} >
-              {
-                   userMenus.map(menu => (
-
-                    (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
-                    <>
-                      <Card.Grid style={gridStyle1} >
-                          <Checkbox onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
-                      </Card.Grid>
-                      <Card.Grid style={gridStyle2}>
-                        {userBtns.map(btn => (
-                          <>
-                            {
-                              btn.menuId === menu.menuId &&
-                              <Checkbox onChange={handleButChange(btn)}>{btn.name}</Checkbox>
-                            }
-                          </>
-                        ))}
-                      </Card.Grid>
-                   </>
-                   ))
-              }
-          </Card>
-        ))}
-      </div>
-    </>
-    )
+  const [but, setBut] = useState([]);
+  // 判断menus是否有值
+  const addBut = m => setBut([...but, m]);
+  const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+  const handleButChange = m => e => {
+    console.log('e', m)
+    if (e.target.checked) {
+      addBut(m)
+    } else {
+      delBut(m)
+    }
   }
-  
-  const fields = [
-    {
-      label: '角色名称',
-      name: 'roleName',
-      type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
-    },
-    {
-      label: '简介',
-      name: 'roleIntroduction',
-      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
-
-    },
-
-    {
-      label: '菜单权限',
-      name: 'rolePermission',
-      render:
-        <>
-          <div>
-            <Poster/>
-          </div>
-        </>,
-    },
-
-  ]
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
+  const gridStyle1 = {
+    width: '17%',
+    textAlign: 'left',
+  };
+  const gridStyle2 = {
+    width: '80%',
+    textAlign: 'left',
+    height: '72px',
+  };
+  // 添加菜单
+  function addMenuList() {
     request({
-      url: '/api/admin/menuList',
-      method: 'POST',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
+      url: '/api/admin/updateAuthMenu',
+      method: 'PUT',
+      data: { sysMenu: menus },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
       console.log(data)
-  })
+    })
   }
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+
+  // 添加按钮
+  function addButt() {
+    request({
+      url: '/api/admin/updateAuthMenu',
+      method: 'PUT',
+      data: { sysMenu: but },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log(data)
+    })
+  }
+
+  // 添加按钮
+  function editAndAddRole() {
+    request({
+      url: '/admin/editAndAddRole/{id}',
+      method: 'PUT',
+      data: { sysMenu: but },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log(data)
+    })
+  }
+
+  function toRoleList(roleId) {
+    router.push({
+      pathname: '/staff/RoleList',
+    });
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log('values', values)
+      // 保存菜单
+      // addMenuList()
+      // setm
+      const sumitMenu = [...data.sysMenuList, ...menus]
+      request({
+        url: '/api/admin/updateAuthMenu',
+        method: 'POST',
+        data: { sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id },
+        // eslint-disable-next-line no-shadow
+      }).then(data => {
+        toRoleList()
+      })
+    });
+  }
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <div >
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="角色名称">
+            {getFieldDecorator('roleName', {
+              rules: [{ required: true, message: '请输入渠道名称' }],
+            })(<Input className={channels.inpuit} />)}
+
+          </Form.Item>
+          {userMenus.map(item => (
+            (item.parentCode === '-1') &&
+            <Row >
+              <Col span={7}>
+
+              </Col>
+              <Col span={17}>
+
+
+                <Card title={<Checkbox checked={dataMenuId.includes(item.menuId)} onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center' }} >
+                  {
+                    userMenus.map(menu => (
+
+                      (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                      <>
+                        <Card.Grid style={gridStyle1} >
+                          <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                        </Card.Grid>
+                        <Card.Grid style={gridStyle2}>
+                          {buutonDate.length > 0 && buutonDate.map(btn => (
+                            <>
+                              {
+                                btn.menuId === menu.menuId &&
+                                <Checkbox checked={dataButtonId.includes(btn.btnId)} onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                              }
+                            </>
+                          ))}
+                        </Card.Grid>
+                      </>
+                    ))
+                  }
+                </Card>
+              </Col>
+
+            </Row>
+          ))}
+          <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button className={channels.formButton} htmlType="submit">
+              取消
+          </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    </>
+  )
 }
-export default connect(({ user }) => ({ user }))(add);
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/list/editRole.jsx

@@ -179,7 +179,7 @@ const Edit = props => {
       render:
         <>
           <div>
-            <Poster value="111111" />
+            <Poster/>
           </div>
         </>,
     },

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/staff/list/style.less

@@ -11,33 +11,37 @@
   border: 1px solid #dbdbdb;
 }
 
-.addButton {
-  // background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
 
 .card {
-  width: 348px;
+  min-width: 330px;
+  margin-right: 2vw;
   height: 244px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   margin-bottom: 40px;
-
+  position: relative;
 }
 
-.cardText {
 
-  height: 28px;
+.cardText {
   font-size: 20px;
-  font-weight: 400;
   color: rgba(102, 102, 102, 1);
-  line-height: 28px;
-  margin-top: 10px;
-  margin-bottom: 0;
-
+  position: absolute;
+  bottom:52px;
+}
+.statusText {
+  font-size: 20px;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:52px;
+  right: 20px;
+}
+.phoneText{
+  font-size: 20px;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:16px;
 }
 
 .cardItem {
@@ -49,26 +53,15 @@
   align-items: center;
 }
 
-.ediText {
-  width: 36px;
-  height: 25px;
-  font-size: 18px;
-
-  font-weight: 400;
-  color: rgba(255, 146, 92, 1);
-  line-height: 25px;
-
-}
 
 .cardTag {
-  height: 18px;
   font-size: 10px;
-  // background: #fdce22;
   border-radius: 4px;
   color: #ffffff;
-  line-height: 14px;
+  line-height: 16px;
   margin-top: 10px;
   padding: 1px 3px;
+
 }
 
 .title {
@@ -76,13 +69,12 @@
   width: 84px;
   justify-content: space-between;
   text-align: justify;
-  text-align-last: justify
+  text-align-last: justify;
 }
 
 
 .roletext {
   font-size: 20px;
-
   font-weight: 400;
   color: rgba(51, 51, 51, 1);
   line-height: 28px;

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("保存成功")
     })
   }
@@ -66,8 +59,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         <BuildSelect onChange={changBuilding}/>
       </Col>
     </Row>
-    <Row>
-      <Col span={3} offset={3}>
+    <Row style={{margin:'10px 0'}}>
+      <Col span={5} offset={2}>
         用户操作
       </Col>
       <Col span={3} offset={3}>
@@ -76,7 +69,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     </Row>
     {data.map((x) => {
       return <Row>
-                <Col span={3} offset={3}>
+                <Col span={5} offset={2}>
                   <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
                 </Col>
                 <Col span={3} offset={3}>

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

@@ -164,6 +164,201 @@ export default {
       method:'get',
       url: `${prefix}/selectCityUser`
     },
+
+  },
+  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:{