Skip to content

S
SuperMan
Commit e5ada92a authored by 吴春's avatar 吴春
Browse files
Options

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

parents ec63a091 233ac211
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 43 deletions
src/components/index.vue
View file @ e5ada92a
...@@ -1917,45 +1917,23 @@ ...@@ -1917,45 +1917,23 @@
} }
}, },
testApi() { testApi() {
// var postMsg = {}; var postMsg = {};
// var cmd = ""; var cmd = "";
// cmd = "AirTicket_get_GetTicketProduct"; cmd = "AirTicket_get_GetTicketProduct";
// postMsg = { postMsg = {
// StartDate: "2023-09-28", //开始日期 StartDate: "2023-09-28", //开始日期
// EndDate: "2023-12-31", //结束日期 EndDate: "2023-12-31", //结束日期
// DepartCityId: 343, //出发城市(西安) DepartCityId: 343, //出发城市(西安)
// ArriveCityId: 653, //到达城市(东京) ArriveCityId: 653, //到达城市(东京)
// AirLineID: 0, //航空公司编号 AirLineID: 0, //航空公司编号
// TicketType: 0, //类型(1-单程，2-往返) TicketType: 0, //类型(1-单程，2-往返)
// } }
// // cmd = "sellorder_post_SetOrderInfoForAirTicket"; this.apipost(
// // postMsg = { cmd, postMsg,
// // OrderId: 0, //新增传0 res => {
// // AirticketId:0,//选中的机票编号 console.log("testApi", res);
// // TCID: 18024, //团期编号 }
// // CustomerId: 23435, //同行Id（461671400@qq.com） );
// // ManNum: 1,//成人
// // BabyNum: 1,//婴儿
// // GuestNum: 2,//总人数
// // YSeatNum: 1, //经济舱
// // FSeatNum: 0, //头等舱
// // ESeatNum: 0, //商务舱
// // OrderSource: 5, //小程序
// // Unit_Price: 3580, //单价
// // PreferPrice: 7160, //应收
// // GuestList: [{
// // SurName: "HK",
// // IdCard: "IdCard",
// // MobilePhone: "13551126755",
// // }],
// // PlaceOrderFrom:1,//下单平台
// // };
// this.apipost(
// cmd, postMsg,
// res => {
// console.log("testApi", res);
// }
// );
}, },
//测试方法 //测试方法
testEmp() { testEmp() {
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ e5ada92a
...@@ -28,9 +28,12 @@ ...@@ -28,9 +28,12 @@
</div> </div>
</div> </div>
<!-- 一张图 1-单张图，2-多张图--> <!-- 一张图 1-单张图，2-多张图-->
<template v-if="item.TitleObj.ShowTripType==1||(item.TitleObj.ShowTripType==2&&item.ScenicArray.length==1)||item.ScenicArray.length==0"> <template v-if="
(item.TitleObj.ShowTripType==2&&(item.ScenicArray.length==1||item.ScenicArray.length==0))
||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
(item.ScenicArray.length>0||item.ScenicArray.length==0))">
<div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 0 32px;"> <div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 0 32px;">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden"> <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden" style="margin-top: 0;">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}"> <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"> <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
...@@ -83,7 +86,7 @@ ...@@ -83,7 +86,7 @@
</div> </div>
</div> </div>
</template> </template>
<template v-if="item.TitleObj.ShowTripType==2"> <template v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1">
<div class="column travelDaysMasterMap2-box"> <div class="column travelDaysMasterMap2-box">
<!-- 2张 --> <!-- 2张 -->
<div v-if="item.ScenicArray.length==2"> <div v-if="item.ScenicArray.length==2">
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ e5ada92a
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
:true-label="ShowTripType[0]" :false-label="ShowTripType[1]"></el-checkbox> :true-label="ShowTripType[0]" :false-label="ShowTripType[1]"></el-checkbox>
</div> </div>
</div> </div>
<div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.TitleObj.ShowTripType==1&&dayObj.ScenicArray.length>0"> <div class="row-aic marginT10" style="width: 100%;" v-if="(dayObj.TitleObj.ShowTripType==1||dayObj.TitleObj.ShowTripType==0)&&dayObj.ScenicArray.length>0">
<span v-if="ishasScenic">默认展示图</span> <span v-if="ishasScenic">默认展示图</span>
<el-select style="margin-left: 5px;" v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini" <el-select style="margin-left: 5px;" v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
:placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic"> :placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic">
......
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