Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

public/index.html

@@ -846,7 +846,6 @@
             return false;
         });
     </script>
-    <!-- <script src="http://pv.sohu.com/cityjson?ie=utf-8"></script> -->
     <script type="text/javascript"
         src="https://webapi.amap.com/maps?v=1.3&key=86f2f611126f36b93cf2ef280300524f&plugin=AMap.CitySearch"></script>
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">

src/components/global/HTMap.vue

@@ -39,7 +39,7 @@
 
       },
       mounted(){
-        this.mapBuild() //初始化实例之后调用
+       // this.mapBuild() //初始化实例之后调用
       },
       methods:{
         getDetailsRoutes(source,destination,map){
@@ -59,7 +59,6 @@
                   dvDistance.innerHTML = "";
                   dvDistance.innerHTML += "Distance: " + distance + "<br />";
                   dvDistance.innerHTML += "Duration:" + duration;
-
               } else {
                   alert("Unable to find the distance via road.");
               }
@@ -67,7 +66,6 @@
         },
         //  地图实例
         mapBuild(){
-          
           if(this.dataList.length>1){
             let lat = parseFloat(this.dataList[0].lat)
             let lng = parseFloat(this.dataList[0].lng)
@@ -80,9 +78,7 @@
               gestureHandling: 'greedy'
             });
             this.directionsDisplay.setMap(this.map);
-            this.calcRoute()
-          
-            
+            this.calcRoute();
           }
           else{
             this.ptcenter = {

src/components/global/foot.vue

@@ -35,7 +35,6 @@
         box-sizing: border-box;
     }
 </style>
-
 <template>
     <div class="foot-box">
         <el-row style="width:1200px;margin:0 auto" class="home_footer" v-if="localStorage&&localStorage.i==2">
@@ -52,10 +51,8 @@
                         <li @click="FootgoUrl('VisaHomePage')">签证</li>
                         <li>定制机票</li>
                         <li @click="FootgoUrl('TicketHome')">机票</li>
-
                     </ul>
                 </div>
-
             </el-col>
             <el-col :span="5">
                 <div class="float"><i class="iconfont icon-icon-test7"></i></div>
@@ -65,7 +62,6 @@
                         <p>特卖</p>
                         <p>积分商城</p>
                         <p>活动中心</p>
-
                     </div>
                 </div>
 
@@ -75,7 +71,6 @@
                 <div class="float">
                     <p class="color_33">定制旅游</p>
                     <div>
-                        <!-- <p @click="FootgoUrl('PersonalTailor')">选择定制师</p> -->
                         <p @click="FootgoUrl('PersonalTailor')">定制我的行程</p>
                     </div>
                 </div>
@@ -113,13 +108,12 @@
             this.localStorage = JSON.parse(localStorage.g);
         },
         methods: {
-            //   底部跳转
+            //底部跳转
             FootgoUrl(path) {
                 this.$router.push({
                     path
                 })
             },
         },
-
     }
 </script>
\ No newline at end of file

src/components/global/newHead.vue

@@ -564,19 +564,18 @@ export default {
   },
   created() {
     let that = this;
-    // http://pv.sohu.com/cityjson?ie=utf-8
     that.loadSites();
-    require(["http://pv.sohu.com/cityjson"], () => {     
-      setTimeout(() => {
-        console.log("returnCitySN",returnCitySN)
-        if (returnCitySN) {
-          that.loadSites();
-          that.cityText = returnCitySN.cname;
-        } else {
-          that.loadSites();
-        }
-      }, 1500);
-    });
+    // require(["http://pv.sohu.com/cityjson"], () => {     
+    //   setTimeout(() => {
+    //     console.log("returnCitySN",returnCitySN)
+    //     if (returnCitySN) {
+    //       that.loadSites();
+    //       that.cityText = returnCitySN.cname;
+    //     } else {
+    //       that.loadSites();
+    //     }
+    //   }, 1500);
+    // });
     if (localStorage.g && localStorage.g != "undefined") {
       this.groupInfo = JSON.parse(localStorage.g);
     }