‘B2B修改@’

src/components/global/confirmationOrderDownLoad.vue

@@ -1588,8 +1588,8 @@
             </table>
             <div class="_hangban_line"></div>
             <table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list">
-              <tbody v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
-                <tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
+              <tbody v-if="orderTripdiff && orderTripdiff.length>0">
+                <tr v-for="(flight,ftIndex) in orderTripdiff" :key="ftIndex">
                   <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
                   <td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
                   <td width="206">{{flight.departureAirPortName}}<span class="citycode"></span></td>
@@ -2177,7 +2177,7 @@
       init() {
         if (true) {
             let data = this.sonData
-            this.orderTripdiff = data.orderTripdiff;
+            this.orderTripdiff = data.currentPriceInfo.priceFlight;
             if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
               this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
             }
@@ -2246,8 +2246,8 @@
         this.feature = data.feature
         this.showType = this.feature.featureType;
         this.isDirect = data.isDirect;
-        if (data.priceList.length > 0) {
-          data.priceList[0].priceFlight.forEach((x, i) => {
+        if (data.currentPriceInfo.priceFlight.length > 0) {
+          data.currentPriceInfo.priceFlight.forEach((x, i) => {
             if (i == 0) {
               x.dayNum = 1;
               if (x.departureTime < x.arrivalTime) {
@@ -2256,7 +2256,7 @@
                 x.daodaDay = 2;
               }
             } else {
-              x.dayNum = this.DateDiff(data.priceList[0].priceFlight[0].startDate, x.startDate);
+              x.dayNum = this.DateDiff(data.currentPriceInfo.priceFlight[0].startDate, x.startDate);
               if (x.departureTime < x.arrivalTime) {
                 x.daodaDay = x.dayNum;
               } else {

src/components/mall/calendar.vue

@@ -88,8 +88,20 @@ export default {
 	},mounted(){
 		
 	},created(){
-		this.getYearMonthDay();		
+		this.getYearMonthDay()
+		bus.$on('order-chosen_calendar', this.orderChosen)
 	},methods:{
+		orderChosen: function (date) {
+			let day = parseInt(date.split('-')[2]).toString()
+			this.daysData.forEach((x, index) => {
+				if (x.day === day) {
+					this.isSelect = index;
+					this.$emit('ChildrenSelect', date)
+				}
+			});
+			// this.$emit('ChildrenSelect', clickDate)
+		},
+		
 		selectDate(index){
 			if(this.$data.daysData[index].day == 0) {
 				bus.$emit('chosen-tripdate', null)
@@ -107,7 +119,6 @@ export default {
 			clickDay = clickDay < 10 ? ('0' + clickDay) : clickDay
 			let clickDate = currentDay[0] + '-' + currentDay[1] + '-' + clickDay
 			this.$emit('ChildrenSelect', clickDate)
-			bus.$emit('chosen-tripdate', this.currentDay.substring(0,7) + '-' + clickDay)
 		},
 		getYearMonthDay(){
 			let currentYear = this.currentDay.substring(0,4); //当前年份

src/components/mall/heeltour.vue

@@ -60,7 +60,7 @@
                     </el-row>
                     <el-row :gutter="17">
                         <el-col :span="4" v-for='(item,index) in tehuis' :key="index" v-if='index>5'>
-                            <div class="team-item" :style="{'height':`${itemHeight}`}" @click="goUrl('detail',item.id)">
+                            <div class="team-item" :style="{'height':`${itemHeight}`}" @click="goUrl('detail',item.id,item)">
                                 <img v-if="item.imgCover!=null&&item.imgCover.length" :src="`${JSON.parse(item.imgCover)[0].Url}`"  />
                                 <div class="info-box">
                                     <div class="item-title">{{item.ltName}}</div>
@@ -80,7 +80,7 @@
                 <div class="item-box">
                     <el-row :gutter="17">
                         <el-col :span="4" v-for="(item,index) in tiaoshui" :key="index">
-                            <div class="team-item noradius" :style="{'height':`${itemHeight}`}"  @click="goUrl('detail',item.id)">
+                            <div class="team-item noradius" :style="{'height':`${itemHeight}`}"  @click="goUrl('detail',item.id, item)">
                                 <img class="notamin"  v-if='item.imgCover!=null&&item.imgCover.length' :src="`${JSON.parse(item.imgCover)[0].Url}`" />
                                 <img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
                                 <!-- <div class="seat" :style="{'left':`${(w-100)/2}px`,'top':`${(h-100)/2}px`}">
@@ -140,7 +140,7 @@
                             <div class="item-box">
                                 <el-row :gutter="10">
                                     <el-col :span="6" v-for='(data,index) in item.pageData' :key="index" >
-                                        <div class="group-item" :style="{'height':`${groupHeight}px`}" @click="goUrl('detail',data.id)">
+                                        <div class="group-item" :style="{'height':`${groupHeight}px`}" @click="goUrl('detail',data.id,data)">
                                             <div class="team-item noradius" :style="{'height':`${groupItemHeight}`}">
                                                 <img class="notamin"  v-if='data.imgCover!=null&&data.imgCover.length'  :src="`${JSON.parse(data.imgCover)[0].Url}`"/>
                                                 <img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
@@ -295,10 +295,10 @@ export default {
                 query
             });
         },
-        goUrl(path,id){
+        goUrl(path,id,obj){
             // detailTwo
             path = 'detailTwo'
-            path=`${path}/${encodeURIComponent(id)}`;
+            path=`${path}/${encodeURIComponent(id)}/${obj.tcid}`;
             this.$router.push({ path })
         },
         loadModuleData(sno){

src/router.js

@@ -41,7 +41,7 @@ export default new Router({
 					}
         },
         {
-					path: '/detailTwo/:id/',
+					path: '/detailTwo/:id/:tcid',
 					name: 'detailTwo',
 					component: resolve => require(['@/components/mall/detailTwo'], resolve),
 					meta: {