修复谷歌地图

.gitignore

@@ -14,4 +14,5 @@ yarn-error.log*
 *.sln
 
 dist/
-package/
+package/
\ No newline at end of file
+src/components/work/yim.html

index.html

@@ -12,7 +12,7 @@
     <!-- <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=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
+    <script type="text/javascript" src="http://activity.oytour.com/google.js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
     
     <title>四川和平国际旅行社</title>
   </head>

src/components/Hotel/HotelInfo.vue

@@ -888,21 +888,21 @@
       this.GetHotelPirceTypeList();
       this.qMsg = this.$route.query.qMsg;
       this.hotelID = this.$route.query.id;
-      var jsArray = document.getElementsByTagName("script");
-      var flag = false;
+      // var jsArray = document.getElementsByTagName("script");
+      // var flag = false;
 
-      var jsUrl = this.domainManager().GoogleMapUrl;
-      for (var i = 0; i < jsArray.length; i++) {
-        if (jsArray[i].src == jsUrl) {
-          flag = true;
-        }
-      }
-      if (!flag) {
-        const s = document.createElement("script");
-        s.type = "text/javascript";
-        s.src = jsUrl;
-        document.body.appendChild(s);
-      }
+      // var jsUrl = this.domainManager().GoogleMapUrl;
+      // for (var i = 0; i < jsArray.length; i++) {
+      //   if (jsArray[i].src == jsUrl) {
+      //     flag = true;
+      //   }
+      // }
+      // if (!flag) {
+      //   const s = document.createElement("script");
+      //   s.type = "text/javascript";
+      //   s.src = jsUrl;
+      //   document.body.appendChild(s);
+      // }
       this.GetCounrty();
       this.inithotelService(); //初始化酒店服务
       this.inithotelPolicy(); //初始化酒店政策

src/components/Restaurant/restaurantInfoManage.vue

@@ -1474,20 +1474,20 @@
       this.GetCooperationTypeList();
       this.qMsg = this.$route.query.qMsg;
       this.ID = this.$route.query.id;
