Skip to content

A
Athena
Commit 75a8781e authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent 3620f990
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 46 deletions
src/assets/css/localtourhome.css
View file @ 75a8781e
...@@ -463,6 +463,11 @@ ...@@ -463,6 +463,11 @@
height: 100%; height: 100%;
} }
/* 列表页样式 */ /* 列表页样式 */
.LocalTourList .item-pager .el-pagination__editor, .LocalTourList .item-pager .el-pager li, .LocalTourList .el-pagination .btn-next, .LocalTourList .el-pagination .btn-prev{
width: 30px;
height: 30px;
line-height: 30px;
}
.LocalTourList .tab{ .LocalTourList .tab{
border-bottom:2px solid #4CB960; border-bottom:2px solid #4CB960;
} }
...@@ -1023,7 +1028,7 @@ ...@@ -1023,7 +1028,7 @@
} }
.Appointment .payMoney p>span{ .Appointment .payMoney p>span{
display: inline-block; display: inline-block;
width: 100px; min-width: 100px;
margin-right:10px; margin-right:10px;
} }
...@@ -1042,6 +1047,7 @@ ...@@ -1042,6 +1047,7 @@
font-size:14px; font-size:14px;
line-height: 32px; line-height: 32px;
margin-left:15px; margin-left:15px;
cursor: pointer;
} }
.Appointment .Rotate .icon-more{ .Appointment .Rotate .icon-more{
......
src/components/LocalTour/AdmissionTicket.vue
View file @ 75a8781e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</p> </p>
</div> </div>
<div class="threeDiv"> <div class="threeDiv">
<p><span style="color:#FDAC11;font-size:22px">￥{{item.b2bPrice}}</span>起</p> <p><span style="color:#FDAC11;font-size:22px">￥{{item.b2bPrice | NoDesnum}}</span>起</p>
</div> </div>
</li> </li>
<ul class="ticketDiv"> <ul class="ticketDiv">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<span class="ticketdes">{{item.name}} {{ticket.ticketDesc}}门票></span> <span class="ticketdes">{{item.name}} {{ticket.ticketDesc}}门票></span>
<span class="peopleType">{{ticket.ticketName}}</span></span> <span class="peopleType">{{ticket.ticketName}}</span></span>
<span class="SecondSpan"> <span class="SecondSpan">
<span class="price">￥{{ticket.b2bPrice}}</span> <span class="price">￥{{ticket.b2bPrice | NoDesnum}}</span>
<!-- <span style="color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through">原价:￥300</span> --> <!-- <span style="color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through">原价:￥300</span> -->
</span> </span>
<span class="ThreeSpan"> <span class="ThreeSpan">
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
height:24px; height:24px;
background:rgba(238,68,84,1); background:rgba(238,68,84,1);
color:#fff; color:#fff;
cursor: pointer;
} }
.AdmissionTicket .ticketDiv li .SecondSpan .price{ .AdmissionTicket .ticketDiv li .SecondSpan .price{
color: #FDAC11; color: #FDAC11;
......
src/components/LocalTour/Appointment.vue
View file @ 75a8781e
This diff is collapsed.
src/components/LocalTour/LocalTourList.vue
View file @ 75a8781e
...@@ -42,11 +42,12 @@ ...@@ -42,11 +42,12 @@
线路 线路
</div> </div>
<div class="tabRight spanMargin"> <div class="tabRight spanMargin">
<span @click="SelectLineId(0)" :class="msg.lineId==0?'spanActive':''">不限</span>
<span @click="SelectLineId(item.lineId)" :class="msg.lineId==item.lineId?'spanActive':''" v-for="(item,index) in lineTeamList" :key="index">{{item.lineShortName}}</span> <span @click="SelectLineId(item.lineId)" :class="msg.lineId==item.lineId?'spanActive':''" v-for="(item,index) in lineTeamList" :key="index">{{item.lineShortName}}</span>
</div> </div>
</li> </li>
<li v-if="tab==1"> <li v-if="tab==1 && lineList.length>0">
<div class="tabLeft"> <div class="tabLeft">
系列 系列
</div> </div>
...@@ -186,6 +187,16 @@ ...@@ -186,6 +187,16 @@
<OnedayList :onelist="onelist" v-show="tab==1"></OnedayList> <OnedayList :onelist="onelist" v-show="tab==1"></OnedayList>
<AdmissionTicket :ticketList="ticketList" v-show="tab==2"></AdmissionTicket> <AdmissionTicket :ticketList="ticketList" v-show="tab==2"></AdmissionTicket>
</div> </div>
<div style="text-align:right;width:950px;margin-top:15px">
<el-pagination
:page-size="msg.pageSize"
:current-page.sync="CurrentPage"
layout="total, prev, pager, next"
:total="totalCount"
@current-change="handleCurrentChange"
></el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -202,7 +213,11 @@ export default { ...@@ -202,7 +213,11 @@ export default {
maxPrice:"", maxPrice:"",
startDate:"", startDate:"",
endDate:"", endDate:"",
totalCount:0,
CurrentPage:1,
msg:{ msg:{
pageIndex:1,
pageSize:5,
lineId:0, lineId:0,
lineTeamId:0, lineTeamId:0,
startDate:"", startDate:"",
...@@ -259,23 +274,36 @@ export default { ...@@ -259,23 +274,36 @@ export default {
this.GetLine(); this.GetLine();
if(this.$route.query.tab){ if(this.$route.query.tab){
this.tab= this.$route.query.tab; this.tab= this.$route.query.tab;
if(this.tab==1){
this.GetList();
}else{
this.GetTicketList();
}
} }
}, },
mounted() { mounted() {
this.CountryCity(); this.CountryCity();
this.GetList();
this.GetTicketList();
}, },
methods: { methods: {
handleCurrentChange(val){
this.msg.pageIndex=val;
if(this.tab==1){
this.GetList();
}
if(this.tab==2){
this.GetTicketList();
}
},
GetTicketList(){ GetTicketList(){
this.Loading=true; this.Loading=true;
this.apiJavaPost('/api/b2b/scenic/getScenicTicketList',this.msg,res=>{ this.apiJavaPost('/api/b2b/scenic/getScenicTicketList',this.msg,res=>{
this.Loading=false; this.Loading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.ticketList=res.data.data.pageData; this.ticketList=res.data.data.pageData;
this.totalCount=res.data.data.count;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -350,7 +378,7 @@ export default { ...@@ -350,7 +378,7 @@ export default {
if(this.maxPrice==""){ if(this.maxPrice==""){
this.msg.maxPrice=-1; this.msg.maxPrice=-1;
}else{ }else{
this.msg.minPrice=this.maxPrice; this.msg.maxPrice=this.maxPrice;
} }
if(!this.msg.startDate){ if(!this.msg.startDate){
this.msg.startDate=""; this.msg.startDate="";
...@@ -358,8 +386,10 @@ export default { ...@@ -358,8 +386,10 @@ export default {
if(!this.msg.endDate){ if(!this.msg.endDate){
this.msg.endDate=""; this.msg.endDate="";
} }
this.Loading=true; this.Loading=true;
this.apiJavaPost('/api/b2b/dayTrip/getDayTripProductList',this.msg,res=>{ this.apiJavaPost('/api/b2b/dayTrip/getDayTripProductList',this.msg,res=>{
this.totalCount=res.data.data.count;
this.Loading=false; this.Loading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -410,16 +440,26 @@ export default { ...@@ -410,16 +440,26 @@ export default {
this.GetList(); this.GetList();
}, },
SelectLineId(lineId){ SelectLineId(lineId){
this.msg.lineId=lineId; this.msg.lineId=lineId;
this.lineTeamList.forEach(item=>{ if(lineId==0){
this.lineList=[];
this.msg.lineTeamId=0;
this.GetList();
}else{
this.lineTeamList.forEach(item=>{
if(lineId==item.lineId){ if(lineId==item.lineId){
this.lineList=item.lineTeamList; this.lineList=item.lineTeamList;
} }
}) })
}
}, },
ChangeTab(num){ ChangeTab(num){
this.tab=num; this.tab=num;
this.msg.pageIndex=1;
this.CurrentPage=1;
if(this.tab==1){ if(this.tab==1){
this.GetList(); this.GetList();
} }
...@@ -439,12 +479,12 @@ export default { ...@@ -439,12 +479,12 @@ export default {
if(this.$route.query.ltId){ if(this.$route.query.ltId){
this.msg.lineTeamId= this.$route.query.ltId this.msg.lineTeamId= this.$route.query.ltId
} }
if(this.msg.lineId==0){ // if(this.msg.lineId==0){
this.msg.lineId=this.lineTeamList[0].lineId; // this.msg.lineId=this.lineTeamList[0].lineId;
if(this.lineTeamList.length>0){ // if(this.lineTeamList.length>0){
this.lineList=this.lineTeamList[0].lineTeamList; // this.lineList=this.lineTeamList[0].lineTeamList;
} // }
} // }
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/LocalTour/Localtourhome.vue
View file @ 75a8781e
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</div> --> </div> -->
<div class="bottom"> <div class="bottom">
<span>{{item.name}}</span> <span>{{item.name}}</span>
<span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | priceFormat}}</a>起/人</span> <span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
</div> </div>
</li> </li>
</ul> </ul>
......
src/components/LocalTour/OnedayList.vue
View file @ 75a8781e
<template> <template>
<div class="OnedayList"> <div class="OnedayList">
<ul class="oneList"> <ul class="oneList">
<li v-for="(item,index) in dataList" :key="index+200"> <li @click="goOneDayDetail(item)" v-for="(item,index) in dataList" :key="index+200">
<div> <div>
<img style="width:199px;height:148px;" :src="item.imgCover[0].url" alt=""> <img style="width:199px;height:148px;" :src="item.imgCover[0].url" alt="">
</div> </div>
<div class="secondDiv"> <div class="secondDiv">
<p style="font-size:16px;color:#2A5532">{{item.title}}</p> <p style="font-size:16px;color:#2A5532">{{item.title}}</p>
<p class="taglist" style="margin-top:18px;"> <p class="taglist" style="margin-top:18px;">
<span>明日可订</span> <!-- <span>明日可订</span>
<span>明日可订</span> <span>明日可订</span> -->
</p> </p>
<p style="margin-top:14px;" class="font12"> <p style="margin-top:14px;" class="font12">
<i class="iconfont icon-bb-chufadi"></i> <i class="iconfont icon-bb-chufadi"></i>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</p> </p>
</div> </div>
<div class="threeDiv"> <div class="threeDiv">
<p><span style="color:#FDAC11;font-size:22px">￥{{item.b2BPrice}}</span>起</p> <p><span style="color:#FDAC11;font-size:22px">￥{{item.b2BPrice | NoDesnum}}</span>起</p>
<p style="margin-top:80px"><span class="ckxq" @click="GetDes(item)">查看详情</span></p> <p style="margin-top:80px"><span class="ckxq" @click="GetDes(item)">查看详情</span></p>
</div> </div>
</li> </li>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</ul> </ul>
<ul class="hottour_ul"> <ul class="hottour_ul">
<p class="pfR font14" style="margin-bottom:8px">历史浏览</p> <p class="pfR font14" style="margin-bottom:8px">历史浏览</p>
<li v-for="(item,index) in Historylist" :key="index+2000"> <li @click="goOneDayDetail(item)" v-for="(item,index) in Historylist" :key="index+2000">
<img :src="item.imgCover[0].url" alt=""> <img :src="item.imgCover[0].url" alt="">
<div class="hotcontent"> <div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span> <span class="textHidden font12">{{item.title}}</span>
...@@ -63,6 +63,11 @@ export default { ...@@ -63,6 +63,11 @@ export default {
this.Historylist=arr; this.Historylist=arr;
}, },
methods: { methods: {
goOneDayDetail(item){
let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
this.$router.push({ path })
},
GetDes(item){ GetDes(item){
if(this.Historylist.length>4 || this.Historylist.length==4){ if(this.Historylist.length>4 || this.Historylist.length==4){
this.Historylist.pop(); this.Historylist.pop();
...@@ -120,6 +125,7 @@ export default { ...@@ -120,6 +125,7 @@ export default {
.OnedayList .hottour_ul li{ .OnedayList .hottour_ul li{
position: relative; position: relative;
margin-bottom:14px; margin-bottom:14px;
cursor: pointer;
} }
.OnedayList .hottour_ul{ .OnedayList .hottour_ul{
width: 228px; width: 228px;
......
src/components/LocalTour/TicketDetails.vue
View file @ 75a8781e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<p class="pfR" style="color:#2A5532;font-size:20px;">{{dataDes.name}}</p> <p class="pfR" style="color:#2A5532;font-size:20px;">{{dataDes.name}}</p>
<!-- <p style="margin-top:20px" class="ticketSpan">票类包括：<span>大小同价</span><span>大小价</span></p> --> <!-- <p style="margin-top:20px" class="ticketSpan">票类包括：<span>大小同价</span><span>大小价</span></p> -->
<div class="price"> <div class="price">
￥{{dataDes.minPrice | priceFormat}}~￥{{dataDes.maxPrice | priceFormat}} ￥{{dataDes.minPrice | NoDesnum}}~￥{{dataDes.maxPrice | NoDesnum}}
</div> </div>
<p> <p>
<span style="color:#666666">景点地址：</span> <span style="color:#666666">景点地址：</span>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<!-- <span class="colorG">可订今日</span> <!-- <span class="colorG">可订今日</span>
<span class="colorG">可订今日</span> --> <span class="colorG">可订今日</span> -->
</el-col> </el-col>
<el-col class="pfR" :span="3" style="color:#FDAC11">￥<span class="font22">{{item.b2bPrice | priceFormat}}</span></el-col> <el-col class="pfR" :span="3" style="color:#FDAC11">￥<span class="font22">{{item.b2bPrice | NoDesnum}}</span></el-col>
<el-col :span="2"> <el-col :span="2">
<span @click="YdUrl(dataDes,item)" class="ydBtn">预定</span> <span @click="YdUrl(dataDes,item)" class="ydBtn">预定</span>
</el-col> </el-col>
......
src/components/mall/LocalTourCalendar.vue
View file @ 75a8781e
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
// dayDict.price = price.price; // dayDict.price = price.price;
dayDict.date_str=price.dateStr; dayDict.date_str=price.dateStr;
dayDict.couponsId=price.couponsId; dayDict.couponsId=price.couponsId;
dayDict.id=price.id; dayDict.priceId=price.priceId;
dayDict.ticketId=price.ticketId; dayDict.ticketId=price.ticketId;
if(dayIndex<strDate&&strMonth==currentMonth){ if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price=''; dayDict.price='';
......
src/main.js
View file @ 75a8781e
...@@ -112,6 +112,22 @@ Vue.filter('priceFormat', function (value) { ...@@ -112,6 +112,22 @@ Vue.filter('priceFormat', function (value) {
x1 = x1.replace(rgx, '$1' + ',' + '$2'); x1 = x1.replace(rgx, '$1' + ',' + '$2');
} }
return x1 + x2; return x1 + x2;
})
// 不要小数点
Vue.filter('NoDesnum', function (value) {
if (value == null) {
return 0.00;
}
let nStr = value.toFixed(0)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
}) })
// 时间格式YYYY-MM-DD // 时间格式YYYY-MM-DD
Vue.filter("YMD", function (date) { Vue.filter("YMD", function (date) {
......
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