Skip to content

A
Athena
Commit 0c20c8e6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

‘B2B修改@’

parent 23cc97ce
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 131 deletions
src/components/global/confirmationOrderDownLoad.vue
View file @ 0c20c8e6
...@@ -1588,8 +1588,8 @@ ...@@ -1588,8 +1588,8 @@
</table> </table>
<div class="_hangban_line"></div> <div class="_hangban_line"></div>
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"> <table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list">
<tbody v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0"> <tbody v-if="orderTripdiff && orderTripdiff.length>0">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex"> <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="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="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> <td width="206">{{flight.departureAirPortName}}<span class="citycode"></span></td>
...@@ -2177,7 +2177,7 @@ ...@@ -2177,7 +2177,7 @@
init() { init() {
if (true) { if (true) {
let data = this.sonData let data = this.sonData
this.orderTripdiff = data.orderTripdiff; this.orderTripdiff = data.currentPriceInfo.priceFlight;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) { if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson); this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
} }
...@@ -2246,8 +2246,8 @@ ...@@ -2246,8 +2246,8 @@
this.feature = data.feature this.feature = data.feature
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
this.isDirect = data.isDirect; this.isDirect = data.isDirect;
if (data.priceList.length > 0) { if (data.currentPriceInfo.priceFlight.length > 0) {
data.priceList[0].priceFlight.forEach((x, i) => { data.currentPriceInfo.priceFlight.forEach((x, i) => {
if (i == 0) { if (i == 0) {
x.dayNum = 1; x.dayNum = 1;
if (x.departureTime < x.arrivalTime) { if (x.departureTime < x.arrivalTime) {
...@@ -2256,7 +2256,7 @@ ...@@ -2256,7 +2256,7 @@
x.daodaDay = 2; x.daodaDay = 2;
} }
} else { } 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) { if (x.departureTime < x.arrivalTime) {
x.daodaDay = x.dayNum; x.daodaDay = x.dayNum;
} else { } else {
......
src/components/mall/calendar.vue
View file @ 0c20c8e6
...@@ -88,8 +88,20 @@ export default { ...@@ -88,8 +88,20 @@ export default {
},mounted(){ },mounted(){
},created(){ },created(){
this.getYearMonthDay(); this.getYearMonthDay()
bus.$on('order-chosen_calendar', this.orderChosen)
},methods:{ },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){ selectDate(index){
if(this.$data.daysData[index].day == 0) { if(this.$data.daysData[index].day == 0) {
bus.$emit('chosen-tripdate', null) bus.$emit('chosen-tripdate', null)
...@@ -107,7 +119,6 @@ export default { ...@@ -107,7 +119,6 @@ export default {
clickDay = clickDay < 10 ? ('0' + clickDay) : clickDay clickDay = clickDay < 10 ? ('0' + clickDay) : clickDay
let clickDate = currentDay[0] + '-' + currentDay[1] + '-' + clickDay let clickDate = currentDay[0] + '-' + currentDay[1] + '-' + clickDay
this.$emit('ChildrenSelect', clickDate) this.$emit('ChildrenSelect', clickDate)
bus.$emit('chosen-tripdate', this.currentDay.substring(0,7) + '-' + clickDay)
}, },
getYearMonthDay(){ getYearMonthDay(){
let currentYear = this.currentDay.substring(0,4); //当前年份 let currentYear = this.currentDay.substring(0,4); //当前年份
......
src/components/mall/detailTwo.vue
View file @ 0c20c8e6
...@@ -278,8 +278,8 @@ ...@@ -278,8 +278,8 @@
</table> </table>
<div class="_hangban_line"></div> <div class="_hangban_line"></div>
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"> <table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list">
<tbody v-if="dataList.priceList&&dataList.priceList.length>0&&dataList.priceList[priceListIndex].priceFlight&&dataList.priceList[priceListIndex].priceFlight.length>0"> <tbody v-if="showFlight && FlightList.length>0">
<tr v-for="(flight,ftIndex) in dataList.priceList[priceListIndex].priceFlight" :key="ftIndex"> <tr v-for="(flight,ftIndex) in sonData.currentPriceInfo.priceFlight" :key="ftIndex">
<td width="170"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td> <td width="170"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
<td width="170"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td> <td width="170"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
<td width="216">{{flight.departureAirPortName}}<span class="citycode"></span></td> <td width="216">{{flight.departureAirPortName}}<span class="citycode"></span></td>
...@@ -644,6 +644,7 @@ import trade from '../trade/order/index' ...@@ -644,6 +644,7 @@ import trade from '../trade/order/index'
import swiper from '../trip/swiper/index' import swiper from '../trip/swiper/index'
import GGMap from '../global/GGMap' import GGMap from '../global/GGMap'
import confirmationOrderDownLoad from '../global/confirmationOrderDownLoad' import confirmationOrderDownLoad from '../global/confirmationOrderDownLoad'
import bus from '../../plugins/event-bus'
export default { export default {
components: { components: {
// bmap, // bmap,
...@@ -659,6 +660,7 @@ export default { ...@@ -659,6 +660,7 @@ export default {
data () { data () {
return { return {
ID:'', ID:'',
tcid: '',
pre:0, pre:0,
chosenTime:'', chosenTime:'',
crn:2, crn:2,
...@@ -729,7 +731,10 @@ export default { ...@@ -729,7 +731,10 @@ export default {
abcList: ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG'], abcList: ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','AA','AB','AC','AD','AE','AF','AG'],
travelLngLatInfo:[], travelLngLatInfo:[],
VideoStr:'', VideoStr:'',
sonData: null sonData: null,
showFlight: false,
FlightList: [],
city: -1,
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -743,11 +748,13 @@ export default { ...@@ -743,11 +748,13 @@ export default {
}, },
},created(){ },created(){
this.ID = decodeURIComponent(this.$route.params.id) this.ID = decodeURIComponent(this.$route.params.id)
this.tcid = decodeURIComponent(this.$route.params.tcid)
if(this.$route.params.pre && this.$route.params.pre=='preview'){ if(this.$route.params.pre && this.$route.params.pre=='preview'){
this.pre=1 this.pre=1
} }
this.getList() this.getList()
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
bus.$on('order-chosen', this.orderChosen)
}, },
mounted () { mounted () {
this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0]; this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0];
...@@ -755,6 +762,18 @@ export default { ...@@ -755,6 +762,18 @@ export default {
// this.initMap(); // this.initMap();
}, },
methods: { methods: {
orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1]
this.calendarTit.forEach((x, index)=>{
if (x.dateStrS === day) {
this.selectMonth = index;
this.indexActive = index;
setTimeout(function(){
bus.$emit('order-chosen_calendar', date)
},500)
}
})
},
editSrc: function (src) { editSrc: function (src) {
return src.split('?')[0] return src.split('?')[0]
}, },
...@@ -791,6 +810,9 @@ export default { ...@@ -791,6 +810,9 @@ export default {
for ( let i = 0; i < data.length; i++) { for ( let i = 0; i < data.length; i++) {
if (word===data[i].startDate){ if (word===data[i].startDate){
this.priceListIndex = i; this.priceListIndex = i;
let msg = {configId:data[i].configIDDes, cityId:this.city, preview:this.pre, tcid:data[i].tcid}
bus.$emit('chosen-tripdate', word)
this.getData(msg)
} }
} }
}, },
...@@ -805,17 +827,24 @@ export default { ...@@ -805,17 +827,24 @@ export default {
this.picIsShow= true; this.picIsShow= true;
}, },
getList(){ getList(){
this.loadingDataList=true
this.apipost('b2b_get_site',{},res=> { this.apipost('b2b_get_site',{},res=> {
let data = res.data.data let data = res.data.data
let city = 0 let city = 0
for(let i = 0 ; i < data.length; i++ ) { for(let i = 0 ; i < data.length; i++ ) {
if(data[i].companyId == localStorage.site) { if(data[i].companyId == localStorage.site) {
city = data[i].cityId city = data[i].cityId
this.city = city
break break
} }
} }
this.apipost('b2b_get_GetB2BTravelInfo',{configId:this.ID,cityId:city,preview:this.pre},r=>{ let msg = {configId:this.ID,cityId:city,preview:this.pre,tcid:this.tcid}
this.getData(msg)
})
},
getData: function (msg) {
this.loadingDataList=true
// console.log('api',msg)
this.apipost('b2b_get_GetB2BTravelInfoV1',msg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
let data = (r.data.data); let data = (r.data.data);
this.sonData = data; this.sonData = data;
...@@ -849,7 +878,8 @@ export default { ...@@ -849,7 +878,8 @@ export default {
// }) // })
// } // }
this.priceList = data.priceList; this.priceList = data.priceList;
this.clickDate = this.priceList[0].startDate; this.clickDate = data.currentPriceInfo.startDate;
this.FlightList = data.currentPriceInfo.priceFlight;
this.dataList = data; this.dataList = data;
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null; this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover); this.imgCover = JSON.parse(this.dataList.imgCover);
...@@ -880,13 +910,13 @@ export default { ...@@ -880,13 +910,13 @@ export default {
}) })
} }
this.htmlTitle = this.dataList.ltName; this.htmlTitle = this.dataList.ltName;
this.showFlight = true
this.$forceUpdate()
}else{ }else{
this.$message.error(r.data.message) this.$message.error(r.data.message)
} }
this.loadingDataList=false this.loadingDataList=false
},null) },null)
})
}, },
creatCalendar(list){ // 创建日历 creatCalendar(list){ // 创建日历
let dateList = []; let dateList = [];
...@@ -901,7 +931,9 @@ export default { ...@@ -901,7 +931,9 @@ export default {
b2BPrice:x.b2BPrice, b2BPrice:x.b2BPrice,
b2CMemberPrice:x.b2CMemberPrice, b2CMemberPrice:x.b2CMemberPrice,
id:index, id:index,
dateStrS:x.startDate.substring(0,x.startDate.length-3) dateStrS:x.startDate.substring(0,x.startDate.length-3),
tcid: x.tcid,
configIDDes: x.configIDDes
} }
dateList.push(msg); dateList.push(msg);
} }
...@@ -990,7 +1022,7 @@ export default { ...@@ -990,7 +1022,7 @@ export default {
mapTypeId: google.maps.MapTypeId.ROADMAP //类型:默认的普通二维图块 mapTypeId: google.maps.MapTypeId.ROADMAP //类型:默认的普通二维图块
}; };
map = new google.maps.Map(document.getElementById("map_canvas"), myOptions); map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
console.log(google) // console.log(google)
// 线条设置 // 线条设置
// var polyOptions = { // var polyOptions = {
// strokeColor: '#4a90e2', // 颜色 // strokeColor: '#4a90e2', // 颜色
......
src/components/mall/heeltour.vue
View file @ 0c20c8e6
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-row> </el-row>
<el-row :gutter="17"> <el-row :gutter="17">
<el-col :span="4" v-for='(item,index) in tehuis' :key="index" v-if='index>5'> <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}`" /> <img v-if="item.imgCover!=null&&item.imgCover.length" :src="`${JSON.parse(item.imgCover)[0].Url}`" />
<div class="info-box"> <div class="info-box">
<div class="item-title">{{item.ltName}}</div> <div class="item-title">{{item.ltName}}</div>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<div class="item-box"> <div class="item-box">
<el-row :gutter="17"> <el-row :gutter="17">
<el-col :span="4" v-for="(item,index) in tiaoshui" :key="index"> <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" 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 /> <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`}"> <!-- <div class="seat" :style="{'left':`${(w-100)/2}px`,'top':`${(h-100)/2}px`}">
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<div class="item-box"> <div class="item-box">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6" v-for='(data,index) in item.pageData' :key="index" > <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}`}"> <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" 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 /> <img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
...@@ -295,10 +295,10 @@ export default { ...@@ -295,10 +295,10 @@ export default {
query query
}); });
}, },
goUrl(path,id){ goUrl(path,id,obj){
// detailTwo // detailTwo
path = 'detailTwo' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}`; path=`${path}/${encodeURIComponent(id)}/${obj.tcid}`;
this.$router.push({ path }) this.$router.push({ path })
}, },
loadModuleData(sno){ loadModuleData(sno){
......
src/components/trade/order/index.vue
View file @ 0c20c8e6
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<th>起飞</th> <th>起飞</th>
<th>到达</th> <th>到达</th>
</tr> </tr>
<tr v-for='(x,i) in priceFlight.priceFlight' :key="i"> <tr v-for='(x,i) in trip.currentPriceInfo.priceFlight' :key="i">
<td>{{x.alName}}</td> <td>{{x.alName}}</td>
<td>{{x.flightNumber}}</td> <td>{{x.flightNumber}}</td>
<td>{{x.departureAirPortName}} {{x.startDate}} {{x.departureTime}}</td> <td>{{x.departureAirPortName}} {{x.startDate}} {{x.departureTime}}</td>
...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
<p>团期</p> <p>团期</p>
<div class="place-box"> <div class="place-box">
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"><i class="iconfont icon-icon06"></i>价格： {{priceFlight.b2BMemberPrice.toFixed(2)}}起</el-col> <el-col :span="6"><i class="iconfont icon-icon06"></i>价格： {{trip.currentPriceInfo.b2BMemberPrice.toFixed(2)}}起</el-col>
<el-col :span="6"><i class="iconfont icon-zuowei"></i>剩余席位： <span class="red">{{priceFlight.surplusCSeat+priceFlight.surplusFSeat+priceFlight.surplusYSeat}}</span></el-col> <el-col :span="6"><i class="iconfont icon-zuowei"></i>剩余席位： <span class="red">{{trip.currentPriceInfo.surplusCSeat+trip.currentPriceInfo.surplusFSeat+trip.currentPriceInfo.surplusYSeat}}</span></el-col>
<el-col :span="6"><i class="iconfont icon-lvkehoubu"></i>候补： <span class="red">暂不支持</span></el-col> <el-col :span="6"><i class="iconfont icon-lvkehoubu"></i>候补： <span class="red">暂不支持</span></el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<el-col :span='4'> <el-col :span='4'>
<label>出发： </label> <label>出发： </label>
<el-date-picker size="small" value-format='yyyy-MM-dd' v-model='chosenObj.startDate' type="date" placeholder="选择出发日期" :picker-options="pickerOptions" @change="changeStartDate"> <el-date-picker size="small" value-format='yyyy-MM-dd' v-model='chosenObj.startDate' type="date" placeholder="选择出发日期" :picker-options="pickerOptions" @change="changeStartDate(1)">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
...@@ -266,7 +266,13 @@ export default { ...@@ -266,7 +266,13 @@ export default {
this.calcMoney() this.calcMoney()
}, },
deep:true deep:true
} },
"trip.currentPriceInfo":{
handler(n,o){
this.changeStartDate()
},
deep:true
},
}, },
mounted () { mounted () {
this.getProvince() this.getProvince()
...@@ -283,7 +289,7 @@ export default { ...@@ -283,7 +289,7 @@ export default {
this.chosenObj.startDate=tripDate this.chosenObj.startDate=tripDate
this.changeStartDate() this.changeStartDate()
}, },
changeStartDate(){ changeStartDate(t){
//console.log(this.chosenObj.startDate) //console.log(this.chosenObj.startDate)
if(this.chosenObj.startDate&&this.chosenObj.startDate!=''){ if(this.chosenObj.startDate&&this.chosenObj.startDate!=''){
this.priceList.forEach(x=>{ this.priceList.forEach(x=>{
...@@ -292,40 +298,46 @@ export default { ...@@ -292,40 +298,46 @@ export default {
this.getUnicos() this.getUnicos()
} }
}) })
this.sumSeat=this.priceFlight.surplusCSeat+this.priceFlight.surplusFSeat+this.priceFlight.surplusYSeat this.chosenObj.crCount = 0
this.chosenObj.etbzcCount = 0
this.chosenObj.etzc = 0
this.chosenObj.etbzcCount = 0
this.sumSeat = this.trip.currentPriceInfo.surplusCSeat+this.trip.currentPriceInfo.surplusFSeat+this.trip.currentPriceInfo.surplusYSeat
}
if(t) {
bus.$emit('order-chosen', this.chosenObj.startDate)
} }
}, },
calcMoney(){ calcMoney(){
this.chosenObj.etCount = this.chosenObj.etbzcCount + this.chosenObj.etzc this.chosenObj.etCount = this.chosenObj.etbzcCount + this.chosenObj.etzc
// console.log(this.chosenObj.etbzcCount + '----------'+ this.chosenObj.etzc) // console.log(this.chosenObj.etbzcCount + '----------'+ this.chosenObj.etzc)
// console.log(this.priceFlight.childNoNeedPrice) // console.log(this.priceFlight.childNoNeedPrice)
if(!this.priceFlight.b2BMemberPrice){ if(!this.trip.currentPriceInfo.b2BMemberPrice){
this.priceList.forEach(x=>{ this.priceList.forEach(x=>{
if(x.startDate==this.chosenObj.startDate){ if(x.startDate==this.chosenObj.startDate){
this.priceFlight=x this.priceFlight=x
} }
}) })
} }
let money=this.priceFlight.b2BMemberPrice*this.chosenObj.crCount let money=this.trip.currentPriceInfo.b2BMemberPrice*this.chosenObj.crCount
money+=this.priceFlight.b2BMemberPrice*this.chosenObj.etCount money+=this.trip.currentPriceInfo.b2BMemberPrice*this.chosenObj.etCount
money+=this.priceFlight.babyChargePrice*this.chosenObj.etCount money+=this.trip.currentPriceInfo.babyChargePrice*this.chosenObj.etCount
money+=this.priceFlight.childNeedPrice*this.chosenObj.etzc money+=this.trip.currentPriceInfo.childNeedPrice*this.chosenObj.etzc
if(this.chosenObj.etbzcCount>0) if(this.chosenObj.etbzcCount>0)
money-=this.priceFlight.childNoNeedPrice*this.chosenObj.etbzcCount money-=this.trip.currentPriceInfo.childNoNeedPrice*this.chosenObj.etbzcCount
money+=this.priceFlight.b2BMemberPrice*this.chosenObj.lrCount money+=this.trip.currentPriceInfo.b2BMemberPrice*this.chosenObj.lrCount
money+=this.priceFlight.oldManChargePrice*this.chosenObj.lrCount money+=this.trip.currentPriceInfo.oldManChargePrice*this.chosenObj.lrCount
money+=this.priceFlight.babyPrice*this.chosenObj.yeCount money+=this.trip.currentPriceInfo.babyPrice*this.chosenObj.yeCount
money+=this.priceFlight.singleRoomPrice*this.chosenObj.df money+=this.trip.currentPriceInfo.singleRoomPrice*this.chosenObj.df
let sumCount=this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.lrCount let sumCount=this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.lrCount
money+=this.priceFlight.visaPrice*sumCount money+=this.trip.currentPriceInfo.visaPrice*sumCount
money+=this.priceFlight.otherPrice*sumCount money+=this.trip.currentPriceInfo.otherPrice*sumCount
//money+=this.priceFlight.safeMoney*sumCount
if(this.priceFlight.discountPric && this.priceFlight.discountPric>0){ if(this.trip.currentPriceInfo.discountPric && this.trip.currentPriceInfo.discountPric>0){
this.zaoniao=this.priceFlight.discountPrice*sumCount this.zaoniao=this.trip.currentPriceInfo.discountPrice*sumCount
} }
money-=this.zaoniao money-=this.zaoniao
this.price=money this.price=money
...@@ -333,7 +345,7 @@ export default { ...@@ -333,7 +345,7 @@ export default {
//unicoDep //unicoDep
if(this.chosenObj.unicoDep.city && this.chosenObj.unicoDep.date){ if(this.chosenObj.unicoDep.city && this.chosenObj.unicoDep.date){
this.apipost('sellorder_get_GetUnionTravelPrice',{ this.apipost('sellorder_get_GetUnionTravelPrice',{
TCID:this.priceFlight.tcid, TCID:this.trip.currentPriceInfo.tcid,
StartCityId:this.chosenObj.unicoDep.city[this.chosenObj.unicoDep.city.length-1], StartCityId:this.chosenObj.unicoDep.city[this.chosenObj.unicoDep.city.length-1],
Type:1, Type:1,
CityTime:this.chosenObj.unicoDep.date, CityTime:this.chosenObj.unicoDep.date,
...@@ -349,7 +361,7 @@ export default { ...@@ -349,7 +361,7 @@ export default {
} }
if(this.chosenObj.unicoArr.city && this.chosenObj.unicoArr.date){ if(this.chosenObj.unicoArr.city && this.chosenObj.unicoArr.date){
this.apipost('sellorder_get_GetUnionTravelPrice',{ this.apipost('sellorder_get_GetUnionTravelPrice',{
TCID:this.priceFlight.tcid, TCID:this.trip.currentPriceInfo.tcid,
StartCityId:this.chosenObj.unicoArr.city[this.chosenObj.unicoArr.city.length-1], StartCityId:this.chosenObj.unicoArr.city[this.chosenObj.unicoArr.city.length-1],
Type:1, Type:1,
CityTime:this.chosenObj.unicoArr.date, CityTime:this.chosenObj.unicoArr.date,
...@@ -388,26 +400,26 @@ export default { ...@@ -388,26 +400,26 @@ export default {
} }
}) })
let y=0,f=0,c=0,fcnt=0 let y=0,f=0,c=0,fcnt=0
if(sumSeat>this.priceFlight.surplusYSeat){ if(sumSeat>this.trip.currentPriceInfo.surplusYSeat){
y=this.priceFlight.surplusYSeat y=this.trip.currentPriceInfo.surplusYSeat
sumSeat=this.priceFlight.surplusYSeat-sumSeat sumSeat=this.prictrip.currentPriceInfoeFlight.surplusYSeat-sumSeat
}else{ }else{
y=sumSeat y=sumSeat
sumSeat=0 sumSeat=0
} }
if(sumSeat>0){ if(sumSeat>0){
if(sumSeat>this.priceFlight.surplusFSeat){ if(sumSeat>this.trip.currentPriceInfo.surplusFSeat){
f=this.priceFlight.surplusFSeat f=this.trip.currentPriceInfo.surplusFSeat
sumSeat=this.priceFlight.surplusFSeat-sumSeat sumSeat=this.trip.currentPriceInfo.surplusFSeat-sumSeat
}else{ }else{
f=sumSeat f=sumSeat
sumSeat=0 sumSeat=0
} }
} }
if(sumSeat>0){ if(sumSeat>0){
if(sumSeat>this.priceFlight.surplusYSeat){ if(sumSeat>this.trip.currentPriceInfo.surplusYSeat){
c=this.priceFlight.surplusYSeat c=this.trip.currentPriceInfo.surplusYSeat
sumSeat=this.priceFlight.surplusYSeat-sumSeat sumSeat=this.trip.currentPriceInfo.surplusYSeat-sumSeat
}else{ }else{
c=sumSeat c=sumSeat
sumSeat=0 sumSeat=0
...@@ -421,10 +433,9 @@ export default { ...@@ -421,10 +433,9 @@ export default {
fcnt+=this.chosenObj.dcf+this.chosenObj.df+this.chosenObj.srf fcnt+=this.chosenObj.dcf+this.chosenObj.df+this.chosenObj.srf
//this.priceFlight.surplusCSeat+this.priceFlight.surplusFSeat+this.priceFlight.surplusYSeat
let msg={ let msg={
OrderId:0, OrderId:0,
TCID:this.priceFlight.tcid, TCID:this.trip.currentPriceInfo.tcid,
CustomerType:this.customer.gradeLevel, CustomerType:this.customer.gradeLevel,
GroupType:1, GroupType:1,
ContactName:this.customer.customerName, ContactName:this.customer.customerName,
...@@ -432,8 +443,8 @@ export default { ...@@ -432,8 +443,8 @@ export default {
CustomerId:this.customer.customerId, CustomerId:this.customer.customerId,
DepartureCityId:this.chosenObj.unicoDep.city&&this.chosenObj.unicoDep.city.length>0?this.chosenObj.unicoDep.city[this.chosenObj.unicoDep.city.length-1]:this.trip.startCityId, DepartureCityId:this.chosenObj.unicoDep.city&&this.chosenObj.unicoDep.city.length>0?this.chosenObj.unicoDep.city[this.chosenObj.unicoDep.city.length-1]:this.trip.startCityId,
IsIntermodal:(this.chosenObj.unicoDep.city&&this.chosenObj.unicoDep.city.length>0&&this.chosenObj.unicoDep.date)?1:2, IsIntermodal:(this.chosenObj.unicoDep.city&&this.chosenObj.unicoDep.city.length>0&&this.chosenObj.unicoDep.date)?1:2,
Unit_Price:this.priceFlight.b2BMemberPrice, Unit_Price:this.trip.currentPriceInfo.b2BMemberPrice,
TC_Price:this.priceFlight.b2BMemberPrice, TC_Price:this.trip.currentPriceInfo.b2BMemberPrice,
ManNum:this.chosenObj.crCount, ManNum:this.chosenObj.crCount,
ChirdNum:this.chosenObj.etCount, ChirdNum:this.chosenObj.etCount,
ChirdNeedBedNum:this.chosenObj.etzc, ChirdNeedBedNum:this.chosenObj.etzc,
...@@ -450,7 +461,7 @@ export default { ...@@ -450,7 +461,7 @@ export default {
TradeWay:0, TradeWay:0,
PlatformOrder:'', PlatformOrder:'',
GuestNum:this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.lrCount, GuestNum:this.chosenObj.crCount+this.chosenObj.etCount+this.chosenObj.lrCount,
IsChildrenTour:this.priceFlight.isSupportChildren, IsChildrenTour:this.trip.currentPriceInfo.isSupportChildren,
IsBirdDiscount:this.zaoniao>0?1:2, IsBirdDiscount:this.zaoniao>0?1:2,
PredictRoomNum:fcnt, PredictRoomNum:fcnt,
BigRoomNum:this.chosenObj.dcf, BigRoomNum:this.chosenObj.dcf,
...@@ -526,7 +537,7 @@ export default { ...@@ -526,7 +537,7 @@ export default {
); );
}, },
getUnicos() { getUnicos() {
let msg = {tcid:this.priceFlight.tcid} let msg = {tcid:this.trip.currentPriceInfo.tcid}
this.apipost( this.apipost(
"b2b_get_GetTeamUnionInfo", "b2b_get_GetTeamUnionInfo",
msg, msg,
......
src/router.js
View file @ 0c20c8e6
...@@ -41,7 +41,7 @@ export default new Router({ ...@@ -41,7 +41,7 @@ export default new Router({
} }
}, },
{ {
path: '/detailTwo/:id/', path: '/detailTwo/:id/:tcid',
name: 'detailTwo', name: 'detailTwo',
component: resolve => require(['@/components/mall/detailTwo'], resolve), component: resolve => require(['@/components/mall/detailTwo'], resolve),
meta: { meta: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment