%!s(int64=3) %!d(string=hai) anos · bed3bdb68e
--- a/index.html
+++ b/index.html
@@ -3,7 +3,11 @@
 
				   <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				+<<<<<<< HEAD
			
 
				     <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=5ae8644771ef9abf9cfb3ea23b1df6ca"></script>
			
 
				+=======
			
 
				+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=610161977d2e2632eb34aff3e88a079f"></script>
			
 
				+>>>>>>> no message
			
 
				     <title>猎豹AI</title>
			
 
				   </head>
			
 
				   <body>
			
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -45,7 +45,8 @@
 
				   import OrderDetail from './orderComponents/orderDetail.vue';
			
 
				   import orderMap from './orderComponents/orderAMap.vue';
			
 
				   import OrderList from './orderComponents/orderList.vue';
			
 
				-  import orderTrack from './orderComponents/orderTrack.vue'
			
 
				+  import orderTrack from './orderComponents/orderTrack'
			
 
				+  import orderMap from './orderComponents/orderAMap.vue';
			
 
				   export default {
			
 
				     data() {
			
 
				       return {
			
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,8 @@ Vue.prototype.$axios = axios    //全局注册，使用方法为:this.$axios
 
				 
			
 
				 import VueAMap from 'vue-amap';
			
 
				 
			
 
				+import VueAMap from 'vue-amap';
			
 
				+
			
 
				 import {get, post, postJson} from './api/http'