Commit 05e193be authored by huangyuanyuan's avatar huangyuanyuan

修改订单预览的teamType

parent 6d7055fc
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
padding-bottom:10px; padding-bottom:10px;
cursor: pointer; cursor: pointer;
} }
.LocalCuisine .spanPrice span{ .LocalCuisine .spanPrice>span{
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
margin-right:18px; margin-right:18px;
......
...@@ -35,10 +35,11 @@ ...@@ -35,10 +35,11 @@
text-align: center; text-align: center;
background: rgba(238, 238, 238, 1); background: rgba(238, 238, 238, 1);
border-radius: 8px; border-radius: 8px;
padding: 3px 0; padding: 3px 5px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 8px; margin-bottom: 8px;
cursor: pointer; cursor: pointer;
box-sizing: border-box;
} }
.Home .Home_top .el-radio__input.is-checked .el-radio__inner{ .Home .Home_top .el-radio__input.is-checked .el-radio__inner{
border-color: #FD6473; border-color: #FD6473;
...@@ -268,6 +269,26 @@ p { ...@@ -268,6 +269,26 @@ p {
border-bottom-left-radius:4px; border-bottom-left-radius:4px;
border-bottom-right-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{ .Home .cztm .tj_ticket .ticket_content .dashed{
display: inline-block; display: inline-block;
width: 100%; width: 100%;
...@@ -316,6 +337,12 @@ p { ...@@ -316,6 +337,12 @@ p {
background: url("../../assets/img/home/tour.png") 100% 100%; 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{ .Home .Grouptour .tour_left_content span{
display: inline-block; display: inline-block;
/* width: 50%; */ /* width: 50%; */
......
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
} }
.Localtourhome .commontitle .outone_top_right .content span{ .Localtourhome .commontitle .outone_top_right .content span{
display: inline-block; display: inline-block;
width:63px; min-width:43px;
padding: 0 10px;
height:24px; height:24px;
border-radius:8px; border-radius:8px;
font-size:14px; font-size:14px;
......
...@@ -197,6 +197,7 @@ export default { ...@@ -197,6 +197,7 @@ export default {
maxPrice:'', maxPrice:'',
companyId:parseInt(localStorage.site), companyId:parseInt(localStorage.site),
priceOrderByField:0, priceOrderByField:0,
searchKey:'',
}, },
minPrice:'', minPrice:'',
maxPrice:'', maxPrice:'',
...@@ -228,6 +229,9 @@ export default { ...@@ -228,6 +229,9 @@ export default {
} }
}, },
created(){ created(){
if(this.$route.query.keywords){
this.listmsg.searchKey=this.$route.query.keywords;
}
if(this.$route.query.lineteamId){ if(this.$route.query.lineteamId){
this.listmsg.lineId=this.$route.query.lineteamId; this.listmsg.lineId=this.$route.query.lineteamId;
} }
...@@ -248,7 +252,7 @@ export default { ...@@ -248,7 +252,7 @@ export default {
methods: { methods: {
goUrl(path,id,tcid){ goUrl(path,id,tcid){
// detailTwo // detailTwo
path = 'detailThree' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}/`+tcid path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path }) this.$router.push({ path })
}, },
......
...@@ -390,7 +390,7 @@ export default { ...@@ -390,7 +390,7 @@ export default {
// //
goUrl(path,id,tcid){ goUrl(path,id,tcid){
// detailTwo // detailTwo
path = 'detailThree' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}/`+tcid path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path }) this.$router.push({ path })
}, },
......
This diff is collapsed.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="title pfR f14">游玩日期</div> <div class="title pfR f14">游玩日期</div>
<div class="change"> <div class="change">
<el-date-picker style="width:160px;" <el-date-picker style="width:160px;"
v-model="msg.startDate" v-model="startDate" @change="ChangeDate()"
type="date" :picker-options="pickerBeginDateBefore" type="date" :picker-options="pickerBeginDateBefore"
placeholder="选择日期" size="mini" placeholder="选择日期" size="mini"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-date-picker> </el-date-picker>
<span class="pfR" style="margin:0 10px;color:#000000">-</span> <span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-date-picker style="width:160px;" <el-date-picker style="width:160px;"
v-model="msg.endDate" @change="ChangeDate" v-model="endDate" @change="ChangeDate()"
type="date" :picker-options="pickerBeginDateAfter" type="date" :picker-options="pickerBeginDateAfter"
placeholder="选择日期" size="mini" placeholder="选择日期" size="mini"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<span class="pfR" style="margin:0 10px;color:#000000">-</span> <span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-input style="width:100px" size="mini" v-model="maxPrice" placeholder="输入价格"></el-input> <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> </span>
</div> </div>
</li> </li>
...@@ -282,7 +282,9 @@ export default { ...@@ -282,7 +282,9 @@ export default {
},null) },null)
}, },
ChangeDate(){ ChangeDate(){
this.GetList(); this.msg.startDate=this.startDate;
this.msg.endDate=this.endDate;
this.GetList();
}, },
Gourl(item){ Gourl(item){
if(this.LikeList.length>5 || this.LikeList.length==5){ if(this.LikeList.length>5 || this.LikeList.length==5){
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
:tcid="tcid" :tcid="tcid"
:numPeople="numPeople" :numPeople="numPeople"
v-if="tcid && ID" v-if="tcid && ID"
:teamType="teamType"
></trade> ></trade>
<div class="baidumap" id="allmap"></div> <div class="baidumap" id="allmap"></div>
</el-col> </el-col>
...@@ -46,6 +47,7 @@ export default { ...@@ -46,6 +47,7 @@ export default {
this.ID = decodeURIComponent(this.$route.query.id) this.ID = decodeURIComponent(this.$route.query.id)
this.tcid = decodeURIComponent(this.$route.query.tcid) this.tcid = decodeURIComponent(this.$route.query.tcid)
this.numPeople = JSON.parse(this.$route.query.numPeople) this.numPeople = JSON.parse(this.$route.query.numPeople)
this.teamType=this.$route.query.teamType;
}, },
mounted() { mounted() {
this.b2b_get_GetCustomerInfo(); this.b2b_get_GetCustomerInfo();
......
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
} }
this.$router.push({ this.$router.push({
path: '/OrderInvoiceTwo', 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 return
} }
......
...@@ -407,7 +407,7 @@ export default { ...@@ -407,7 +407,7 @@ export default {
} }
this.$router.push({ this.$router.push({
path: '/OrderInvoiceTwo', 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 return
} }
......
...@@ -412,7 +412,7 @@ import bus from '../../../plugins/event-bus' ...@@ -412,7 +412,7 @@ import bus from '../../../plugins/event-bus'
import LuckDraw from '../../mall/LuckDraw' import LuckDraw from '../../mall/LuckDraw'
export default { export default {
components: {LuckDraw}, components: {LuckDraw},
props:['ID','tcid','numPeople'], props:['ID','tcid','numPeople',"teamType"],
data () { data () {
let that=this let that=this
return { return {
...@@ -636,7 +636,7 @@ export default { ...@@ -636,7 +636,7 @@ export default {
this.priceList.forEach((x, i)=>{ this.priceList.forEach((x, i)=>{
if(x.startDate==this.chosenObj.startDate){ if(x.startDate==this.chosenObj.startDate){
this.priceFlight=x 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.getDataT(msg, 2)
this.getUnicos(this.priceList[i].tcid) this.getUnicos(this.priceList[i].tcid)
} }
...@@ -950,7 +950,7 @@ export default { ...@@ -950,7 +950,7 @@ export default {
cityId: city, cityId: city,
preview: this.pre, preview: this.pre,
tcid: this.tcid, tcid: this.tcid,
teamType:2 teamType:this.teamType
}; };
this.getData(msg, days); this.getData(msg, days);
}); });
...@@ -966,7 +966,7 @@ export default { ...@@ -966,7 +966,7 @@ export default {
let priceList = data.priceList; let priceList = data.priceList;
for ( let i = 0; i < priceList.length; i++) { for ( let i = 0; i < priceList.length; i++) {
if (days===priceList[i].startDate){ 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) this.getDataT(msg)
} }
} }
......
...@@ -157,6 +157,7 @@ export default { ...@@ -157,6 +157,7 @@ export default {
orderByBookAdvance:0, orderByBookAdvance:0,
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
searchKey:"",
}, },
total:0, total:0,
datalist:[], datalist:[],
...@@ -167,6 +168,9 @@ export default { ...@@ -167,6 +168,9 @@ export default {
} }
}, },
created(){ created(){
if(this.$route.query.searchKey){
this.listmsg.searchKey=this.$route.query.searchKey;
}
if(window.localStorage.site){ if(window.localStorage.site){
this.msg.companyId=parseInt(window.localStorage.site) this.msg.companyId=parseInt(window.localStorage.site)
} }
......
...@@ -64,15 +64,15 @@ export default new Router({ ...@@ -64,15 +64,15 @@ export default new Router({
} }
}, },
// 自由行详情 // 自由行详情
{ // {
path: "/detailThree/:id/:tcid", // path: "/detailThree/:id/:tcid",
name: "detailThree", // name: "detailThree",
component: resolve => // component: resolve =>
require(["@/components/mall/detailThree"], resolve), // require(["@/components/mall/detailThree"], resolve),
meta: { // meta: {
title: "团队详情-印象之旅~感动与世界同步" // title: "团队详情-印象之旅~感动与世界同步"
} // }
}, // },
{ {
path: "/OneDayDetailTwo/:id/:tcid", path: "/OneDayDetailTwo/:id/:tcid",
name: "OneDayDetailTwo", 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