Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

784b9089 · 黄媛媛 · 066684cf · 6ec74580 · 784b9089 · 784b9089
Commit 784b9089 authored Jan 03, 2020 by 黄媛媛
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

index.html index.html +2 -1

index.js src/plug/index.js +1 -1

No files found.
--- a/index.html
+++ b/index.html
@@ -12,7 +12,8 @@
    <!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> -->
    <script type="text/javascript" src="static/MarkerClusterer.js"></script>
    <script type="text/javascript" src="static/CurveLine.min.js"></script>
-    <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&language=zh-CN"></script>
+    <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
+    
    <title>四川和平国际旅行社</title>
  </head>
  <body>

--- a/src/plug/index.js
+++ b/src/plug/index.js
@@ -145,7 +145,7 @@ export default {
          //SocketUrl
          WebSocketUrl: "ws://192.168.1.110:8080?account=",
          //google地图Url
-          GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&sensor=false&language=zh-CN",
+          GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
          //google地图图片地址
          GoogleMapImageUrl: "http://imgfile.oytour.com",
          //上传站点