Funny 3 年之前
父节点
当前提交
b79fa0e110
共有 4 个文件被更改,包括 45 次插入41 次删除
  1. 22 22
      package-lock.json
  2. 0 1
      package.json
  3. 17 12
      public/index.html
  4. 6 6
      src/components/orderComponents/orderAMap.vue

+ 22 - 22
package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "electron-vue-demo",
+  "name": "liebao-web",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -3487,13 +3487,13 @@
       }
     },
     "browserslist": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
+      "version": "4.17.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz",
+      "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001271",
-        "electron-to-chromium": "^1.3.878",
+        "caniuse-lite": "^1.0.30001274",
+        "electron-to-chromium": "^1.3.886",
         "escalade": "^3.1.1",
         "node-releases": "^2.0.1",
         "picocolors": "^1.0.0"
@@ -3940,9 +3940,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001274",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz",
-      "integrity": "sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==",
+      "version": "1.0.30001275",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001275.tgz",
+      "integrity": "sha512-ihJVvj8RX0kn9GgP43HKhb5q9s2XQn4nEQhdldEJvZhCsuiB2XOq6fAMYQZaN6FPWfsr2qU0cdL0CSbETwbJAg==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
@@ -4796,17 +4796,17 @@
       }
     },
     "core-js": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
-      "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg=="
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
+      "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg=="
     },
     "core-js-compat": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
-      "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz",
+      "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.17.5",
+        "browserslist": "^4.17.6",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -6175,9 +6175,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.886",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.886.tgz",
-      "integrity": "sha512-+vYdeBosI63VkCtNWnEVFjgNd/IZwvnsWkKyPtWAvrhA+XfByKoBJcbsMgudVU/bUcGAF9Xp3aXn96voWlc3oQ==",
+      "version": "1.3.887",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.887.tgz",
+      "integrity": "sha512-QQUumrEjFDKSVYVdaeBmFdyQGoaV+fCSMyWHvfx/u22bRHSTeBQYt6P4jMY+gFd4kgKB9nqk7RMtWkDB49OYPA==",
       "dev": true
     },
     "element-ui": {
@@ -9633,9 +9633,9 @@
       }
     },
     "mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true
     },
     "mime-db": {

+ 0 - 1
package.json

@@ -44,7 +44,6 @@
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-template-compiler": "^2.6.11"
   },
-
   "eslintConfig": {
     "root": true,
     "env": {

+ 17 - 12
public/index.html

@@ -1,14 +1,19 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>猎豹AI</title>
-    <!--设置ico图标-->
-    <link rel="shortcut icon" href="desk-logo.ico">
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <script type="text/javascript"
+    src="https://webapi.amap.com/maps?v=1.4.15&key=5ae8644771ef9abf9cfb3ea23b1df6ca"></script>
+  <title>猎豹AI</title>
+  <!--设置ico图标-->
+  <link rel="shortcut icon" href="desk-logo.ico">
+</head>
+
+<body>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>

+ 6 - 6
src/components/orderComponents/orderAMap.vue

@@ -24,7 +24,7 @@
         </div>
       </div>
     </el-form>
-    <amap @click="onMapClick" ref="map" :zoom="zoom" :center="center" style="height: 620px;" class="amap-demo">
+    <amap @click="onMapClick" ref="map" :zoom="zoom" :center="center" style="height: 700px;" class="amap-demo">
       <amap-marker v-for="(marker,index) in markers" :key="index" :offset="marker.offset" :position="marker.position" :icon="marker.icon" :label="marker.label" />
     </amap>
   </el-dialog>
@@ -78,7 +78,7 @@ export default {
         {
           id: 1,
           position: this.center,
-          icon: "/static/image/map_current.png",
+          icon: require("/static/image/map_current.png"),
         },
       ];
       this.getLocation();
@@ -112,7 +112,7 @@ export default {
       let sendM = {
         id: 1,
         position: [data.sendLng, data.sendLat],
-        icon: "/static/image/map-fa.png",
+        icon: require("/static/image/map-fa.png"),
         label: {
           content: `商家距离目的地${orderDistance}`,
           direction: "top",
@@ -122,7 +122,7 @@ export default {
       let receiptM = {
         id: 2,
         position: [data.receiptLng, data.receiptLat],
-        icon: "/static/image/map-shou.png",
+        icon: require("/static/image/map-shou.png"),
       };
 
       // 中心点
@@ -140,7 +140,7 @@ export default {
         let riderM = {
           id: 3,
           position: [mapData.shipperLng, mapData.shipperLat],
-          icon: "/static/image/map-rider.png",
+          icon: require("/static/image/map-rider.png"),
           label: {
             content:
               data.buttonStatus === 2
@@ -204,7 +204,7 @@ export default {
           {
             id: 1,
             position: [this.lng, this.lat],
-            icon: "/static/image/map_current.png",
+            icon: require("/static/image/map_current.png"),
           },
         ];
         this.getLocation();