Skip to content

S
SuperMan
Commit d07f3dc9 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents da68d553 fb6e0210
Show whitespace changes
Inline Side-by-side
Showing with 688 additions and 506 deletions
src/components/SalesModule/productQuery.vue
View file @ d07f3dc9
......@@ -644,7 +644,7 @@
<p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p>
<p>{{item.LtName}}</p>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
<p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p>
<p class="d12p" @click="getJourney(item.ConfigID,item.TCID,item.LineName)" :title="item.Title">{{item.Title}}</p>
</el-tooltip>
</div>
</div>
......@@ -2136,11 +2136,11 @@
}, err => {})
},
getJourney(id, title) {
getJourney(id,TCID, title) {
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
that.$refs.comTeam.GetTrip(id,TCID);
});
that.outerVisible = true;
},
......
src/components/commonPage/TravelTripPreview/fiveday.vue
View file @ d07f3dc9
......@@ -88,9 +88,9 @@
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
或同級
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
......@@ -102,7 +102,29 @@
<script>
export default {
props:{
day:{}
day:{},
isDirect: {},
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
}
}
</script>
src/components/commonPage/TravelTripPreview/fourday.vue
View file @ d07f3dc9
......@@ -85,9 +85,9 @@
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
或同級
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
......@@ -97,9 +97,42 @@
</div>
</template>
<script>
export default {
props:{
day:{}
export default {
props: {
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
}
}
</script>
src/components/commonPage/TravelTripPreview/oneday.vue
View file @ d07f3dc9
......@@ -4,8 +4,10 @@
<div class="item big">
<div class="left">
<img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' />
<img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''"
src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''"
src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' />
</div>
<div class="right">
......@@ -63,9 +65,9 @@
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
或同級
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
......@@ -75,9 +77,42 @@
</div>
</template>
<script>
export default {
props:{
day:{}
export default {
props: {
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
},
};
</script>
src/components/commonPage/TravelTripPreview/threeday.vue
View file @ d07f3dc9
......@@ -48,7 +48,8 @@
<el-col :span="16">
<div class="item hor-box">
<div class="image">
<img crossOrigin="Anonymous" :src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
<img crossOrigin="Anonymous"
:src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
</div>
</div>
</el-col>
......@@ -57,7 +58,8 @@
<el-col :span="16">
<div class="item hor-box">
<div class="image">
<img crossOrigin="Anonymous" :src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
<img crossOrigin="Anonymous"
:src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
</div>
</div>
</el-col>
......@@ -118,9 +120,9 @@
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
或同級
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
......@@ -130,9 +132,42 @@
</div>
</template>
<script>
export default {
props:{
day:{}
export default {
props: {
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
}
}
</script>
src/components/commonPage/TravelTripPreview/twoday.vue
View file @ d07f3dc9
......@@ -62,9 +62,9 @@
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
或同級
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
......@@ -74,9 +74,42 @@
</div>
</template>
<script>
export default {
props:{
day:{}
export default {
props: {
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
}
}
</script>
src/components/commonPage/commonTeamInfo.vue
View file @ d07f3dc9
......@@ -22,11 +22,11 @@
</div>
<div class="desc" v-html="item.title"></div>
</div>
<oneday v-if="item.details && item.details.length==1" :day='item'></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item'></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item'></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item'></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item'></fiveday>
<oneday v-if="item.details && item.details.length==1" :day='item' :isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item' :isDirect="isDirect"></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item' :isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item' :isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item' :isDirect="isDirect"></fiveday>
</div>
</div>
</template>
......@@ -42,7 +42,8 @@
return {
tripList: [],
loading: false,
startDate: ""
startDate: "",
isDirect: 1, //是否是直采 0：否，1：是
};
},
components: {
......@@ -79,6 +80,7 @@
if (res.data.data.priceList && res.data.data.priceList.length > 0) {
this.startDate = res.data.data.priceList[0].startDate;
}
this.isDirect = res.data.data.isDirect;
this.tripList = res.data.data.dayList;
this.init();
}
......@@ -219,13 +221,36 @@
dayItem.dayArray = dayArray;
dayList.push(dayItem);
});
this.tripList = dayList;
this.init();
}
},
setDate: function (j) {
let stDate = "";
if (this.priceList && this.priceList.length > 0) {
stDate = this.priceList[0].startDate;
}
if (j === 0) {
return stDate
} else {
if (stDate) {
let d = new Date(stDate)
d = d.getTime(d);
let add = d + ((24 * 60 * 60 * 1000) * j)
let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y + M + D;
} else {
return "";
}
}
},
init() {
this.tripList.forEach((x, j) => {
let useDinnerTypeBy = "";
let useDinnerTypeBy = ''
let jin = [],
jiu = [],
jiu2 = [],
......@@ -234,202 +259,201 @@
tips = [],
activy = [],
can = {
breakfirst: "敬请自理",
lanuch: "敬请自理",
dinner: "敬请自理"
};
breakfirst: '敬请自理',
lanuch: '敬请自理',
dinner: '敬请自理'
}
x.dayArray.forEach((y, index) => {
if (y.type == 7 && y.childItem.title != "") {
if (y.type == 7 && y.childItem.title != '') {
let obj = {
title: y.childItem.title,
content: y.childItem.description,
img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ?
y.childItem.imaArray[0].url : "",
ticketName: "",
img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ? y.childItem.imaArray[0]
.url : '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
dadian.push(obj);
playTimeMinutes: null,
url: ''
}
dadian.push(obj)
} else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
let title = "";
let title = ''
y.childItem.subTraffic.forEach((z, i) => {
title += z.startCityName;
title += z.startCityName
if (z.arrivalType == 1) {
title += '<i class="iconfont icon-feiji"></i>';
title += '<i class="iconfont icon-feiji"></i>'
} else if (z.arrivalType == 2) {
title += '<i class="iconfont icon-bus"></i>';
title += '<i class="iconfont icon-bus"></i>'
} else if (z.arrivalType == 3) {
title += '<i class="iconfont icon-icon31"></i>';
title += '<i class="iconfont icon-icon31"></i>'
} else {
title += '<i class="iconfont icon-gaotiedongche"></i>';
title += '<i class="iconfont icon-gaotiedongche"></i>'
}
if (i + 1 == y.childItem.subTraffic.length) {
title += z.arrivalCityName;
title += z.arrivalCityName
}
});
})
let obj = {
title: title,
content: y.childItem.description,
img: "",
ticketName: "",
img: '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
jiao.push(obj);
} else if (
y.type == 2 &&
y.childItem.couponsName != "" &&
y.childItem.imaArray.length > 0
) {
playTimeMinutes: null,
url: ''
}
jiao.push(obj)
} else if (y.type == 2 && y.childItem.couponsName != '' && y.childItem.imaArray.length > 0) {
let obj = {
title: y.childItem.couponsName,
content: y.childItem.description,
img: y.childItem.imaArray[0].url,
ticketName: y.childItem.couponsTicketName,
playTimeHour: y.childItem.playTimeHour,
playTimeMinutes: y.childItem.playTimeHour
};
jin.push(obj);
} else if (
y.type == 3 &&
y.childItem.hotelName != "" &&
y.childItem.imaArray.length > 0
) {
playTimeMinutes: y.childItem.playTimeMinutes,
scenicJson: y.childItem.scenicJson,
url: y.childItem.url
}
jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
//酒店
let obj = {
title: y.childItem.hotelName,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
content: y.childItem.description,
img: y.childItem.imaArray[0].url,
ticketName: "",
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
jiu.push(obj);
playTimeMinutes: null,
url: y.childItem.url
}
jiu.push(obj)
} else if (y.type == 4) {
if (y.childItem.useDinnerType == "1") {
can.breakfirst = y.childItem.dinnerName;
can.breakfirst = y.childItem.dinnerName
} else if (y.childItem.useDinnerType == "2") {
can.lanuch = y.childItem.dinnerName;
can.lanuch = y.childItem.dinnerName
} else if (y.childItem.useDinnerType == "3") {
can.dinner = y.childItem.dinnerName;
can.dinner = y.childItem.dinnerName
}
} else if (y.type == 5) {
let obj = {
title: "自由活动",
title: '自由活动',
content: y.childItem.description,
img: "",
ticketName: "",
img: '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
activy.push(obj);
playTimeMinutes: null,
url: ''
}
activy.push(obj)
} else if (y.type == 6) {
let obj = {
title: y.childItem.title,
content: y.childItem.description,
img: "",
ticketName: "",
img: '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
tips.push(obj);
playTimeMinutes: null,
url: ''
}
if (y.type == 3) {
jiu2.push(y.childItem.hotelName);
useDinnerTypeBy = y.childItem.useDinnerType;
tips.push(obj)
}
if (y.type == 3) {
jiu2.push({
name: y.childItem.hotelName,
url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
});
if (
can.breakfirst == "敬请自理" &&
useDinnerTypeBy.indexOf("1") != -1
) {
can.breakfirst = "酒店内享用早餐";
useDinnerTypeBy = y.childItem.useDinnerType
}
})
if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
can.breakfirst = '酒店内享用早餐'
} else if (can.breakfirst == '') {
can.breakfirst = '方便游玩敬请自理'
}
if (can.lanuch == "敬请自理" && useDinnerTypeBy.indexOf("2") != -1) {
can.lanuch = "酒店自助";
if (can.lanuch == '敬请自理' && useDinnerTypeBy.indexOf('2') != -1) {
can.lanuch = '酒店自助'
} else if (can.lanuch == '') {
can.lanuch = '方便游玩敬请自理'
}
if (can.dinner == "敬请自理" && useDinnerTypeBy.indexOf("3") != -1) {
can.dinner = "酒店自助";
if (can.dinner == '敬请自理' && useDinnerTypeBy.indexOf('3') != -1) {
can.dinner = '酒店自助'
} else if (can.dinner == '') {
can.dinner = '方便游玩敬请自理'
}
x.can = can;
x.can = can
let details = [];
x.tips = tips;
x.jiu2 = jiu2;
x.tips = tips
x.jiu2 = jiu2
if (jin.length > 0) {
details = jin;
} else if (jiu.length > 0) {
details = jiu;
} else if (dadian.length > 0) {
details = dadian;
details = jin
}
// else if (jiu.length > 0) {
// // details = jiu
// }
else if (dadian.length > 0) {
details = dadian
} else if (jiao.length > 0) {
if (j == this.tripList.length - 1) {
let obj = {
title: "温暖的家",
content: "感谢您参加本次行程，期待下次与您相遇",
img: ""
};
details.push(obj);
title: '温暖的家',
content: '感谢您参加本次行程，期待下次与您相遇',
img: ''
}
details.push(obj)
} else {
details = jiao;
details = jiao
}
} else if (activy.length > 0) {
details = activy;
}
x.title =
dadian.length > 0 ?
dadian[0].title :
jiao.length > 0 ?
jiao[0].title :
"集合出发";
x.details = details;
details = activy
}
x.title = dadian.length > 0 && dadian[0].title && dadian[0].title != '' ? dadian[0].title : (jiao
.length > 0 ? jiao[0].title : '集合出发')
x.details = details
if (x.details.length == 0) {
if (j == 0) {
let obj = {
title: "集合出发",
content: "向着远方的目标出发起飞",
img: "",
ticketName: "",
title: '集合出发',
content: '向着远方的目标出发起飞',
img: '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
details.push(obj);
}
details.push(obj)
} else if (j == this.tripList.length - 1) {
let obj = {
title: "温暖的家",
content: "感谢您参加本次行程，期待下次与您相遇",
img: "",
ticketName: "",
title: '温暖的家',
content: '感谢您参加本次行程，期待下次与您相遇',
img: '',
ticketName: '',
playTimeHour: null,
playTimeMinutes: null
};
details.push(obj);
}
details.push(obj)
}
} else {
if (x.title == "集合出发") {
if (x.title == '集合出发') {
x.details.forEach(xc => {
if (xc.title !== undefined) x.title = xc.title + "~";
});
if (x.title == "集合出发") {
if (j > 0 && j < tripList.length - 1) x.title = "自由活动";
if (xc.title !== undefined)
x.title = xc.title + '~'
})
if (x.title == '集合出发') {
if (j > 0 && j < tripList.length - 1)
x.title = '自由活动'
} else {
x.title = x.title.substring(0, x.title.length - 1);
}
x.title = x.title.substring(0, x.title.length - 1)
}
}
x.islast = j + 1 == this.tripList.length;
this.$set(this.tripList, j, x);
});
for (let i = this.tripList.length - 1; i >= 0; i--) {
if (i == 0) this.tripList[i].can.breakfirst = "敬请自理";
else {
this.tripList[i].can.breakfirst = this.tripList[i - 1].can.breakfirst;
if (
this.tripList[i].lineId != 5 &&
this.tripList[i].can.breakfirst == "敬请自理"
)
this.tripList[i].can.breakfirst = "酒店内享用早餐";
}
}
x.islast = (j + 1) == this.tripList.length
this.$set(this.tripList, j, x)
x.dateTime = this.setDate(j);
})
}
}
};
......
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