项目，客户 查询修复

.gitignore

@@ -38,3 +38,5 @@ screenshot
 .eslintcache
 
 build
+
+config/proxy.js

config/routes.js

@@ -0,0 +1,348 @@
+export default [
+  {
+    path: '/user',
+    component: '../layouts/UserLayout',
+    routes: [
+      {
+        name: 'login',
+        path: '/user/login',
+        component: './user/login',
+      },
+    ],
+  },
+  {
+    path: '/',
+    component: '../layouts/SecurityLayout',
+    routes: [
+      {
+        path: '/',
+        component: '../layouts/BasicLayout',
+        authority: ['admin', 'user'],
+        routes: [
+          {
+            path: '/',
+            redirect: '/welcome',
+          },
+          {
+            path: '/welcome',
+            name: '首页',
+            component: './Welcome',
+          },
+          {
+            path: '/building',
+            name: '项目管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/building/list',
+                name: '项目列表',
+                component: './building/list/index',
+              },
+              {
+                path: '/building/list/add',
+                name: '项目添加', // 项目添加
+                hideInMenu: true,
+                component: './building/list/add/index',
+              },
+              {
+                path: '/building/type',
+                name: '项目类型',
+                component: './building/type/index',
+              },
+              {
+                path: '/building/type/edi',
+                name: '项目类型编辑',
+                hideInMenu: true,
+                component: './building/type/edi',
+              },
+            ],
+          },
+          {
+            path: '/customer',
+            name: '客户管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/customer/customerlist/list',
+                name: '客户列表',
+                component: './customer/customerlist/index',
+              },
+              {
+                path: '/customer/customerlist/customerDetail',
+                name: '客户编辑',
+                hideInMenu: true,
+                component: './customer/customerlist/customerDetail',
+              },
+              {
+                path: '/customer/drift/list',
+                name: '游客列表',
+                component: './customer/drift/index',
+              },
+              {
+                path: '/customer/report/list',
+                name: '报备客户',
+                component: './customer/report/index',
+              },
+              {
+                path: '/customer/recommendCustomer/list',
+                name: '推荐客户',
+                component: './customer/recommendCustomer/index',
+              },
+              {
+                path: '/customer/recommendCustomer/audit',
+                name: '客户审核', 
+                hideInMenu: true,
+                component: './customer/recommendCustomer/audit',
+              },
+              {
+                path: '/customer/independentList',
+                name: '经纪人',
+                component: './customer/independentList/index',
+              },
+            ],
+          },
+          {
+            path: '/integralMall',
+            name: '积分商城',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/integralMall/GoodsList',
+                name: '商品列表',
+                component: './integralMall/GoodsList',
+              },
+              {
+                path: '/integralMall/achieve',
+                name: '积分获取',
+                component: './integralMall/achieve',
+              },
+              {
+                path: '/integralMall/editGoods',
+                name: '商品编辑',
+                hideInMenu: true,
+                component: './integralMall/editGoods',
+              },
+              {
+                path: '/integralMall/exchangeRecords',
+                name: '兑换记录',
+                component: './integralMall/exchangeRecords',
+              },
+              {
+                path: '/integralMall/writeOff',
+                name: '商品核销',
+                component: './integralMall/writeOff',
+              },
+              {
+                path: '/integralMall/verifyList',
+                name: '商品核销列表',
+                hideInMenu: true,
+                component: './integralMall/verifyList',
+              },
+            ],
+          },
+          {
+            path: '/channel',
+            name: '渠道管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/channel/channelList',
+                name: '渠道管理',
+                component: './channel/channelList',
+              },
+              {
+                path: '/channel/addChannel',
+                name: '添加渠道',
+                hideInMenu: true,
+                component: './channel/addChannel',
+              },
+              {
+                path: '/channel/editChannel',
+                name: '编辑渠道',
+                hideInMenu: true,
+                component: './channel/editChannel',
+              },
+              {
+                path: '/channel/brokerList',
+                name: '经纪人',
+                component: './channel/brokerList',
+              },
+              {
+                path: '/channel/recommendClients',
+                name: '渠道推荐',
+                hideInMenu: true,
+                component: './channel/recommendClients',
+              },
+              {
+                path: '/channel/InviteClients',
+                name: '邀请客户',
+                hideInMenu: true,
+                component: './channel/InviteClients',
+              },
+            ],
+          },
+          {
+            path: '/news',
+            name: '资讯管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/news/type/NewsType',
+                name: '资讯类型',
+                component: './news/type/NewsType',
+              },
+              {
+                path: '/news/type/editNews',
+                name: '编辑资讯类型',
+                hideInMenu: true,
+                component: './news/type/editNews',
+              },
+              {
+                path: '/news/list/NewsList',
+                name: '资讯列表',
+                component: './news/list/NewsList',
+              },
+              {
+                path: '/news/list/editNewsList',
+                name: '编辑资讯',
+                hideInMenu: true,
+                component: './news/list/editNewsList',
+              },
+            ],
+          },
+          {
+            path: '/activity',
+            name: '活动管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/activity/ActivityList',
+                name: '活动列表',
+                component: './activity/ActivityList',
+              },
+              {
+                path: '/activity/editActivity',
+                name: '编辑活动',
+                hideInMenu: true,
+                component: './activity/editActivity',
+              },
+              {
+                path: '/activity/SignList',
+                name: '报名列表',
+                hideInMenu: true,
+                component: './activity/SignList',
+              },
+            ],
+          },
+          {
+            path: '/staff',
+            name: '员工管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/staff/StaffList',
+                name: '员工列表',
+                component: './staff/list/StaffList',
+              },
+              {
+                path: '/staff/editStaff',
+                name: '编辑员工',
+                hideInMenu: true,
+                component: './staff/list/editStaff',
+              },
+
+              {
+                path: '/staff/RoleList',
+                name: '角色管理',
+                component: './staff/list/RoleList',
+              },
+              {
+                path: '/staff/editRole',
+                name: '编辑角色',
+                hideInMenu: true,
+                component: './staff/list/editRole',
+              },
+              {
+                path: '/staff/list/addRole',
+                name: '添加角色',
+                hideInMenu: true,
+                component: './staff/list/addRole',
+              },  
+            ],
+          },
+          {
+            path: '/carouselFigure',
+            name: '轮播图管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/carouselFigure/carouselFigureList',
+                name: '轮播图列表',
+                component: './carouselFigure/carouselFigureList',
+              },
+              {
+                path: '/carouselFigure/editCarousel',
+                name: '轮播图编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editCarousel',
+              },
+              {
+                path: '/carouselFigure/advertisingList',
+                name: '开屏广告',
+                component: './carouselFigure/advertisingList',
+              },
+              {
+                path: '/carouselFigure/editAdvertising',
+                name: '开屏广告编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editAdvertising',
+              },
+            ],
+          },
+          {
+            path: '/system',
+            name: '系统管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/system/messageList',
+                name: '客户留言',
+                component: './system/messageList',
+              },
+              {
+                path: '/system/report',
+                name: '报表数据',
+                component: './system/report',
+              },
+              {
+                path: '/system/intention',
+                name: '意向值',
+                component: './system/intention',
+              },
+              {
+                path: '/system/housingPolicy',
+                name: '购房政策维护',
+                component: './system/housingPolicy',
+              },
+              {
+                path: '/system/editPolicy',
+                name: '购房政策编辑',
+                hideInMenu: true,
+                component: './system/editPolicy',
+              },
+            ],
+          },
+          {
+            component: './404',
+          },
+        ],
+      },
+      {
+        component: './404',
+      },
+    ],
+  },
+  {
+    component: './404',
+  },
+];

