Skip to content

A
Athena
Commit 335f6169 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

# Conflicts:
#	src/components/global/head.vue
parents 2ef323c9 8bf277fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 292 additions and 154 deletions
src/components/global/confirmationOrderDownLoad.vue
View file @ 335f6169
......@@ -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>
......@@ -1925,6 +1925,13 @@
handler: function(val, oldVal) {
},
deep: true
},
"sonData.currentPriceInfo.startDate":{
handler: function(val, oldVal) {
// console.log("sonData.currentPriceInfo.startDate", val)
this.init()
},
deep: true
}
},
data() {
......@@ -1952,7 +1959,7 @@
travelOrderFlightList: []
},
editMsgShow: false,
pdfLoading: true,
pdfLoading: false,
vshowTCNUM: this.TripLayer.vshowTCNUM === undefined ? false : this.TripLayer.vshowTCNUM === 'true',
list: [],
tripList: [],
......@@ -1966,23 +1973,13 @@
orderTripdiff: {},
title: '',
isDirect: 1, //是否是直采 0：否，1：是
blockShow: false,
}
},
mounted() {
this.orderId = this.$route.query.orderId;
this.isopOperation = this.$route.query.isopOperation;
this.init();
this.initAirlines()
setTimeout(() => {
this.appendParent()
}, 2000)
this.$nextTick(function () {
this.pdfLoading = false;
let imgs = document.getElementsByTagName('img');
for (let i = 0; i < imgs.length; i++) {
document.getElementsByTagName('img')[i].removeAttribute('crossOrigin')
}
})
},
methods: {
//保存基础数据
......@@ -2104,7 +2101,7 @@
},
setDate: function (j) {
let stDate = this.priceList[0].startDate
let stDate = this.sonData.currentPriceInfo.startDate
if (j === 0) {
return stDate
} else {
......@@ -2162,7 +2159,7 @@
}
this.pdfLoading = false
}).catch(err => {
console.log(err)
// console.log(err)
})
},
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
......@@ -2176,8 +2173,8 @@
},
init() {
if (true) {
let data = this.sonData
this.orderTripdiff = data.orderTripdiff;
let data = JSON.parse(JSON.stringify(this.sonData))
this.orderTripdiff = data.currentPriceInfo.priceFlight;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
}
......@@ -2238,16 +2235,18 @@
document.title = this.title;
//初始化行程
this.initTrip(data);
this.initAirlines()
}
},
//初始化行程
initTrip(data) {
this.blockShow = false
this.tripList = data.dayList;
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 +2255,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 {
......@@ -2462,9 +2461,10 @@
}
}
x.islast = (j + 1) == this.tripList.length
x.dateTime = this.setDate(j)
this.$set(this.tripList, j, x)
x.dateTime = this.setDate(j);
})
// console.log("this.tripList",this.tripList)
},
//上移下移(IsUp:0上移，1下移)
......@@ -2596,8 +2596,8 @@
.travelControlTrip {
margin: 0px !important;
padding: 0px !important;
position: fixed !important;
left:-999px !important;
position: fixed !important;
left:-999px !important;
}
@media print {
......
src/components/global/head.vue
View file @ 335f6169
......@@ -52,7 +52,7 @@
<!-- <el-menu-item index="5"><a href="javascript:void(0);">机票</a></el-menu-item>
<el-menu-item index="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
<el-menu-item index="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
<el-menu-item index="4"><a href="javascript:void(0);">餐厅</a></el-menu-item>
<el-menu-item index="3"><a href="javascript:void(0);">景区</a></el-menu-item>
<el-menu-item index="6"><a href="javascript:void(0);">签证</a></el-menu-item> -->
......
src/components/mall/calendar.vue
View file @ 335f6169
......@@ -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); //当前年份
......@@ -136,7 +147,6 @@ export default {
for (var i in this.priceData) {
var price = this.priceData[i];
var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
console.log(dayIndex)
var dayDict = daysData[Number(dayIndex)-1];
dayDict.price = price.price;
if(dayIndex<strDate&&strMonth==currentMonth){
......
src/components/mall/detailTwo.vue
View file @ 335f6169
This diff is collapsed.
src/components/mall/heeltour.vue
View file @ 335f6169
......@@ -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/components/trade/order/index.vue
View file @ 335f6169
This diff is collapsed.
src/plugins/index.js
View file @ 335f6169
......@@ -12,9 +12,9 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function() {
// var domainUrl = "http://test_reborn.oytour.com";//主域名
// var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://reborn.oytour.com"; //主域名
// var domainUrl = "http://192.168.2.214:8082"//主域名
let domainUrl = "http://192.168.2.16:8083"; //刘东主域名
// let domainUrl = "http://192.168.2.16:8083"; //刘东主域名
if (this.isOnline()) {
if(window.location.host.indexOf('viitto.com')!=-1)
domainUrl = "http://test.viitto.com"
......@@ -27,9 +27,48 @@ export default {
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
javaUrl: "http://192.168.2.16:9000",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
};
return obj;
},
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
this.$http.post(apiurl, postData, {
responseType: 'arraybuffer'
}).then((res) => {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) {});
},
//消息成功提示
Vue.prototype.Success = function(msg) {
this.$message({
......
src/router.js
View file @ 335f6169
......@@ -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: {
......
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