Skip to content

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

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

parents a8a0ba03 2584e4f6
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 76 deletions
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ e520360c
......@@ -652,7 +652,7 @@
//团期全选
checkGroupALL: false,
//销售平台全选
checkPlatForm: false,
checkPlatForm: true,
//团队状态全选
checkTCStateAll: false,
//是否显示弹出框
......@@ -718,8 +718,8 @@
DayNum: '',
OnlyShowOverTeam: false,
TCState: [3], //去掉默认显示
GroupState: [],
SalePlat: [],
GroupState: [1],
SalePlat: [1,2,3,4,5],
UnionCityId: 0,
SaleBranchId: [],
total: 0,
......@@ -734,7 +734,7 @@
RateOnDay: '-1',
RateOn: '-1',
TeamType: 2, //一日游的团
IsShowUnion: -1,
IsShowUnion: 0,
TCID: '',
},
remarkMsg: {
......@@ -1489,9 +1489,8 @@
},
created () {
this.GetLookAllTeamAuth();
this.checkAllTeam();
//默认显示联运
this.queryMsg.IsShowUnion = -1;
this.queryMsg.IsShowUnion = 0;
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
......
src/components/newConfimationOrder.vue
View file @ e520360c
......@@ -476,78 +476,80 @@
</div>
<div v-if="(showType>=4)&&loadNone==false&&vshowC" class="newFeature" v-html="feature.featureHtml"></div>
<div class="newtripList" v-for="(item,index) in tripList" :key="index">
<template v-if="item.dayNum<10">
<div class="newTripFly" style="margin-bottom:10px;">
DAY 0{{item.dayNum}} 天
</div>
</template>
<template v-else>
DAY {{item.dayNum}} 天
</template>
<div class="newTripDateTime">{{item.dateTime}}</div>
<div class="newTripFly" v-if="item.title" v-html="getTitle(item.title)" :class="getTitle(item.title)!=''?'newTripKuang':''">
</div>
<div class="newTripDay" style="margin-bottom:0;" v-for="(subItem,subIndex) in item.details" :key="subIndex">
<div style="line-height:2;min-height:80px;">
<span class="newTripTutle">{{getTitle(subItem.title)}}：</span>
<span><div v-html="subItem.content"></div></span>
<div v-if="vshowD">
<div class="newtripList" v-for="(item,index) in tripList" :key="index">
<template v-if="item.dayNum<10">
<div class="newTripFly" style="margin-bottom:10px;">
DAY 0{{item.dayNum}} 天
</div>
</div>
<div class="newTripDay">
<div class="warmTipsTitle" style="margin-top:0;">温馨提示：</div>
<template v-if="item.tips.length>0">
<div class="warmTipsContent">
<template v-for="(sItem,sIndex) in item.tips">
<div class="newTripWarm" v-html="sItem.content" :key="sIndex"></div>
</template>
</div>
</template>
</div>
<div>
<table class="newTripTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width:7%;border-right-style:none;">
<label>酒店：</label>
</td>
<td style="width:40%;border-left-style:none;">
<template v-if='item.jiu2.length>0'>
<span v-for="(t,k) in item.jiu2" style="cursor: pointer" :key="k">
{{k==item.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
</template>
<template v-if="item.jiu2.length>0&&item.jiu2[0].name!=''">
{{getHotelSuffix(item)}}
</template>
</td>
<td style="width:7%;border-right-style:none;">
<div class="tripLeftCan" style="vertical-align:top;">
<label>用餐：</label>
</div>
<template v-else>
DAY {{item.dayNum}} 天
</template>
<div class="newTripDateTime">{{item.dateTime}}</div>
<div class="newTripFly" v-if="item.title" v-html="getTitle(item.title)" :class="getTitle(item.title)!=''?'newTripKuang':''">
</div>
<div class="newTripDay" style="margin-bottom:0;" v-for="(subItem,subIndex) in item.details" :key="subIndex">
<div style="line-height:2;min-height:80px;">
<span class="newTripTutle">{{getTitle(subItem.title)}}：</span>
<span><div v-html="subItem.content"></div></span>
</div>
</div>
<div class="newTripDay">
<div class="warmTipsTitle" style="margin-top:0;">温馨提示：</div>
<template v-if="item.tips.length>0">
<div class="warmTipsContent">
<template v-for="(sItem,sIndex) in item.tips">
<div class="newTripWarm" v-html="sItem.content" :key="sIndex"></div>
</template>
</div>
</template>
</div>
<div>
<table class="newTripTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width:7%;border-right-style:none;">
<label>酒店：</label>
</td>
<td style="width:27%;border-left-style:none;">
<div class="tripRightCan">
<div>早({{item.can.breakfirst}})</div>
<div>中({{item.can.lanuch}})</div>
<div>晚({{item.can.dinner}})</div>
</div>
</td>
<td style="width:7%;border-right-style:none;">
<label>交通：</label>
</td>
<td style="width:15%;border-left-style:none;">
<template v-if="item.trafficArray&& item.trafficArray.length>0" v-for="(subItem,subIndex) in item.trafficArray">
<span>{{subItem}}</span>
<template v-if="subIndex!=item.trafficArray.length-1">
<span>、</span>
</template>
</template>
</td>
</tr>
</table>
</div>
<div class="newTripImgList" v-if="vshowK">
<newTripCommon :day="item.details"></newTripCommon>
<td style="width:40%;border-left-style:none;">
<template v-if='item.jiu2.length>0'>
<span v-for="(t,k) in item.jiu2" style="cursor: pointer" :key="k">
{{k==item.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
</template>
<template v-if="item.jiu2.length>0&&item.jiu2[0].name!=''">
{{getHotelSuffix(item)}}
</template>
</td>
<td style="width:7%;border-right-style:none;">
<div class="tripLeftCan" style="vertical-align:top;">
<label>用餐：</label>
</div>
</td>
<td style="width:27%;border-left-style:none;">
<div class="tripRightCan">
<div>早({{item.can.breakfirst}})</div>
<div>中({{item.can.lanuch}})</div>
<div>晚({{item.can.dinner}})</div>
</div>
</td>
<td style="width:7%;border-right-style:none;">
<label>交通：</label>
</td>
<td style="width:15%;border-left-style:none;">
<template v-if="item.trafficArray&& item.trafficArray.length>0" v-for="(subItem,subIndex) in item.trafficArray">
<span>{{subItem}}</span>
<template v-if="subIndex!=item.trafficArray.length-1">
<span>、</span>
</template>
</template>
</td>
</tr>
</table>
</div>
<div class="newTripImgList" v-if="vshowK">
<newTripCommon :day="item.details"></newTripCommon>
</div>
</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ e520360c
......@@ -140,7 +140,7 @@
newFeature2,
// newFeature3,
},
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType","CurrentUserInfo"],
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
inject: ['loadConfigInfo'],
data() {
return {
......@@ -228,6 +228,8 @@
//折叠展开
isFold: "",
FeatureDataFlag: false,
//当前登录用户信息
CurrentUserInfo: {}
};
},
created: function () {},
......@@ -534,6 +536,8 @@
}
},
mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.MsgBus.$on('FeatureDataFlag', () => {
this.FeatureDataFlag = true
});
......
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