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

src/components/DependentTravel/IndependentTravel.vue

@@ -283,8 +283,8 @@
               <span class="cont_bottom cont_bottom3">选择定制师定制你的专属行程</span>
             </div>
         </div>
-        <el-col :span="18" :offset="3" class="clearfix _someone">
-            <div v-if="index<4" v-for="(item,index) in CustomDesignerList" :key="item.name" class="_someone_item">
+        <div style="width:1200px;margin:0 auto;margin-top:40px" class="clearfix _someone" :style="{zoom: zoom}">
+            <div v-if="index<5" v-for="(item,index) in CustomDesignerList" :key="item.name" class="_someone_item">
                 <div class="_someone_item_top">
                     <div>
                         <p class="_name">{{item.name}} <span v-if="item.emBirthday!=''">/</span> {{item.emBirthday | Year}}</p>
@@ -298,7 +298,7 @@
                     </div>
                 </div>
             </div>
-        </el-col>      
+        </div>      
     </el-row>
     <div class="footer">
       <el-row>
@@ -375,6 +375,7 @@ export default {
     let Height = window.innerHeight
     this.zoom = Math.round((Height/1080) * 100) / 100
     this.isLogin=this.$store.state.isLogin;
+    console.log("this.zoom",this.zoom)
   },
   mounted() {
     this.getSlideList();
@@ -665,7 +666,7 @@ export default {
 ._someone_item{
     float: left;
     cursor: pointer;
-    margin-right: 73px;
+    margin-right: 40px;
 
 }
 ._someone_item_last{

src/components/GroupTour/index.vue

@@ -161,12 +161,12 @@ export default {
     // 系列
     GostartCity(place){
       this.$router.push({ path:'/search',
-         query:{tab:2,keywords:"",startCityId:place} })
+         query:{tab:2,keywords:place} })
     },
     // 系列
     GoLine(item,line){
       this.$router.push({ path:'/search',
-         query:{tab:2,keywords:"",lineId:item.lineName,lineteamId:line.ltName} })
+         query:{keywords:"",lineId:item.lineName,lineteamId:line.ltName} })
     },
     // 景点
     TagGourl(path,item,num){