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

src/components/DependentTravel/IndependentList.vue

@@ -105,7 +105,7 @@
                             </span>
                         </span>
                     </p> -->
-                    <div class="orderbyitem" style="overflow:auto">
+                    <div class="orderbyitem" style="height:38px">
                         <el-button-group class="orderby-group">
                             <el-button size='mini' :type="orderindex==0?'danger':''" @click="changeOrderType(0)">综合</el-button>
                             <el-button size='mini' :type="orderindex==1?'danger':''" @click="changeOrderType(1)">团期 <i :class="ordertype==0||orderindex!=1?'el-icon-arrow-down':'el-icon-arrow-up'"></i></el-button>
@@ -127,7 +127,7 @@
                                 <img :src='compressImg(item.imgCover[0].Url, "filt", 245, "")' alt="" :onerror="errorImg">
                             </el-col>
                             <el-col class="div_2" :span="14" style="font-size:12px">
-                                <p @click="goUrl('detail',item.id,item.tcid)" class="visa_title" style="font-size:16px;color:#000000">
+                                <p @click="goUrl('detailTwo',item.id,item.tcid)" class="visa_title" style="font-size:16px;color:#000000">
                                     {{item.lineName}}+{{item.ltName}}+{{item.productRecommend}}
                                 </p>
                                 <p v-if="item.priceTags"><span v-for="(tag,index) in item.priceTags" :key="index+100" class=tag>{{tag}}</span></p>
@@ -140,7 +140,7 @@
                                 ￥<span style="font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span><span style="font-size:12px">起</span>       
                             </el-col>
                             <el-col :span="3" style="text-align:right">
-                                <el-button @click="goUrl('detail',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
+                                <el-button @click="goUrl('detailTwo',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
                             </el-col>
                         </el-row>
                         <el-pagination style="margin:15px;text-align:right"

src/components/DependentTravel/IndependentTravel.vue

