Commit 57e264f2 authored by 黄媛媛's avatar 黄媛媛
parents 2e3a9245 d6519048
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
}); });
</script> </script>
<script type="text/javascript" src="http://www.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&libraries=geometry&language=zh_CN"></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> </head>
<body> <body>
<div id="app"> <div id="app">
......
...@@ -497,14 +497,14 @@ ...@@ -497,14 +497,14 @@
} }
.detail-box .expense{ .detail-box .expense{
/* display: flex; */ /* display: flex; */
margin: 30px 0; /* margin: 30px 0; */
} }
.detail-box .expense p{ .detail-box .expense p{
margin: 0; margin: 0;
} }
.detail-box .expense .left{ .detail-box .expense .left{
width: 120px; width: 120px;
text-align: center; text-align: left;
font-size: '18px'; font-size: '18px';
font-family: 'PingFangR'; font-family: 'PingFangR';
} }
......
...@@ -637,6 +637,41 @@ var tripUtils = { ...@@ -637,6 +637,41 @@ var tripUtils = {
} }
return ""; 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) { GetCityIdArray: function (DayList, dayNum, currentIndex, isCompareIndex) {
var array = []; var array = [];
......
...@@ -830,8 +830,9 @@ export default { ...@@ -830,8 +830,9 @@ export default {
}, },
filterRouter(){ filterRouter(){
let that=this let that=this
let userInfo = this.getLocalStorage();
this.$router.beforeEach((to, from, next) => { 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"){ if(to.path=="/ModifyVisaProduct"){
this.reloadpage(); this.reloadpage();
} }
...@@ -910,7 +911,7 @@ export default { ...@@ -910,7 +911,7 @@ export default {
} }
}); });
this.$nextTick(function(){ this.$nextTick(function(){
  document.title = this.$route.meta.title ? this.$route.meta.title + '-四川和平国际旅行社' : '四川和平国际旅行社'   document.title = this.$route.meta.title ? this.$route.meta.title : ''
 })  })
} }
}, },
......
...@@ -433,15 +433,15 @@ ...@@ -433,15 +433,15 @@
</div> </div>
<div v-if='vshowE' class="expense"> <div v-if='vshowE' class="expense">
<div class="left">费用包含</div> <div class="left">费用包含</div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.feeInclude"></div> <div v-html="feature.feeInclude"></div>
</div> </div>
<div class="left" style="margin: 15px 0 15px 0;">费用不包含</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 v-html="feature.feeNonInclude"></div>
</div> </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="left">自理费用</div>
<div class="right"> <div class="right">
<table class="expense-table" cellspacing=0 cellpadding=0> <table class="expense-table" cellspacing=0 cellpadding=0>
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
<div class="left"> <div class="left">
<!-- 购物协议 --> <!-- 购物协议 -->
</div> </div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.shopRemark"></div> <div v-html="feature.shopRemark"></div>
</div> </div>
</div> </div>
...@@ -504,13 +504,13 @@ ...@@ -504,13 +504,13 @@
</div> </div>
<div class="expense" v-if="feature.importantTip!=''&&vshowG"> <div class="expense" v-if="feature.importantTip!=''&&vshowG">
<div class="left">重要提示</div> <div class="left">重要提示</div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.importantTip"></div> <div v-html="feature.importantTip"></div>
</div> </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="left">温馨提示</div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.warmTip"></div> <div v-html="feature.warmTip"></div>
</div> </div>
</div> </div>
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
</div> </div>
<div v-if='vshowH' class="expense"> <div v-if='vshowH' class="expense">
<div class="left">签证须知</div> <div class="left">签证须知</div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.visaRemark"></div> <div v-html="feature.visaRemark"></div>
</div> </div>
</div> </div>
...@@ -535,7 +535,7 @@ ...@@ -535,7 +535,7 @@
</div> </div>
<div v-if='vshowI' class="expense"> <div v-if='vshowI' class="expense">
<div class="left"></div> <div class="left"></div>
<div class="right"> <div class="right" style="text-indent:10px">
<div v-html="feature.b2BRemark"></div> <div v-html="feature.b2BRemark"></div>
</div> </div>
</div> </div>
...@@ -970,6 +970,10 @@ ...@@ -970,6 +970,10 @@
this.pdfLoading = true this.pdfLoading = true
let pageData = document.getElementById('pdfNode').innerHTML let pageData = document.getElementById('pdfNode').innerHTML
let urlObj = this.domainManager() 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({ this.$http({
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
...@@ -978,7 +982,7 @@ ...@@ -978,7 +982,7 @@
url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo', url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
data: { data: {
"msg": pageData, "msg": pageData,
sign: "sale_pdf" sign: "sale_pdf"+"C"+configId+"_T"+tcid+"_CTY"+cityId+"_OD"+orderId
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
...@@ -333,8 +333,8 @@ ...@@ -333,8 +333,8 @@
<div> <div>
<input type="button" value="行程下载" class="newTripDownbtn" <input type="button" value="行程下载" class="newTripDownbtn"
@click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> @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+'日游_手机版',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+'日游_PC版',1)" class="newTripDownbtn"/>
</div> </div>
<div class="newTripCom_Img"> <div class="newTripCom_Img">
<img :src="lineTripFeatureTopBg" alt="" /> <img :src="lineTripFeatureTopBg" alt="" />
......
...@@ -842,12 +842,9 @@ ...@@ -842,12 +842,9 @@
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
var B2BDomain = userInfo.B2BDomain; var B2BDomain = userInfo.B2BDomain;
let configId = this.NewConfigId; let configId = this.NewConfigId;
window.open(
B2BDomain + "/#/detailTwo/" + var B2BDomain = this.CurrentUserInfo.B2BDomain;
encodeURIComponent(configId) + '/' + 0 + this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(configId), 0);
"/preview",
"_blank"
);
}, },
}, },
updated: function () { updated: function () {
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<el-form :model="subConfig" :rules="Rules" ref="dayTripForm"> <el-form :model="subConfig" :rules="Rules" ref="dayTripForm">
<div class="TravelDaysTrip" :class="{'foldHeight':isFold==1}"> <div class="TravelDaysTrip" :class="{'foldHeight':isFold==1}">
<span class="TMTitle"><i></i>{{$t('sm.xianluxingcheng')}} </span> <span class="TMTitle"><i></i>{{$t('sm.xianluxingcheng')}} </span>
<!-- <span class="foldList" style="margin-left:20px" @click="goUrl('TravelPreview')">预览行程</span> -->
<div class="DaysTripTop"> <div class="DaysTripTop">
<span class="TDTextspan">{{$t('visa.v_xcdays')}}</span> <span class="TDTextspan">{{$t('visa.v_xcdays')}}</span>
<span class="TDInputspan"> <span class="TDInputspan">
...@@ -107,11 +106,11 @@ ...@@ -107,11 +106,11 @@
</div> </div>
<div v-if="subItem.Type==$tripUtils.TypeKey.hotel"> <div v-if="subItem.Type==$tripUtils.TypeKey.hotel">
<span v-if="IsDirect==1"> <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:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></hotelTrip> 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:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length" style="display:none;"></hotelTripV2> v-bind:subTotalIndex="item.dayArray.length" style="display:none;"></hotelTripV2>
</span> </span>
...@@ -120,13 +119,13 @@ ...@@ -120,13 +119,13 @@
</div> </div>
<div v-if="subItem.Type==$tripUtils.TypeKey.scenic"> <div v-if="subItem.Type==$tripUtils.TypeKey.scenic">
<span v-if="IsDirect==1"> <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> v-bind:index="index" :isOpenGroup="isOpenGroup" v-bind:subTotalIndex="item.dayArray.length"></scienTrip>
</span> </span>
</div> </div>
<div v-if="subItem.Type==$tripUtils.TypeKey.dinner"> <div v-if="subItem.Type==$tripUtils.TypeKey.dinner">
<span v-if="IsDirect==1"> <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:HotelList="HotelList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></dinnerTrip> v-bind:subTotalIndex="item.dayArray.length"></dinnerTrip>
</span> </span>
......
...@@ -760,12 +760,9 @@ ...@@ -760,12 +760,9 @@
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
var B2BDomain = userInfo.B2BDomain var B2BDomain = userInfo.B2BDomain
let configId = this.NewConfigId let configId = this.NewConfigId
window.open( // var B2BDomain = this.CurrentUserInfo.B2BDomain;
B2BDomain + '/#/detailTwo/' + this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(configId), 0);
encodeURIComponent(configId) + '/' + 0 +
'/preview',
'_blank'
)
}, },
//获取地图 //获取地图
getMapList() { getMapList() {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div> <div>
<span class="comTravelLeft">时间</span> <span class="comTravelLeft">时间</span>
<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>
<span style="margin-left:26px;">{{$t('commonPickUp.Pick_resName')}}</span> <span style="margin-left:26px;">{{$t('commonPickUp.Pick_resName')}}</span>
<span> <span>
...@@ -168,7 +168,8 @@ ...@@ -168,7 +168,8 @@
"HotelList", "HotelList",
"index", "index",
"isOpenGroup", "isOpenGroup",
"subTotalIndex" "subTotalIndex",
"DayList",
], ],
data() { data() {
var TimeTypeValidate = (rule, value, callback) => { var TimeTypeValidate = (rule, value, callback) => {
...@@ -304,6 +305,14 @@ ...@@ -304,6 +305,14 @@
"my-edit": MyEdit "my-edit": MyEdit
}, },
methods: { methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取餐厅列表 //获取餐厅列表
getDinnerList(event) { getDinnerList(event) {
if (event) { if (event) {
...@@ -311,7 +320,7 @@ ...@@ -311,7 +320,7 @@
var msg = { var msg = {
IsGetPic: 1, IsGetPic: 1,
IsGetFeature: 1, IsGetFeature: 1,
QCity: this.subItemObj.childItem.QCity QCity: this.getCityIdStr()
}; };
this.apipost( this.apipost(
"dining_post_GetLineDinnerList", "dining_post_GetLineDinnerList",
......
...@@ -182,7 +182,8 @@ ...@@ -182,7 +182,8 @@
"subIndex", "subIndex",
"isOpenGroup", "isOpenGroup",
"subTotalIndex", "subTotalIndex",
"TimeTypeList" "TimeTypeList",
"DayList",
], ],
data() { data() {
var TimeTypeValidate = (rule, value, callback) => { var TimeTypeValidate = (rule, value, callback) => {
...@@ -257,13 +258,21 @@ ...@@ -257,13 +258,21 @@
"my-edit": MyEdit "my-edit": MyEdit
}, },
methods: { methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取酒店列表 //获取酒店列表
getHotelList(event) { getHotelList(event) {
if (event) { if (event) {
var msg = { var msg = {
IsGetPic: 1, IsGetPic: 1,
IsGetRemark: 1, IsGetRemark: 1,
QCity: this.subItemObj.childItem.QCity QCity: this.getCityIdStr()
}; };
this.apipost( this.apipost(
"hotel_post_GetLineHotelList", "hotel_post_GetLineHotelList",
......
...@@ -152,7 +152,8 @@ ...@@ -152,7 +152,8 @@
"subIndex", "subIndex",
"isOpenGroup", "isOpenGroup",
"subTotalIndex", "subTotalIndex",
"TimeTypeList" "TimeTypeList",
"DayList",
], ],
data() { data() {
var TimeTypeValidate = (rule, value, callback) => { var TimeTypeValidate = (rule, value, callback) => {
...@@ -228,13 +229,21 @@ ...@@ -228,13 +229,21 @@
comCheckHotelV2, comCheckHotelV2,
}, },
methods: { methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取酒店列表 //获取酒店列表
getHotelList(event) { getHotelList(event) {
if (event) { if (event) {
var msg = { var msg = {
IsGetPic: 1, IsGetPic: 1,
IsGetRemark: 1, IsGetRemark: 1,
QCity: this.subItemObj.childItem.QCity QCity: this.getCityIdStr()
}; };
this.apipost( this.apipost(
"hotel_post_GetLineHotelList", "hotel_post_GetLineHotelList",
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div> <div>
<span class="comTravelLeft">时间</span> <span class="comTravelLeft">时间</span>
<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>
<span style="margin-left:20px;">{{$t('sm.scenChoosse')}}</span> <span style="margin-left:20px;">{{$t('sm.scenChoosse')}}</span>
<span> <span>
...@@ -57,14 +57,6 @@ ...@@ -57,14 +57,6 @@
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input> @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟 &nbsp;&nbsp;分钟
</div> </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> </div>
<div class="TP_edit"> <div class="TP_edit">
...@@ -171,7 +163,8 @@ ...@@ -171,7 +163,8 @@
"index", "index",
"isOpenGroup", "isOpenGroup",
"subTotalIndex", "subTotalIndex",
"TimeTypeList" "TimeTypeList",
"DayList",
], ],
data() { data() {
var TimeTypeValidate = (rule, value, callback) => { var TimeTypeValidate = (rule, value, callback) => {
...@@ -222,6 +215,14 @@ ...@@ -222,6 +215,14 @@
"my-edit": MyEdit "my-edit": MyEdit
}, },
methods: { methods: {
//获取交通城市
getCityIdStr() {
var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
this.DayList,
this.index,
);
return cityIdStr;
},
//获取景区列表 //获取景区列表
getQScenicList(event) { getQScenicList(event) {
if (event) { if (event) {
...@@ -229,7 +230,7 @@ ...@@ -229,7 +230,7 @@
var msg = { var msg = {
IsGetPic: 1, IsGetPic: 1,
IsGetFeature: 1, IsGetFeature: 1,
QCity: this.subItemObj.childItem.QCity QCity: this.getCityIdStr()
}; };
this.apipost( this.apipost(
"ticketcoupons_post_GetLineScienList", "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