src/app.js

@@ -1,20 +1,20 @@
-// (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';
-//       }
-//     };
+(function (doc, win) {
+  var docEl = doc.documentElement,
+    resizeEvt = 'onorientationchange' in window ? 'onorientationchange' : 'resize',
+    recalc = function () {
+      var clientWidth = docEl.clientWidth;
+      if (!clientWidth) return;
+      if (clientWidth < 1200) {
+        docEl.style.fontSize = '100px';
+      } else {
+        docEl.style.fontSize = 100 * (clientWidth / 1200) + 'px';
+      }
+    };
 
-//   if (!doc.addEventListener) return;
-//   win.addEventListener(resizeEvt, recalc, false);
-//   doc.addEventListener('DOMContentLoaded', recalc, false);
-// })(document, window);
+  if (!doc.addEventListener) return;
+  win.addEventListener(resizeEvt, recalc, false);
+  doc.addEventListener('DOMContentLoaded', recalc, false);
+})(document, window);
 
 export const dva = {
   config: {

src/components/EchartsTest/EChart.jsx

@@ -5,11 +5,19 @@ import echarts from 'echarts/lib/echarts';
 // 引入柱状图
 import 'echarts/lib/chart/bar';
 import 'echarts/lib/chart/pie';
+import 'echarts/lib/chart/scatter';
+import 'echarts/lib/chart/effectScatter';
+import 'echarts/lib/chart/map';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
 import 'echarts/lib/component/legend';
 import 'echarts/lib/component/title';
+import 'echarts/lib/component/geo';
+import 'echarts/lib/component/visualMap';
 
+import { ChinaData } from './china';
+
+echarts.registerMap('china', ChinaData);
 
 class EchartsTest extends Component {
     chartRef = React.createRef();
@@ -33,7 +41,7 @@ class EchartsTest extends Component {
                 ...this.props.options || {},
             }
 
-            console.log(options)
+            console.log('----options--->', options)
 
             this.chart.setOption(options);
         }

src/global.less

@@ -80,15 +80,22 @@ ol {
 .ant-menu-vertical-right .ant-menu-submenu-title,
 .ant-menu-inline .ant-menu-submenu-title,
 .ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
-  font-size: 16px;
+  font-size: 0.1rem;
+  
+}
+.ant-input{
+  height: 32px;
+  border-radius: 4px;
+  padding: 0 0 0 10px;
+  align-items: center;
 }
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
   min-width: 100px;
 }
 .ant-breadcrumb{
-  font-size: 16px;
+  font-size: 0.1rem;
   .anticon {
-    font-size: 16px;
+    font-size: 0.1rem;
   }
 } 
   .ant-pro-global-header-trigger{

src/pages/Welcome.jsx

@@ -1,7 +1,9 @@
 import React from 'react';
 import { Card, Typography, Alert, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import EchartsTest from '../components/EchartsTest'
+import EchartsTest from '../components/EchartsTest';
+import CityNums from './charts/CityNums';
+
 const option = {
   xAxis: {
     type: 'category',
@@ -15,6 +17,7 @@ const option = {
     type: 'line'
   }]
 };
+
 export default () => (
   <>
     <div style={{ display: 'flex' }}>
@@ -44,7 +47,7 @@ export default () => (
       </div>
     </div>
     <EchartsTest style={{width: 500, height:500}}></EchartsTest>
-
+    <CityNums></CityNums>
   </>
 );
 

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

@@ -1,401 +0,0 @@
-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

@@ -13,7 +13,7 @@ html {
    overflow:auto;
    border-radius:0.4rem;
    border:1px solid #ced4da;
-   margin-bottom:1rem;
+   margin-bottom:0.1rem;
 }
 body {
   margin: 0;
@@ -44,7 +44,7 @@ label {
 
 label, .btn {
   margin-left: 0;
-  font-size: 1rem;
+  font-size: 0.18rem;
 }
 
 button, input, select {
@@ -75,312 +75,313 @@ h4 {
   line-height: 1.8;
   font-weight: 300;
   color: inherit;
-  font-size: 1.1rem;
+  font-size: 0.2rem;
   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;
-}
+// .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;
+  padding: .2rem 0.2rem;
   position: absolute;
-  top: 1rem;
+  top: 0.3rem;
+  left: 0.3rem;
   background-color: white;
-  width: auto;
-  min-width: 22rem;
-  left: 1rem;
+  width: 3.2rem;
   box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
   z-index: 100;
   .inputText{
     margin-right: 10px;
   }
   .input{
-    width: 200px;
+    width: 1.6rem;
+    height: 0.34rem;
+    font-size: 0.16rem;
   }
  
 }
 
-.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;
-}
+// .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) {

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

@@ -1,401 +0,0 @@
-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/index.jsx

@@ -138,7 +138,7 @@ function CartBody(props) {
         <span className={Styles.title}>录入时间</span>
         <span >：{data.createDate}</span>
       </p>
-      <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
+      <p style={{ margin: '15px 0', position: 'relative', fontSize: '1.1remrem' }}>
         <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
           {/* 已发布的时候，需要显示取消发布的字样 */}
           {data.status === 1 ? '取消发布' : '发布'}

src/pages/building/list/style.css

@@ -1,53 +0,0 @@
-.SubmitButton {
-  background: #3a91d5;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size: 18px;
-  color: #333;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-.cardItem {
-  font-size: 18px;
-  font-weight: 400;
-  color: #666;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-}
-.ediText {
-  font-size: 18px;
-  color: #ff925c;
-  line-height: 24px;
-  position: absolute;
-  right: 0;
-}
-.title {
-  display: inline-block;
-  width: 84px;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last: justify;
-}
-.address {
-  width: 400px;
-  height: 24px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}

src/pages/building/list/style.less

@@ -15,7 +15,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size: 1.1rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
 
 }
 .cardItem{
-  font-size: 18px;
+  font-size: 1.1rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;  
 }
 .ediText {
-  font-size: 18px;
+  font-size: 1.1rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;

src/pages/building/list/style.wxss

@@ -1,53 +0,0 @@
-.SubmitButton {
-  background: #3a91d5;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size: 18px;
-  color: #333;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-.cardItem {
-  font-size: 18px;
-  font-weight: 400;
-  color: #666;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-}
-.ediText {
-  font-size: 18px;
-  color: #ff925c;
-  line-height: 24px;
-  position: absolute;
-  right: 0;
-}
-.title {
-  display: inline-block;
-  width: 84px;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last: justify;
-}
-.address {
-  width: 400px;
-  height: 24px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}

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/charts/CityNums.jsx

@@ -0,0 +1,137 @@
+import React, { useState, useEffect } from 'react';
+import Echart from '../../components/EchartsTest/EChart';
+import { fetch, apis } from '@/utils/request';
+
+const geoOptions = {
+  backgroundColor: '#fff',
+  title: {
+    text: '城市分布',
+    left: 20,
+    top: 20
+  },
+  tooltip : {
+      trigger: 'item',
+      formatter: (params) => {
+        return `${params.data.name}: ${params.data.value[2]}`
+      }
+  },
+  geo: {
+      map: 'china',
+      roam: true,
+      zoom: 1.2,
+      label: {
+        normal: {
+          show: true,
+          color: '#aaa',
+        },
+        emphasis: {
+          show: true
+        }
+      },
+      itemStyle: {
+          normal: {
+              areaColor: '#f3f3f3',
+              borderColor: '#ddd'
+          },
+          emphasis: {
+              areaColor: '#eee'
+          }
+      }
+  },
+}
+
+const getCityData = fetch(apis.indexEcharts.userCity)
+
+const mapDataRange = x => {
+  // 映射区间 [1, 100000] => [rangeStart, rangeEnd]
+  const min = 1
+  const max = 100000
+  const rangeStart = 16
+  const rangeEnd = 24
+
+  return rangeStart + (x - min) * (rangeEnd - rangeStart) / (max - min)
+}
+
+const CityNums = (props) => {
+  const [data, setData]= useState([])
+
+  useEffect(() => {
+    getCityData().then(response => {
+      const { selectCityUser = [] } = response || {}
+      const data = selectCityUser.map((item) => {
+        return {
+          name: item.name,
+          value: [item.lng - 0, item.lat - 0, item.cityCount]
+        }
+      })
+      setData(data)
+    })
+  }, [])
+
+  const options = {
+    ...geoOptions,
+    series: [
+      {
+        name: '人数',
+        type: 'scatter',
+        coordinateSystem: 'geo',
+        data,
+        symbolSize: 10,
+        label: {
+            normal: {
+                formatter: '{b}',
+                position: 'right',
+                show: false
+            },
+            emphasis: {
+                show: true
+            }
+        },
+        itemStyle: {
+            normal: {
+                color: '#DB3C4B'
+            }
+        }
+      },
+      {
+          name: '前三',
+          type: 'effectScatter',
+          coordinateSystem: 'geo',
+          data: data.sort(function (a, b) {
+              return b.value[2] - a.value[2];
+          }).slice(0, 3),
+          symbolSize: function (val) {
+              return mapDataRange(val[2]);
+          },
+          showEffectOn: 'render',
+          rippleEffect: {
+              brushType: 'stroke'
+          },
+          hoverAnimation: true,
+          label: {
+              normal: {
+                  formatter: '{b}',
+                  position: 'right',
+                  show: false
+              }
+          },
+          itemStyle: {
+              normal: {
+                  color: '#DB3C4B',
+                  shadowBlur: 10,
+                  shadowColor: '#333'
+              }
+          },
+          zlevel: 1
+      }
+    ],
+  }
+
+  return (
+    <div style={{ margin: '24px 0', width: '100%', borderRadius: '8px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+      <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
+    </div>
+  )
+}
+
+export default CityNums;

src/pages/staff/list/StaffList.jsx

@@ -73,7 +73,7 @@ const CartBody = (props) => {
         </Button>
         <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm(data)}>
           {data.status === 1 ? '停用' : '启用'}
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+                <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}>
           启用

src/pages/staff/list/style.less

@@ -28,20 +28,20 @@
   font-size: 20px;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:36px;
+  bottom:52px;
 }
 .statusText {
   font-size: 20px;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:36px;
+  bottom:52px;
   right: 20px;
 }
 .phoneText{
   font-size: 20px;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:0px;
+  bottom:16px;
 }
 
 .cardItem {

src/pages/system/intention.jsx

@@ -59,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}>
@@ -69,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/user/login/components/Login/index.less

@@ -38,11 +38,11 @@ position: relative;
 }
 .login {
   background-color: #fff;
-  width:580px;
-  height:480px;
-  padding:120px 50px;
+  width:100%;
+  height:58vh;
   border-radius:0px 30px 30px 0px;
   margin: 0 auto;
+  padding: 10vh 0;
   :global {
     .ant-tabs .ant-tabs-bar {
       margin-bottom: 24px;
@@ -52,6 +52,13 @@ position: relative;
     .ant-form-item {
       margin: 0 2px 24px;
     }
+    .ant-input-affix-wrapper,.ant-form-item-control{ 
+      width: 36vw;
+      max-width: 600px;
+      min-width: 200px;
+      margin: 0 auto;
+      display: block;
+      }
   }
 
   .getCaptcha {

src/pages/user/login/style.less

@@ -4,7 +4,7 @@
   // width: 368px;
   margin: 0 auto;
   @media screen and (max-width: @screen-sm) {
-    width: 95%;
+    width: 100%;
   }
 
   .icon {

src/services/apis.js

@@ -160,6 +160,10 @@ export default {
       method: 'GET',
       url: `${prefix}/selectUserResource`
     },
+    userCity: {
+      method:'get',
+      url: `${prefix}/selectCityUser`
+    },
 
   },
   activity: {

src/utils/request.js

@@ -33,7 +33,7 @@ const replaceURLParams = (url, params = {}) => {
 }
 
 request.interceptors.request.use((url, options) => {
-  const { urlData, headers = {}, logout = false, login = false, data, ...opts } = options
+  const { urlData, headers = {}, logout = false, login = false, action, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
   const token = mixStr(window.localStorage.getItem('test-foobar'))
 
@@ -42,6 +42,7 @@ request.interceptors.request.use((url, options) => {
   }
 
   const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
+  const actionHeader = action ? { 'X-ACTION': action  }: {}
 
   return (
     {
@@ -50,6 +51,7 @@ request.interceptors.request.use((url, options) => {
         ...opts,
         headers: {
           ...authHeader,
+          ...actionHeader,
           ...headers,
         },
         data,