Merge remote-tracking branch 'origin/master_dev'

@@ -10,6 +10,7 @@
     "build": "node build/build.js"
     "build": "node build/build.js"
   },
   },
   "dependencies": {
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@xkeshi/vue-barcode": "^1.0.0",
     "@xkeshi/vue-barcode": "^1.0.0",
     "axios": "^0.19.0",
     "axios": "^0.19.0",
     "common": "^0.2.5",
     "common": "^0.2.5",

@@ -19,10 +19,7 @@ import Print from 'vue-print-nb'
 // 条形组件
 // 条形组件
 import VueBarcode from '@xkeshi/vue-barcode'; //导入条形码插件
 import VueBarcode from '@xkeshi/vue-barcode'; //导入条形码插件
 Vue.component('barcode', VueBarcode);
 Vue.component('barcode', VueBarcode);
-import BaiduMap from 'vue-baidu-map'
-Vue.use(BaiduMap, {
-    ak: 'PV0SfW0yRxe4NHUQ8OhyO4DrDbiwX4Sd'
-})
+
 
 
 //定义一个全局过滤器实现日期格式化
 //定义一个全局过滤器实现日期格式化
 Vue.filter('datefmt',function(input,fmtstring){
 Vue.filter('datefmt',function(input,fmtstring){