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

src/assets/css/home.css

@@ -26,7 +26,7 @@
   color: #fd6473 !important;
 }
 .Home .form_ul {
-  height: 60px;
+  height: 80px;
   overflow: hidden;
 }
 .Home .form_ul li {
@@ -38,6 +38,7 @@
   padding: 3px 5px;
   margin-right: 10px;
   margin-bottom: 8px;
+  margin-top:14px;
   cursor: pointer;
   box-sizing: border-box;
 }
@@ -333,7 +334,6 @@ p {
   padding:10px;
   box-sizing: border-box;
   color: #333333;
-  border: 1px dashed #999;
   background: url("../../assets/img/home/tour.png") 100% 100%;
 
 }
@@ -694,7 +694,6 @@ a{
 .Home .Localtour .Localtour_right{
   width: 218px;
   background: url('../img/home/tour8.png');
-  border: 1px dashed #999;
   background-size:cover;
   font-size: 12px;
   padding:10px;

src/assets/mall/newHead.css

@@ -169,7 +169,7 @@ ul,li{list-style: none;}
   position: absolute;
   top: 40px;
   width:210px;
-  z-index: 100;
+  z-index: 2000;
 
 }
 .new_header_nav_three ul._t_nav_box li .localtour{

src/components/DependentTravel/IndependentTravel.vue

@@ -71,7 +71,7 @@
         
           <!-- 当季精选特惠 -->
           <div style="margin-top:40px">
-            <p style="text-align:center;font-family:PingFang-SC-Regular;">Hot areas in the season</p>
+            <p class="f12" style="text-align:center;font-family:PingFang-SC-Regular;color:#333333">HOT AREAS IN THE SEASON</p>
             <div class="djjx">
               <span class="cont_top">当季精选特惠</span>
               <span class="cont_bottom">价格实惠内容更精彩</span>
@@ -82,8 +82,8 @@
                   <div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
                     <!-- <img ref="img0" id="img0" src="../../assets/img/visa/country1.png" alt=""> -->
                     <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
-                      <p style="font-size:12px;padding-top:10px">RMB</p>
-                      <p style="font-size:14px;font-weight:600">
+                      <p style="font-size:14px;padding-top:15px">RMB</p>
+                      <p style="font-size:16px;font-weight:600">
                         {{item.b2BPrice}}
                         <span style="font-size:12px;font-weight:10">起</span>
                       </p>
@@ -93,7 +93,7 @@
                     <p
                       style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
                     >{{item.lineName}}</p>
-                    <div class="text">
+                    <div class="text" style="font-family:'微软雅黑'">
                       <p>{{item.title}}</p>
                       <p>{{item.ltName}}</p>  
                     </div>
@@ -110,8 +110,8 @@
                 <div class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
                   <div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
                     <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
-                      <p style="font-size:12px;padding-top:10px">RMB</p>
-                      <p style="font-size:14px;font-weight:600">
+                      <p style="font-size:14px;padding-top:15px">RMB</p>
+                      <p style="font-size:16px;font-weight:600">
                         {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                         <span style="font-size:12px;font-weight:10">起</span>
                       </p>
@@ -121,7 +121,7 @@
                     <p
                       style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
                     >{{item.lineName}}</p>
-                    <div class="text">
+                    <div class="text" style="font-family:'微软雅黑'">
                       <p>{{item.title}}</p>
                       <p>{{item.ltName}}</p> 
                     </div>
@@ -143,7 +143,7 @@
       <el-row class="max-w1500" :gutter="0">
         <el-col :span="18" :offset="3">
           <div style="margin-top:45px;">
-            <p style="text-align:center;font-family:PingFang-SC-Regular;">Hot crash free rides</p>
+            <p class="f12" style="text-align:center;font-family:PingFang-SC-Regular;color:#333333">HOT CRASH FREE RIDES</p>
             <div class="djjx">
               <span class="cont_top cont_top2">热门速成自由行</span>
               <span class="cont_bottom cont_bottom2">2人成行快速成团出发</span>
@@ -473,6 +473,9 @@ export default {
 </script>
 
 <style>
+.Indepentdent .f12{
+  font-size: 12px;
+}
 .Indepentdent .carousel .el-carousel__container{
   height: 100%;
 }
@@ -544,6 +547,7 @@ export default {
   padding: 2px 6px;
   font-weight: 100;
   border-radius: 4px;
+  margin-left: 12px;
 }
 .zyx_pay {
   margin: 25px 0;
@@ -558,7 +562,7 @@ export default {
 }
 .zyx .zyx_title {
   color: #333333;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: 700;
 }
 .zyx {
@@ -771,8 +775,8 @@ export default {
 }
 .Indepentdent .Season_content .Season_content_list .Season_money {
   position: absolute;
-  width: 60px;
-  height: 60px;
+  width: 76px;
+  height: 76px;
   bottom: 8px;
   border-radius: 50%;
   text-align: center;
@@ -805,9 +809,9 @@ export default {
 }
 .djjx .cont_bottom {
   position: absolute;
-  font-size: 14px;
+  font-size: 12px;
   bottom: -10px;
-  left: 25px;
+  left: 33px;
   background: #fff;
   padding: 0 35px;
   color: #333333;
@@ -930,7 +934,13 @@ p {
   border-bottom: 0;
   text-align: center;
   float: left;
-  /* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35); */
+  /* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35);
+   */
+   /* box-shadow: */
+/* 1px 0px 0px 0px #E2B2D1, //左边阴影 */
+/* 0 -2px 3px -1px transparent, //顶部阴影 */
+/* 0 2px 3px -1px transparent, //底部阴影 */
+ /* 0px 0px 0px 0px #E2B2D1; //右边阴影 */
 }
 ._top_box .wrap2{
   background:rgba(71,165,255,1);
@@ -983,8 +993,8 @@ p {
 }
 .partition span{
   display: inline-block;
-  height: 12px;
-  width: 12px;
+  height: 10px;
+  width: 10px;
   border-radius: 50%;
   background-color: #E8E8E8;
 }

src/components/Home.vue

@@ -38,7 +38,7 @@
                     </ul>
                     <div class="tag_right">
                         <!-- 签证 -->
-                        <div style="width:394px" v-show="tag=='visa'" class="visa">
+                        <div style="width:394px;margin-top:9px;margin-left:8px;" v-show="tag=='visa'" class="visa">
                             <el-form ref="visa_form" :model="visa_form" label-width="90px">
                                 <!-- <el-form-item label="国家/地区" style="margin-bottom:10px">
                                     <el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
@@ -50,14 +50,14 @@
                                         <el-input size="small" v-model="visaSearch" placeholder="国家或者地区名字"></el-input>
                                     </li>
                                 </ul>
-                                <div style="overflow:auto;margin-top:10px">
+                                <div style="overflow:auto;margin-top:16px">
                                     <span class="form_btn">
                                         <router-link style="color:#fff;display:block;" :to="{ path: '/Visalist',query:{'searchKey':visaSearch} }" target='_blank'>立即搜索</router-link>
                                     </span>
                                 </div>
                                 
                                 <ul class="form_ul">
-                                    <p style="margin:6px 0;display: flex;align-items: center;">
+                                    <p style="margin-top:6px;display: flex;align-items: center;">
                                         <span class="green_span"></span> 热门推荐
                                     </p>
                                     <li @click="TagGourl('Visalist',item)" v-for="(item,index) in searchItemVisa.hotCountry" :key="index+350">
@@ -364,7 +364,7 @@
           <!-- 跟团游 -->
           <div class="Grouptour">
               <div class="tour_left">
-                  <p>跟团游</p>
+                  <p class="pfR">跟团游</p>
                   <div class="tour_left_content">
                       <p style="font-size:14px;font-weight:700">热门目的地</p>
                       <span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">
@@ -399,7 +399,7 @@
           <!-- 自由行 -->
           <div class="travel Grouptour">
               <div class="tour_left">
-                  <p>自由行</p>
+                  <p  class="pfR">自由行</p>
                   <div class="tour_left_content travel_left" style="height:325px;">
                       <p style="font-size:14px;font-weight:700">热门目的地</p>
                       <span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
@@ -459,8 +459,8 @@
                   </span>
                   
               </el-col>
-              <el-col :span="5">
-                  <p style="font-size:20px;color:#202020">客户第一的购买政策</p>
+              <el-col :span="5" style="text-align:left">
+                  <p class="pfR" style="font-size:20px;color:#202020">客户第一的购买政策</p>
                   <p style="font-size:12px;color:#FF9000">快速响应客户需求，开心出游你、我、他</p>
               </el-col>
               <el-col :span="2">
@@ -469,7 +469,7 @@
                   </span>
                   
               </el-col>
-              <el-col :span="4">
+              <el-col :span="4" style="text-align:left">
                   <p style="font-size:20px;color:#202020">专业行程定制师</p>
                   <p style="font-size:12px;">定制套餐自由搭配 <br> 价位行程自行安排 保障最优出行
                         </p>
@@ -480,7 +480,7 @@
                   </span>
                   
               </el-col>
-              <el-col :span="4">
+              <el-col :span="4" style="text-align:left">
                   <p style="font-size:20px;color:#202020">7*24小时客服服务</p>
                   <p style="font-size:12px;">24小时订单客服<br>随时解决客服需求咨询</p>
               </el-col>
@@ -490,9 +490,9 @@
                   </span>
                   
               </el-col>
-              <el-col :span="3">
+              <el-col :span="3" style="text-align:left">
                   <p style="font-size:12px;color:#FF9000">客服服务电话</p>
-                  <p style="font-size:12px;color:#FF9000">028-88888888</p>
+                  <p class="pfR" style="font-size:18px;color:#FF9000">028-88888888</p>
               </el-col>
           </el-row>
 

src/components/LocalTour/LocalCuisineDetails.vue

@@ -33,7 +33,7 @@
                     
                     <ul class="Imglist">
                         <li @mouseover="LiHover(item,index)" v-if="index<5" :key="index" v-for="(item,index) in datadetails.coverImgs" :class="activeTab==index?'activeLi':''">
-                            <a href="#">
+                            <a>
                                 <img v-if="item" :src='compressImg(item, "filt", 245, "")' alt="">
                                 <img v-else src="../../assets/img/activy.jpg" alt="">
                            </a>

src/components/LocalTour/Localtourhome.vue

@@ -320,6 +320,7 @@
   </div>
 </template>
 <script>
+import bus from '../../plugins/event-bus'
 export default {
   data () {
     return {
@@ -363,13 +364,14 @@ export default {
         ticketLoad:false,
         isLogin:0,
         scrollobj:null,
+        route:"",
     }
   },
   created(){
     
     this.isLogin=this.$store.state.isLogin;
-      
   },
+
   mounted() {
     this.getSlideList();
     this.GetLine();
@@ -378,15 +380,22 @@ export default {
     this.GetCuntryTicket();
     this.getFoodCountryItem();
     this.scrollobj = document.getElementsByClassName("el-scrollbar__wrap")[0];
-    if(this.$route.query.str){
-          let str=this.$route.query.str;        
-          this.goAnchor(str);
-      }
+
+      let self = this
+       bus.$on('Headmsg', (e) => {
+         self.message = e
+        this.goAnchor(e);
+       })
   },
   methods: {
       goAnchor(selector) {
          var anchor = document.getElementById(selector);
          this.scrollobj.scrollTop = anchor.offsetTop;
+        // window.scrollTo({
+        //     left: 0,
+        //     top: 0,
+        //     behavior: 'smooth'
+        // })
        },
       SelectFood(countryId){
         this.foodmsg.countryId=countryId;

src/components/global/foot.vue

@@ -92,7 +92,7 @@
             </el-col>
             <el-col :span="3" style="text-align:center">
                 <p style="color:#D0D0D0;font-size:14px;">微信扫描小程序</p>
-                <div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../../assets/img/xiaocx.png" alt=""></div>
+                <div style="width:118px;height:118px;display: inline-block;margin-top:5px"><img src="../../assets/img/xiaocx.png" alt=""></div>
             </el-col>
         </el-row>
         <p>旅行社业务经营许可证编号：L-SC-CJ00015    蜀ICP备13000760号</p>

src/components/global/newHead.vue

@@ -219,11 +219,11 @@
               <span>当地游</span>
               <span class="__splice">|</span>
             </div>
-            <div class="localtour">
+            <!-- <div class="localtour">
               <span @click="GoLocalTour('outoneday')">一日游</span>
               <span @click="GoLocalTour('PlayTicket')" >游玩门票</span>
               <span @click="GoLocalTour('LocalFood')">当地美食</span>
-            </div>
+            </div> -->
           </li>
           <!-- <li :class="{_active: navActive === 3}">
             <div @click="handleSelect('/OneDayTour', 3), navActive = 3">
@@ -279,6 +279,7 @@
   </el-row>
 </template>
 <script>
+import bus from '../../plugins/event-bus'
 export default {
   data(){
     return {
@@ -293,9 +294,11 @@ export default {
     }
   },methods:{
     GoLocalTour(str){
-      let routeData =this.$router.resolve({name: "Localtourhome", query:{str: str}});
-      // let routeData = this.$router.resolve({ path:path});
-      window.open(routeData.href, '_blank');
+      bus.$emit('Headmsg',str); 
+      // this.$router.push({name: "Localtourhome", query:{str: str}});
+      // let routeData =this.$router.resolve({name: "Localtourhome", query:{str: str}});
+      // // let routeData = this.$router.resolve({ path:path});
+      // window.open(routeData.href, '_blank');
 
     },
     changeSite(){