Skip to content

A
Athena
Commit 05e193be authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

修改订单预览的teamType

parent 6d7055fc
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 129 deletions
src/assets/css/LocalCuisine.css
View file @ 05e193be
......@@ -49,7 +49,7 @@
padding-bottom:10px;
cursor: pointer;
}
.LocalCuisine .spanPrice span{
.LocalCuisine .spanPrice>span{
display: inline-block;
font-size: 12px;
margin-right:18px;
......
src/assets/css/home.css
View file @ 05e193be
......@@ -35,10 +35,11 @@
text-align: center;
background: rgba(238, 238, 238, 1);
border-radius: 8px;
padding: 3px 0;
padding: 3px 5px;
margin-right: 10px;
margin-bottom: 8px;
cursor: pointer;
box-sizing: border-box;
}
.Home .Home_top .el-radio__input.is-checked .el-radio__inner{
border-color: #FD6473;
......@@ -268,6 +269,26 @@ p {
border-bottom-left-radius:4px;
border-bottom-right-radius:4px;
}
.Home .cztm .tj_ticket .ticket_content .ticketTitle{
position: relative;
width: 95%;
margin:0 auto;
}
.Home .cztm .tj_ticket .ticket_content .ticketTitle .Divtitle>span{
display: inline-block;
background: #fff;
max-width: 50%;
font-family: "PingFangR";
font-size: 16px;
}
.Home .cztm .tj_ticket .ticket_content .ticketTitle div .bg{
position: absolute;
top: 8px;
text-align: center;
z-index: 0;
width: 100%;
}
.Home .cztm .tj_ticket .ticket_content .dashed{
display: inline-block;
width: 100%;
......@@ -316,6 +337,12 @@ p {
background: url("../../assets/img/home/tour.png") 100% 100%;
}
a{
text-decoration: none;
}
.Home .Grouptour .tour_left_content span a{
color: #333333;
}
.Home .Grouptour .tour_left_content span{
display: inline-block;
/* width: 50%; */
......
src/assets/css/localtourhome.css
View file @ 05e193be
......@@ -90,7 +90,8 @@
}
.Localtourhome .commontitle .outone_top_right .content span{
display: inline-block;
width:63px;
min-width:43px;
padding: 0 10px;
height:24px;
border-radius:8px;
font-size:14px;
......
src/components/DependentTravel/IndependentList.vue
View file @ 05e193be
......@@ -197,6 +197,7 @@ export default {
maxPrice:'',
companyId:parseInt(localStorage.site),
priceOrderByField:0,
searchKey:'',
},
minPrice:'',
maxPrice:'',
......@@ -228,6 +229,9 @@ export default {
}
},
created(){
if(this.$route.query.keywords){
this.listmsg.searchKey=this.$route.query.keywords;
}
if(this.$route.query.lineteamId){
this.listmsg.lineId=this.$route.query.lineteamId;
}
......@@ -248,7 +252,7 @@ export default {
methods: {
goUrl(path,id,tcid){
// detailTwo
path = 'detailThree'
path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
},
......
src/components/DependentTravel/IndependentTravel.vue
View file @ 05e193be
......@@ -390,7 +390,7 @@ export default {
//
goUrl(path,id,tcid){
// detailTwo
path = 'detailThree'
path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
},
......
src/components/Home.vue
View file @ 05e193be
......@@ -47,11 +47,13 @@
<li>国家/地区</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
<el-input size="small" v-model="visaSearch" placeholder="国家或者地区名字"></el-input>
</li>
</ul>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span>
<span class="form_btn">
<router-link style="color:#fff;display:block;" :to="{ path: '/Visalist',query:{'searchKey':visaSearch} }" target='_blank'>立即搜索</router-link>
</span>
</div>
<ul class="form_ul">
......@@ -327,14 +329,25 @@
<div class="cirle circle_right"></div>
</div>
<div class="ticket_content">
<el-row style="font-size:16px;">
<el-row class="ticketTitle" style="font-size:16px;position:relative">
<div style="padding:10px 0">
<div class="Divtitle" style="position:relative;z-index:1">
<span>{{item.departureName}}</span>
<span style="float:right">{{item.arrivalCityName}}</span>
</div>
<div class="bg">
<i class="iconfont icon-Shape1" style="font-size:12px;color:#dcdcdc;position:relative;top:-5px"></i>
<span class="dashed"></span>
</div>
</div>
<el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700">{{item.departureName}}</el-col>
<!-- <el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700"></el-col>
<el-col :span="12" style="position:relative;padding:6px 15px;box-sizing:border-box;text-align:center">
<i class="iconfont icon-Shape1" style="font-size:12px;color:#dcdcdc"></i>
<span class="dashed"></span>
</el-col>
<el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700">{{item.arrivalCityName}}</el-col>
<el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700"></el-col> -->
</el-row>
<p style="font-size:12px;padding:6px 0 2px 10px">日期：{{item.flightDate}}</p>
<p style="font-size:12px;padding:2px 0 2px 10px">￥
......@@ -354,7 +367,9 @@
<p>跟团游</p>
<div class="tour_left_content">
<p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">{{item}}</span>
<span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">
<router-link :to="{ path: '/search',query:{'keywords':item} }" target='_blank'>{{item}}</router-link>
</span>
</div>
</div>
<div class="tour_right">
......@@ -387,7 +402,9 @@
<p>自由行</p>
<div class="tour_left_content travel_left" style="height:325px;">
<p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">{{item}}</span>
<span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
<router-link :to="{ path: '/IndependentList',query:{'keywords':item} }" target='_blank' >{{item}}</router-link>
</span>
</div>
</div>
......@@ -397,7 +414,7 @@
<span @click="GoMore('IndependentList')" style="float:right;color:#999999;font-size:12px">查看更多</span>
</ul>
<div class="travel_right_content">
<div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index==0" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<div @click="goUrl('detailTwo',item.idDes,item.tcid)" v-if="index==0" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks">
......@@ -408,7 +425,7 @@
</div>
</div>
<div class="travel_samll_div">
<div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index>0 && index<5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_small">
<div @click="goUrl('detailTwo',item.idDes,item.tcid)" v-if="index>0 && index<5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_small">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks">
......@@ -419,7 +436,7 @@
</div>
</div>
</div>
<div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index==5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<div @click="goUrl('detailTwo',item.idDes,item.tcid)" v-if="index==5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks">
......@@ -532,7 +549,7 @@
</div>
<!-- 酒店 -->
<div class="Grouptour hotel">
<!-- <div class="Grouptour hotel">
<div class="tour_left">
<p>酒店</p>
<div class="tour_left_content hotel_left_content">
......@@ -610,7 +627,7 @@
</div>
</div>
</div>
</div>
</div> -->
<!-- 特价机票 -->
......@@ -643,7 +660,9 @@
</div>
</div>
</div>
<div class="Special_ticket_right"></div>
<div class="Special_ticket_right">
<router-link style="display:block;width:100%;height:100%" :to="{ path: '/TicketHome'}" target='_blank'></router-link>
</div>
</div>
</div>
......@@ -686,83 +705,10 @@
</div>
</div>
<!-- <el-row class="home_footer">
<el-col :span="6">
<div class="float"><i class="iconfont icon-icon-test6"></i></div>
<div class="float" style="width:198px">
<p class="color_33">印象之旅</p>
<ul>
<li @click="FootgoUrl('heel')">跟团游</li>
<li>酒店</li>
<li @click="FootgoUrl('IndependentTravel')">自由行</li>
<li @click="FootgoUrl('Localtourhome')">门票</li>
<li @click="FootgoUrl('Localtourhome')">当地游</li>
<li @click="FootgoUrl('VisaHomePage')">签证</li>
<li>定制机票</li>
<li @click="FootgoUrl('TicketHome')">机票</li>
</ul>
</div>
</el-col>
<el-col :span="5">
<div class="float"><i class="iconfont icon-icon-test7"></i></div>
<div class="float">
<p class="color_33">优惠渠道</p>
<div>
<p>特卖</p>
<p>积分商城</p>
<p>活动中心</p>
</div>
</div>
</el-col>
<el-col :span="5">
<div class="float"><i class="iconfont icon-cailiao"></i></div>
<div class="float">
<p class="color_33">定制旅游</p>
<div>
<p @click="FootgoUrl('PersonalTailor')">定制我的行程</p>
</div>
</div>
</el-col>
<el-col :span="5">
<div class="float"><i class="iconfont icon-putonghuiyuan"></i></div>
<div class="float">
<p class="color_33">个人中心</p>
<div>
<p @click="FootgoUrl('newPersonalCenter?key=1')">我的优惠券</p>
<p @click="FootgoUrl('integral')">我的积分</p>
<p @click="FootgoUrl('newPersonalCenter?key=8-1')">订单中心</p>
</div>
</div>
</el-col>
<el-col :span="3" style="text-align:center">
<p style="color:#666666;font-size:14px;">微信扫描小程序</p>
<div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../assets/img/xiaocx.png" alt=""></div>
</el-col>
</el-row> -->
</div>
<!-- <div class="phone">
<div style="width:1180px;height:100%;margin:0 auto;display:flex;align-items:center;justify-content: flex-end;">
<el-col :span="1"><i class="iconfont icon-Shape2" style="color:#fff;font-size:30px"></i></el-col>
<el-col :span="4" style="color:#fff">
<p>客服服务电话
<span class="qipao">24小时</span>
</p>
<p style="font-size:18px;font-weight:700">028-62051755</p>
</el-col>
</div>
</div> -->
</div>
</template>
<script>
......@@ -807,7 +753,10 @@ export default {
lr: 0
},
banner_height: "0px",
visa_form: {},
visaSearch:"",
visa_form: {
},
ticket_form: {},
tag: "visa",
activecontent1: "first",
......@@ -886,7 +835,10 @@ export default {
goLocalDes(idDes,obj){
let path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
this.$router.push({ path })
let routeData = this.$router.resolve({ path:path});
window.open(routeData.href, '_blank');
// this.$router.push({ name: 'visaList2',query:{"VisaPlanIdStr":obj.VisaPlanIdStr,blank:'y',tab:'签证详情'} })
},
// 机票购买
Purchase(item) {
......@@ -898,13 +850,17 @@ export default {
query: { path: this.$route.name }
});
} else {
this.$router.push({
path: `/ticket/FillItinerary/${item.airTicketId}`
});
let routeData = this.$router.resolve({path: `/ticket/FillItinerary/${item.airTicketId}`});
window.open(routeData.href, '_blank');
}
},
// 景点门票关键词搜索
ScenSearch(){
if(this.scenSearchKey==""){
this.Error("请输入景点！")
return;
}
this.$router.push({ path:'/LocalTourList',
query:{tab:2,searchKey:this.scenSearchKey} })
},
......@@ -921,9 +877,10 @@ export default {
},
SearchTicket(){
sessionStorage.setItem("ChooseInfo", JSON.stringify(this.choose_info));
this.$router.push({
let routeData = this.$router.resolve({
path: "TicketList"
});
window.open(routeData.href, '_blank');
},
// 出发城市
CityInfo(val) {
......@@ -945,28 +902,40 @@ export default {
TagGourl(path,item,num){
if(num==-1){
this.$router.push({ name:path,
let routeData = this.$router.resolve({ name:path,
query:{idDes:encodeURIComponent(item.idDes)} })
window.open(routeData.href, '_blank');
}
else if(num==2){
this.$router.push({ name: path,
let routeData = this.$router.resolve({ name: path,
query:{tab:num,id:item.id} })
window.open(routeData.href, '_blank');
}else{
let id=item.id;
this.$router.push({path: `/${path}?id=${id}`});
let routeData = this.$router.resolve({path: `/${path}?id=${id}`});
window.open(routeData.href, '_blank');
}
},
GoMore(path,num){
if(num==1 || num==2){
this.$router.push({ name: path,
query:{tab:num} })
// this.$router.push({ name: path,
// query:{tab:num} })
let routeData = this.$router.resolve({ path:path,query:{tab:num}});
window.open(routeData.href, '_blank');
}
else if(num==3){
this.$router.push({name: 'LocalCuisine'});
// this.$router.push({name: 'LocalCuisine'});
let routeData = this.$router.resolve({name: 'LocalCuisine'});
window.open(routeData.href, '_blank');
}
else{
this.$router.push({name: path});
let routeData =this.$router.resolve({name: path});
window.open(routeData.href, '_blank');
}
......@@ -992,7 +961,9 @@ export default {
let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
this.$router.push({ path })
// this.$router.push({ path })
let routeData = this.$router.resolve({ path:path});
window.open(routeData.href, '_blank');
},
ClickLocal(item){
this.localMsg.lineId=item.lineId;
......@@ -1010,14 +981,18 @@ export default {
// 门票详情跳转
GoTicket(item){
this.$router.push({ path:'/TicketDetails',
query:{idDes:encodeURIComponent(item.idDes)} })
let routeData = this.$router.resolve({ path:'/TicketDetails',
query:{idDes:encodeURIComponent(item.idDes)} });
window.open(routeData.href, '_blank');
},
// 跳转自由行详情
goUrl(path,idDes,tcid){
path = 'detailThree'
path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/`+tcid
this.$router.push({ path })
// this.$router.push({ path })
let routeData = this.$router.resolve({ path:path});
window.open(routeData.href, '_blank');
},
ClickTicket(item){
this.ticketMsg.countryId=item.countryId;
......
src/components/LocalTour/LocalCuisine.vue
View file @ 05e193be
......@@ -19,7 +19,7 @@
<div class="title pfR f14">游玩日期</div>
<div class="change">
<el-date-picker style="width:160px;"
v-model="msg.startDate"
v-model="startDate" @change="ChangeDate()"
type="date" :picker-options="pickerBeginDateBefore"
placeholder="选择日期" size="mini"
format="yyyy-MM-dd"
......@@ -27,7 +27,7 @@
</el-date-picker>
<span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-date-picker style="width:160px;"
v-model="msg.endDate" @change="ChangeDate"
v-model="endDate" @change="ChangeDate()"
type="date" :picker-options="pickerBeginDateAfter"
placeholder="选择日期" size="mini"
format="yyyy-MM-dd"
......@@ -47,7 +47,7 @@
<span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-input style="width:100px" size="mini" v-model="maxPrice" placeholder="输入价格"></el-input>
<el-button style="margin-left:15px;text-align:center" size="mini" @click="GetList">搜索</el-button>
</span>
</div>
</li>
......@@ -282,6 +282,8 @@ export default {
},null)
},
ChangeDate(){
this.msg.startDate=this.startDate;
this.msg.endDate=this.endDate;
this.GetList();
},
Gourl(item){
......
src/components/PersonalCenter/OrderInvoiceTwo.vue
View file @ 05e193be
......@@ -10,6 +10,7 @@
:tcid="tcid"
:numPeople="numPeople"
v-if="tcid && ID"
:teamType="teamType"
></trade>
<div class="baidumap" id="allmap"></div>
</el-col>
......@@ -46,6 +47,7 @@ export default {
this.ID = decodeURIComponent(this.$route.query.id)
this.tcid = decodeURIComponent(this.$route.query.tcid)
this.numPeople = JSON.parse(this.$route.query.numPeople)
this.teamType=this.$route.query.teamType;
},
mounted() {
this.b2b_get_GetCustomerInfo();
......
src/components/trade/order/OneDayIndex.vue
View file @ 05e193be
......@@ -297,7 +297,7 @@ export default {
}
this.$router.push({
path: '/OrderInvoiceTwo',
query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople)}
query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople),teamType:2}
})
return
}
......
src/components/trade/order/index.vue
View file @ 05e193be
......@@ -407,7 +407,7 @@ export default {
}
this.$router.push({
path: '/OrderInvoiceTwo',
query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople)}
query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople),teamType:0}
})
return
}
......
src/components/trade/order/indexTwo.vue
View file @ 05e193be
......@@ -412,7 +412,7 @@ import bus from '../../../plugins/event-bus'
import LuckDraw from '../../mall/LuckDraw'
export default {
components: {LuckDraw},
props:['ID','tcid','numPeople'],
props:['ID','tcid','numPeople',"teamType"],
data () {
let that=this
return {
......@@ -636,7 +636,7 @@ export default {
this.priceList.forEach((x, i)=>{
if(x.startDate==this.chosenObj.startDate){
this.priceFlight=x
let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid,teamType:2}
let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid,teamType:this.teamType}
this.getDataT(msg, 2)
this.getUnicos(this.priceList[i].tcid)
}
......@@ -950,7 +950,7 @@ export default {
cityId: city,
preview: this.pre,
tcid: this.tcid,
teamType:2
teamType:this.teamType
};
this.getData(msg, days);
});
......@@ -966,7 +966,7 @@ export default {
let priceList = data.priceList;
for ( let i = 0; i < priceList.length; i++) {
if (days===priceList[i].startDate){
let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid,teamType:2}
let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid,teamType:this.teamType}
this.getDataT(msg)
}
}
......
src/components/visa/Visalist.vue
View file @ 05e193be
......@@ -157,6 +157,7 @@ export default {
orderByBookAdvance:0,
pageIndex:1,
pageSize:10,
searchKey:"",
},
total:0,
datalist:[],
......@@ -167,6 +168,9 @@ export default {
}
},
created(){
if(this.$route.query.searchKey){
this.listmsg.searchKey=this.$route.query.searchKey;
}
if(window.localStorage.site){
this.msg.companyId=parseInt(window.localStorage.site)
}
......
src/router.js
View file @ 05e193be
......@@ -64,15 +64,15 @@ export default new Router({
}
},
// 自由行详情
{
path: "/detailThree/:id/:tcid",
name: "detailThree",
component: resolve =>
require(["@/components/mall/detailThree"], resolve),
meta: {
title: "团队详情-印象之旅~感动与世界同步"
}
},
// {
// path: "/detailThree/:id/:tcid",
// name: "detailThree",
// component: resolve =>
// require(["@/components/mall/detailThree"], resolve),
// meta: {
// title: "团队详情-印象之旅~感动与世界同步"
// }
// },
{
path: "/OneDayDetailTwo/:id/:tcid",
name: "OneDayDetailTwo",
......
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