Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents 72e22e26 db09e674
Showing 4 changed files with 33 additions and 18 deletions
admin-web-master/jest.config.js
admin-web-master/public/index.html
admin-web-master/src/components/newmap/index.vue
admin-web-master/src/utils/request.js
@@ -10,7 +10,7 @@ module.exports = {
     '^@/(.*)$': '<rootDir>/src/$1'
   },
   snapshotSerializers: ['jest-serializer-vue'],
-  testMatch: [
+  testMatch: [ 
     '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
   ],
   collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
@@ -8,10 +8,10 @@
     <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
 	<title>招商服务系统</title>
     <!-- 删除: <script src="https://map.qq.com/api/js?v=2.exp&key=YOUR_API_KEY&callback=initMap"></script> -->
-    <script src="https://map.qq.com/api/js?v=2.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
-    <script src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
-    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
-    <!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script> -->
+    <script src="https://map.qq.com/api/js?v=2.exp&key=7K5BZ-5MUCL-5Z4PX-ML3QG-YAGZE-TNBLG"></script>
+    <script src="https://map.qq.com/api/gljs?v=1.exp&key=7K5BZ-5MUCL-5Z4PX-ML3QG-YAGZE-TNBLG"></script>
+    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=7K5BZ-5MUCL-5Z4PX-ML3QG-YAGZE-TNBLG"></script>
+    <!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=7K5BZ-5MUCL-5Z4PX-ML3QG-YAGZE-TNBLG&libraries=geometry"></script> -->
   </head>
   <body>
     <noscript>
@@ -3,7 +3,10 @@
     <div id="mapContainer" class="map"></div>
     <div class="search-box">
       <input v-model="searchQuery" placeholder="输入地址进行搜索" />
-      <button type="button" @click="searchLocation">搜索</button>
+      <div style="box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);display: flex;align-items: center;background: #fff;padding: 0 20px;border-radius: 5px;overflow: hidden;margin-left: 10px;">
+        <i class="el-icon-delete" style="margin-right: 10px;color: #3F9B6A;"></i>
+        <button type="button" @click="searchLocation">清除</button>
+      </div>
     </div>
     <div v-if="searchResults.length > 0" class="search-results">
       <ul>
@@ -109,7 +112,7 @@
         this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
           center: centerLatLng,
           zoom: 13,
-          styles: 'dark' 
+          mapStyleId: 'style1'
         });
         // 创建标记
@@ -203,29 +206,41 @@
     top: 10px;
     left: 10px;
     z-index: 99;
-    background: #fff;
-    padding: 10px;
-    border-radius: 5px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-    width: 280px;
+    /* background: #fff; */
+    /* padding: 10px; */
+    /* border-radius: 5px; */
+    /* box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); */
+    /* width: 280px; */
+    display: flex;
+    justify-content: space-between;
   }
   .search-box input {
-    padding: 5px;
+    /* padding: 5px; */
+    padding: 15px 8px;
     margin-right: 5px;
+    font-size: 10px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #eee;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
   }
   .search-box button {
-    padding: 5px 10px;
-    background-color: #007bff;
-    color: #fff;
+    padding: 15px 0;
+    background-color: #fff;
+    /* color: #fff; */
     border: none;
     border-radius: 3px;
     cursor: pointer;
+    height: 100%;
+    box-sizing: border-box;
+    font-size: 10px;
+    color: -internal-light-dark(black, white);
   }
   .search-box button:hover {
-    background-color: #0056b3;
+    background-color: #fff;
   }
   .search-results {
@@ -17,7 +17,7 @@ let baseURL =  &#39;&#39;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;