Skip to content

S
SuperMan
Commit 57e264f2 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 2e3a9245 d6519048
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 52 deletions
index.html
View file @ 57e264f2
......@@ -31,7 +31,7 @@
});
</script>
<script type="text/javascript" src="http://www.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&libraries=geometry&language=zh_CN"></script>
<title>四川和平国际旅行社</title>
<title></title>
</head>
<body>
<div id="app">
......
src/assets/css/travel/TravelPreview.css
View file @ 57e264f2
......@@ -497,14 +497,14 @@
}
.detail-box .expense{
/* display: flex; */
margin: 30px 0;
/* margin: 30px 0; */
}
.detail-box .expense p{
margin: 0;
}
.detail-box .expense .left{
width: 120px;
text-align: center;
text-align: left;
font-size: '18px';
font-family: 'PingFangR';
}
......
src/assets/utils/tripUtils.js
View file @ 57e264f2
......@@ -637,6 +637,41 @@ var tripUtils = {
}
return "";
},
/*
* 获取交通城市编号,逗号分隔【一日游】
* 默认取当天上一个交通的结束城市编号，
* 如果当天没有取上一天结束城市编号
* 参数说明:DayList-行程数组，currentDayIndex-天数，numIndex:索引,isCompareIndex:是否比较索引(当前的数据需要验证索引，前一天的数据不需要验证索引)
*/
NewOneDayTripGetCityId: function (DayList, currentDayIndex) {
var cityIdStr = "";
if (DayList != null && DayList.length > 0) {
DayList.forEach((dayItem, dayIndex) => {
if (dayIndex == currentDayIndex) {
if (dayItem.dayArray != null && dayItem.dayArray.length > 0) {
dayItem.dayArray.forEach(subItem => {
if (subItem.Type == "1" && subItem.childItem.SubTraffic && subItem.childItem.SubTraffic.length > 0) {
subItem.childItem.SubTraffic.forEach(childItem => {
cityIdStr += childItem.StartCityId + "," + childItem.ArrivalCityId + ","
})
}
});
}
}
});
cityIdStr = cityIdStr.substring(0, cityIdStr.lastIndexOf(','));
if (currentDayIndex == 0) {
return cityIdStr;
} else if (currentDayIndex != 0) {
if (cityIdStr != "") {
return cityIdStr;
} else {
return tripUtils.NewTripGetCityId(DayList, currentDayIndex - 1);
}
}
}
return "";
},
//获取距离当前项目最近的一天交通的所有城市(查询，酒店、餐厅、景点使用)
GetCityIdArray: function (DayList, dayNum, currentIndex, isCompareIndex) {
var array = [];
......
src/components/Details.vue
View file @ 57e264f2
......@@ -830,8 +830,9 @@ export default {
},
filterRouter(){
let that=this
let userInfo = this.getLocalStorage();
this.$router.beforeEach((to, from, next) => {
document.title = to.meta.title ? to.meta.title+'-四川和平国际旅行社' : '四川和平国际旅行社'
document.title = to.meta.title ? to.meta.title : ''
if(to.path=="/ModifyVisaProduct"){
this.reloadpage();
}
......@@ -910,7 +911,7 @@ export default {
}
});
this.$nextTick(function(){
  document.title = this.$route.meta.title ? this.$route.meta.title + '-四川和平国际旅行社' : '四川和平国际旅行社'
  document.title = this.$route.meta.title ? this.$route.meta.title : ''
 })
}
},
......
src/components/SalesconfirmationOrder.vue
View file @ 57e264f2
......@@ -433,15 +433,15 @@
</div>
<div v-if='vshowE' class="expense">
<div class="left">费用包含</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.feeInclude"></div>
</div>
<div class="left" style="margin: 15px 0 15px 0;">费用不包含</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.feeNonInclude"></div>
</div>
</div>
<div class="expense" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
<div class="expense" style="margin-top:30px;" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
<div class="left">自理费用</div>
<div class="right">
<table class="expense-table" cellspacing=0 cellpadding=0>
......@@ -471,7 +471,7 @@
<div class="left">
<!-- 购物协议 -->
</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.shopRemark"></div>
</div>
</div>
......@@ -504,13 +504,13 @@
</div>
<div class="expense" v-if="feature.importantTip!=''&&vshowG">
<div class="left">重要提示</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.importantTip"></div>
</div>
</div>
<div v-if='vshowG' class="expense">
<div v-if='vshowG' class="expense" style="margin-top:30px;">
<div class="left">温馨提示</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.warmTip"></div>
</div>
</div>
......@@ -524,7 +524,7 @@
</div>
<div v-if='vshowH' class="expense">
<div class="left">签证须知</div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.visaRemark"></div>
</div>
</div>
......@@ -535,7 +535,7 @@
</div>
<div v-if='vshowI' class="expense">
<div class="left"></div>
<div class="right">
<div class="right" style="text-indent:10px">
<div v-html="feature.b2BRemark"></div>
</div>
</div>
......@@ -970,6 +970,10 @@
this.pdfLoading = true
let pageData = document.getElementById('pdfNode').innerHTML
let urlObj = this.domainManager()
let configId = this.$route.query.configId;
let tcid = this.$route.query.tcid;
let cityId = this.$route.query.cityId;
let orderId = this.$route.query.orderId;
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -978,7 +982,7 @@
url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
data: {
"msg": pageData,
sign: "sale_pdf"
sign: "sale_pdf"+"C"+configId+"_T"+tcid+"_CTY"+cityId+"_OD"+orderId
}
}).then(res => {
if (res.data.resultCode === 1) {
......
src/components/newConfimationOrder.vue
View file @ 57e264f2
......@@ -333,8 +333,8 @@
<div>
<input type="button" value="行程下载" class="newTripDownbtn"
@click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" value="WORD手机版" @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游',0)" class="newTripDownbtn"/>
<input type="button" value="WORD电脑版" @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游',1)" class="newTripDownbtn"/>
<input type="button" value="WORD手机版" @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游_手机版',0)" class="newTripDownbtn"/>
<input type="button" value="WORD电脑版" @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游_PC版',1)" class="newTripDownbtn"/>
</div>
<div class="newTripCom_Img">
<img :src="lineTripFeatureTopBg" alt="" />
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 57e264f2
......@@ -842,12 +842,9 @@
let userInfo = this.getLocalStorage();
var B2BDomain = userInfo.B2BDomain;
let configId = this.NewConfigId;
window.open(
B2BDomain + "/#/detailTwo/" +
encodeURIComponent(configId) + '/' + 0 +
"/preview",
"_blank"
);
var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(configId), 0);
},
},
updated: function () {
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ 57e264f2
......@@ -9,7 +9,6 @@
<el-form :model="subConfig" :rules="Rules" ref="dayTripForm">
<div class="TravelDaysTrip" :class="{'foldHeight':isFold==1}">
<span class="TMTitle"><i></i>{{$t('sm.xianluxingcheng')}} </span>
<!-- <span class="foldList" style="margin-left:20px" @click="goUrl('TravelPreview')">预览行程</span> -->
<div class="DaysTripTop">
<span class="TDTextspan">{{$t('visa.v_xcdays')}}</span>
<span class="TDInputspan">
......@@ -107,11 +106,11 @@
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.hotel">
<span v-if="IsDirect==1">
<hotelTrip v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
<hotelTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></hotelTrip>
<!---->
<hotelTripV2 v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
<hotelTripV2 v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length" style="display:none;"></hotelTripV2>
</span>
......@@ -120,13 +119,13 @@
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.scenic">
<span v-if="IsDirect==1">
<scienTrip v-bind:subItemObj="subItem" v-bind:DefaultList="scenicSameList" v-bind:subIndex="subIndex"
<scienTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="scenicSameList" v-bind:subIndex="subIndex"
v-bind:index="index" :isOpenGroup="isOpenGroup" v-bind:subTotalIndex="item.dayArray.length"></scienTrip>
</span>
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.dinner">
<span v-if="IsDirect==1">
<dinnerTrip v-bind:subItemObj="subItem" v-bind:DefaultList="dinnerSameList" v-bind:subIndex="subIndex"
<dinnerTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="dinnerSameList" v-bind:subIndex="subIndex"
v-bind:HotelList="HotelList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></dinnerTrip>
</span>
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 57e264f2
......@@ -760,12 +760,9 @@
let userInfo = this.getLocalStorage()
var B2BDomain = userInfo.B2BDomain
let configId = this.NewConfigId
window.open(
B2BDomain + '/#/detailTwo/' +
encodeURIComponent(configId) + '/' + 0 +
'/preview',
'_blank'
)
// var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(configId), 0);
},
//获取地图
getMapList() {
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ 57e264f2
......@@ -26,7 +26,7 @@
<div>
<span class="comTravelLeft">时间</span>
<span>
<el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:90px"></el-input>
<el-input v-model="subItemObj.childItem.TimeStr" @keyup.native="checkTime(subItemObj.childItem,'TimeStr')" placeholder="时间信息" style="width:90px"></el-input>
</span>
<span style="margin-left:26px;">{{$t('commonPickUp.Pick_resName')}}</span>
<span>
......@@ -168,7 +168,8 @@
"HotelList",
"index",
"isOpenGroup",
"subTotalIndex"
"subTotalIndex",
"DayList",
],
data() {
var TimeTypeValidate = (rule, value, callback) => {
......@@ -304,6 +305,14 @@
"my-edit": MyEdit
},
methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取餐厅列表
getDinnerList(event) {
if (event) {
......@@ -311,7 +320,7 @@
var msg = {
IsGetPic: 1,
IsGetFeature: 1,
QCity: this.subItemObj.childItem.QCity
QCity: this.getCityIdStr()
};
this.apipost(
"dining_post_GetLineDinnerList",
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ 57e264f2
......@@ -182,7 +182,8 @@
"subIndex",
"isOpenGroup",
"subTotalIndex",
"TimeTypeList"
"TimeTypeList",
"DayList",
],
data() {
var TimeTypeValidate = (rule, value, callback) => {
......@@ -257,13 +258,21 @@
"my-edit": MyEdit
},
methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取酒店列表
getHotelList(event) {
if (event) {
var msg = {
IsGetPic: 1,
IsGetRemark: 1,
QCity: this.subItemObj.childItem.QCity
QCity: this.getCityIdStr()
};
this.apipost(
"hotel_post_GetLineHotelList",
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct_V2.vue
View file @ 57e264f2
......@@ -152,7 +152,8 @@
"subIndex",
"isOpenGroup",
"subTotalIndex",
"TimeTypeList"
"TimeTypeList",
"DayList",
],
data() {
var TimeTypeValidate = (rule, value, callback) => {
......@@ -228,13 +229,21 @@
comCheckHotelV2,
},
methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取酒店列表
getHotelList(event) {
if (event) {
var msg = {
IsGetPic: 1,
IsGetRemark: 1,
QCity: this.subItemObj.childItem.QCity
QCity: this.getCityIdStr()
};
this.apipost(
"hotel_post_GetLineHotelList",
......
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ 57e264f2
......@@ -35,7 +35,7 @@
<div>
<span class="comTravelLeft">时间</span>
<span>
<el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:90px"></el-input>
<el-input v-model="subItemObj.childItem.TimeStr" @keyup.native="checkTime(subItemObj.childItem,'TimeStr')" placeholder="时间信息" style="width:90px"></el-input>
</span>
<span style="margin-left:20px;">{{$t('sm.scenChoosse')}}</span>
<span>
......@@ -57,14 +57,6 @@
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟
</div>
<!-- <div class="TDRightPlan">
<label class="comTravelLeft">{{$t('scen.sc_etTime')}}</label>
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟
</div> -->
</div>
</div>
<div class="TP_edit">
......@@ -171,7 +163,8 @@
"index",
"isOpenGroup",
"subTotalIndex",
"TimeTypeList"
"TimeTypeList",
"DayList",
],
data() {
var TimeTypeValidate = (rule, value, callback) => {
......@@ -222,6 +215,14 @@
"my-edit": MyEdit
},
methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取景区列表
getQScenicList(event) {
if (event) {
......@@ -229,7 +230,7 @@
var msg = {
IsGetPic: 1,
IsGetFeature: 1,
QCity: this.subItemObj.childItem.QCity
QCity: this.getCityIdStr()
};
this.apipost(
"ticketcoupons_post_GetLineScienList",
......
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