-      var jsArray = document.getElementsByTagName("script");
-      var flag = false;
-      var jsUrl = this.domainManager().GoogleMapUrl;
-      for (var i = 0; i < jsArray.length; i++) {
-        if (jsArray[i].src == jsUrl) {
-          flag = true;
-        }
-      }
-      if (!flag) {
-        const s = document.createElement("script");
-        s.type = "text/javascript";
-        s.src = jsUrl;
-        document.body.appendChild(s);
-      }
+      // var jsArray = document.getElementsByTagName("script");
+      // var flag = false;
+      // var jsUrl = this.domainManager().GoogleMapUrl;
+      // for (var i = 0; i < jsArray.length; i++) {
+      //   if (jsArray[i].src == jsUrl) {
+      //     flag = true;
+      //   }
+      // }
+      // if (!flag) {
+      //   const s = document.createElement("script");
+      //   s.type = "text/javascript";
+      //   s.src = jsUrl;
+      //   document.body.appendChild(s);
+      // }
       this.init(); //开放平台
       this.GetCounrty();
       if (typeof this.ID != "undefined") {

src/components/ShoppingStore/ShoppingStore.vue

@@ -1356,20 +1356,20 @@
     },
     mounted() {
       this.GetCashPoolList();
-      var jsArray = document.getElementsByTagName("script");
-      var flag = false;
-      var jsUrl = this.domainManager().GoogleMapUrl;
-      for (var i = 0; i < jsArray.length; i++) {
-        if (jsArray[i].src == jsUrl) {
-          flag = true;
-        }
-      }
-      if (!flag) {
-        const s = document.createElement("script");
-        s.type = "text/javascript";
-        s.src = jsUrl;
-        document.body.appendChild(s);
-      }
+      // var jsArray = document.getElementsByTagName("script");
+      // var flag = false;
+      // var jsUrl = this.domainManager().GoogleMapUrl;
+      // for (var i = 0; i < jsArray.length; i++) {
+      //   if (jsArray[i].src == jsUrl) {
+      //     flag = true;
+      //   }
+      // }
+      // if (!flag) {
+      //   const s = document.createElement("script");
+      //   s.type = "text/javascript";
+      //   s.src = jsUrl;
+      //   document.body.appendChild(s);
+      // }
       this.getCountryList();
       this.getList();
       this.getType();

src/components/Supplier/HotelInfo.vue

@@ -875,21 +875,21 @@
       this.GetHotelPirceTypeList();
       this.qMsg = this.$route.query.qMsg;
       this.hotelID = this.$route.query.id;
-      var jsArray = document.getElementsByTagName("script");
-      var flag = false;
+      // var jsArray = document.getElementsByTagName("script");
+      // var flag = false;
 
-      var jsUrl = this.domainManager().GoogleMapUrl;
-      for (var i = 0; i < jsArray.length; i++) {
-        if (jsArray[i].src == jsUrl) {
-          flag = true;
-        }
-      }
-      if (!flag) {
-        const s = document.createElement("script");
-        s.type = "text/javascript";
-        s.src = jsUrl;
-        document.body.appendChild(s);
-      }
+      // var jsUrl = this.domainManager().GoogleMapUrl;
+      // for (var i = 0; i < jsArray.length; i++) {
+      //   if (jsArray[i].src == jsUrl) {
+      //     flag = true;
+      //   }
+      // }
+      // if (!flag) {
+      //   const s = document.createElement("script");
+      //   s.type = "text/javascript";
+      //   s.src = jsUrl;
+      //   document.body.appendChild(s);
+      // }
       this.GetCounrty();
       this.inithotelService(); //初始化酒店服务
       this.inithotelPolicy(); //初始化酒店政策

src/components/dmc/manager/workCount.vue

@@ -252,20 +252,20 @@ export default{
 
     created(){
         this.tableData = this.getTableData().filter((item,index)=>index==0);
-        let jsArray = document.getElementsByTagName("script");
-        let flag = false;
-        let jsUrl = this.domainManager().GoogleMapUrl;
-        for (let i = 0; i < jsArray.length; i++) {
-          if (jsArray[i].src == jsUrl) {
-            flag = true;
-          }
-        }
-        if (!flag) {
-          const s = document.createElement("script");
-          s.type = "text/javascript";
-          s.src = jsUrl;
-          document.body.appendChild(s);
-        }
+        // let jsArray = document.getElementsByTagName("script");
+        // let flag = false;
+        // let jsUrl = this.domainManager().GoogleMapUrl;
+        // for (let i = 0; i < jsArray.length; i++) {
+        //   if (jsArray[i].src == jsUrl) {
+        //     flag = true;
+        //   }
+        // }
+        // if (!flag) {
+        //   const s = document.createElement("script");
+        //   s.type = "text/javascript";
+        //   s.src = jsUrl;
+        //   document.body.appendChild(s);
+        // }
     },
 
     mounted () {

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -1464,20 +1464,20 @@
       }
       this.GetPayList();
       this.ID = this.$route.query.id;
-      var jsArray = document.getElementsByTagName("script");
-      var flag = false;
-      var jsUrl = this.domainManager().GoogleMapUrl;
-      for (var i = 0; i < jsArray.length; i++) {
-        if (jsArray[i].src == jsUrl) {
-          flag = true;
-        }
-      }
-      if (!flag) {
-        const s = document.createElement("script");
-        s.type = "text/javascript";
-        s.src = jsUrl;
-        document.body.appendChild(s);
-      }
+      // var jsArray = document.getElementsByTagName("script");
+      // var flag = false;
+      // var jsUrl = this.domainManager().GoogleMapUrl;
+      // for (var i = 0; i < jsArray.length; i++) {
+      //   if (jsArray[i].src == jsUrl) {
+      //     flag = true;
+      //   }
+      // }
+      // if (!flag) {
+      //   const s = document.createElement("script");
+      //   s.type = "text/javascript";
+      //   s.src = jsUrl;
+      //   document.body.appendChild(s);
+      // }
       this.init(); //开放平台
       this.GetCounrty();
       if (typeof this.ID != "undefined") {

src/plug/index.js

@@ -143,7 +143,7 @@ export default {
           //SocketUrl
           WebSocketUrl: "ws://192.168.1.110:8080?account=",
           //google地图Url
-          GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
+          GoogleMapUrl: "https://www.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&libraries=geometry&language=zh_CN&callback=__googleMapResourceLoaded",
           //google地图图片地址
           GoogleMapImageUrl: "http://imgfile.oytour.com",
           //上传站点