@@ -421,7 +421,6 @@ export default {
           res => {
             if (res.data.resultCode == 1) {
               this.TreatmentList=res.data.data.pageData;
-              console.log("this.TreatmentList",this.TreatmentList)
               this.TreatmentList.forEach(item=>{
                 item.imgCover=JSON.parse(item.imgCover)
               })

src/components/GroupTour/block/list.vue

@@ -299,7 +299,7 @@
         <div class="box b2">
           <!-- <p>这里是广告占位，讲述图片内容的详细讲解，位置有限，显示不完整的地方就用...</p> -->
           <div class="bottom">
-            <router-link style="color:#ffffff;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineId':dataList.name} }">查看详情</router-link>
+            <router-link style="color:#ffffff;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineName':dataList.name,'lineId':dataList.id} }">查看详情</router-link>
             </div>
         </div>
       </div>
@@ -312,7 +312,7 @@
             <el-tab-pane :label="lineItem.name" :name="`${lineItem.id}_${index}`"></el-tab-pane>
           </template>
         </el-tabs>
-        <div class="more"><router-link style="color:#888888;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineId':dataList.name} }">更多特惠>></router-link></div>
+        <div class="more"><router-link style="color:#888888;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineName':dataList.name,'lineId':dataList.id} }">更多特惠>></router-link></div>
       </el-row>
       <el-row class="right_bottom" :gutter="20">
         <template v-if="dataList.pageData && dataList.pageData.length > 0">
@@ -412,11 +412,7 @@ export default {
     }
   },
   methods: {
-    GoMore(path,dataList){
-      console.log(dataList)
-      return;
-      this.$router.push({ path })      
-    },
+    
     goUrl(id, obj){
       let path = 'detailTwo'
       path=`${path}/${encodeURIComponent(id)}/${obj.tcid}`;
@@ -442,7 +438,7 @@ export default {
     }
   },
   mounted(){
-    
+    console.log("dataList",this.dataList)
   },
   created () {
     this.MsgBus.$on('reloadList', this.reloaditem)

src/components/GroupTour/index.vue

@@ -73,7 +73,7 @@
                   <!-- </router-link> -->
                 </el-carousel-item>
                 <el-carousel-item>
-                  <router-link :to="{ path: '/search',query:{'keywords':'','lineId':'出境日本线'}}">
+                  <router-link :to="{ path: '/search',query:{'keywords':'','lineName':'出境日本线','lineId':'14'}}">
                       <img src='../../assets/img/groupTour/01.jpg'>
                   </router-link>
                 </el-carousel-item>
@@ -83,17 +83,17 @@
                   </router-link>
                 </el-carousel-item>
                 <el-carousel-item>
-                    <router-link :to="{ path: '/search',query:{'keywords':'','lineId':'出境韩国线'}}">
+                    <router-link :to="{ path: '/search',query:{'keywords':'','lineName':'出境韩国线','lineId':'5'}}">
                       <img src='../../assets/img/groupTour/03.jpg'>
                   </router-link>
                 </el-carousel-item>
                 <el-carousel-item>
-                    <router-link :to="{ path: '/search',query:{'keywords':'','lineId':'出境东南亚线'}}">
+                    <router-link :to="{ path: '/search',query:{'keywords':'','lineName':'出境东南亚线','lineId':'1'}}">
                       <img src='../../assets/img/groupTour/04.jpg'>
                   </router-link>
                 </el-carousel-item>
                 <el-carousel-item>
-                    <router-link :to="{ path: '/search',query:{'keywords':'','lineId':'出境中南半岛线'}}">
+                    <router-link :to="{ path: '/search',query:{'keywords':'','lineName':'出境中南半岛线','lineId':'9'}}">
                       <img src='../../assets/img/groupTour/05.jpg'>
                   </router-link>
                 </el-carousel-item>
@@ -187,7 +187,7 @@ export default {
     // 系列
     GoLine(item,line){
       this.$router.push({ path:'/search',
-         query:{keywords:"",lineId:item.lineName,lineteamId:line.ltName} })
+         query:{keywords:"",lineId:item.lineId,lineName:item.lineName,lineteamId:line.lineteamId,lineteamName:line.ltName} })
     },
     // 景点
     TagGourl(path,item,num){
@@ -200,7 +200,6 @@ export default {
       this.lineLoad=true;
         this.apiJavaPost('/api/b2b/group/getHomeLineSort',msg,res=>{  
         this.lineLoad=false;
-        console.log(res)
             if(res.data.resultCode==1){
                 this.lineList=res.data.data;
 

src/components/mall/detailTwo.vue

@@ -80,8 +80,8 @@
                 <el-col :span='12'>
                     <el-breadcrumb separator-class="el-icon-arrow-right">
                         <el-breadcrumb-item :to="{ path: '/heel',query:{} }">跟团游</el-breadcrumb-item>
-                        <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item>
-                        <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">{{dataList.ltName}}</el-breadcrumb-item>
+                        <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineId,'lineName':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item>
+                        <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineId,'lineName':dataList.lineName,'lineteamId':dataList.lineteamId,'lineteamName':dataList.ltName} }">{{dataList.ltName}}</el-breadcrumb-item>
                         <el-breadcrumb-item>{{dataList.title}}</el-breadcrumb-item>
                     </el-breadcrumb>
                 </el-col>
@@ -949,6 +949,7 @@ export default {
                     this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
                     this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
                     this.dataList = data;
+                    console.log("this.dataList ",this.dataList )
                     this.toDayObj = data.currentPriceInfo;
                     this.imgCover = JSON.parse(this.dataList.imgCover);
                     this.showType = this.feature.featureType;

src/components/trade/order/index.vue

@@ -488,6 +488,7 @@ export default {
                 PredictRoomNum:fcnt,
                 BigRoomNum:this.chosenObj.dcf,
                 TripleRoomNum:this.chosenObj.srf,
+                
                 TradeDate:moment().format('YYYY-MM-DD'),
                 CostType:0,
                 MinOrderPrice:0,