Skip to content

A
Athena
Commit 48ca7c5b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

1

parent 8936b4b9
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 52 deletions
src/assets/css/common.css
View file @ 48ca7c5b
......@@ -122,6 +122,9 @@
.mg-r-10{
margin-right: 10px;
}
.flex{
display: flex;
}
.inputActive .el-row .el-col.el-col-6::-webkit-scrollbar,.inputActive2 .el-row .el-col.el-col-6::-webkit-scrollbar{
/*滚动条整体样式*/
width: 4px;
......
src/components/FreeTravel/FreeHome.vue
View file @ 48ca7c5b
......@@ -136,6 +136,7 @@
.city-list>p span{
display: inline-block;
padding-right: 20px;
padding-bottom: 5px;
}
.FreeHome .fh-city .city-s>div{
/* background-image: url(https://image.kkday.com/v2/image/get/w_628%2Ch_472%2Cc_fill%2Cq_55%2Ct_webp/s1.kkday.com/campaign_357/20170808084920_CZBUf/jpg); */
......@@ -632,7 +633,7 @@
<div class="FreeHome commonF" @click="inputActive = false">
<div>
<div class="fh-tit">
<img src="../../assets/img/freeHome/top-tex.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/top-tex.png" alt="">
</div>
<div class="fh-search-box">
<div class="fh-search-box-input">
......@@ -673,7 +674,7 @@
<span @click.stop="goList2(item, 'menpiao')">门票</span>
<span @click.stop="goList2(item, 'canshi')">餐食</span>
<span @click.stop="goList2(item, 'yiri')">一日游</span>
<img @click.stop="goList2(item, 'all')" src="../../assets/img/freeHome/more_s.png" alt="">
<img :onerror="defaultImg" @click.stop="goList2(item, 'all')" src="../../assets/img/freeHome/more_s.png" alt="">
</div>
</div>
</div>
......@@ -711,29 +712,29 @@
<div class="fh-tejia">
<p>当季特价</p>
<div class="icon-item">
<div>
<div v-if="menPiaoList.length>0">
<div :class="{'active': activeId == 'menpiao'}" @click="goScroll('menpiao')">
<i class="iconfont icon-menpiao1"></i>
</div>
</div>
<div>
<div v-if="list1.length>0">
<div :class="{'active': activeId == 'meals'}" @click="goScroll('meals')">
<i class="iconfont icon-b-meals"></i>
</div>
</div>
<div>
<div v-if="list2.length>0">
<div :class="{'active': activeId == 'yiriyou'}" @click="goScroll('yiriyou')">
<i class="iconfont icon-yiriyou"></i>
</div>
</div>
<div>
<div v-if="list3.length>0">
<div :class="{'active': activeId == 'cheliang'}" @click="goScroll('cheliang')">
<i class="iconfont icon-cheliang"></i>
</div>
</div>
</div>
</div>
<div id="meals" class="content-item">
<div id="meals" class="content-item" v-if="list1.length>0">
<div class="left-btn _btn">
</div>
......@@ -748,7 +749,7 @@
<div class="price price3">
<p class="now-p">￥<strong class="PingFangR">{{item.b2c_price}}</strong>/人</p>
</div>
<img :src="KkdayDomain+item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain+item.prod_img_url" alt="">
<div class="tag">
<span><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
</div>
......@@ -760,7 +761,7 @@
</div>
</div>
</div>
<div id="yiriyou" class="content-item">
<div id="yiriyou" class="content-item" v-if="list2.length>0">
<!-- <div class="left-btn _btn">
</div>
......@@ -772,8 +773,8 @@
<el-col :span="10">
<div class="content-item-box2">
<div class="img-box">
<img src="../../assets/img/activy.jpg" alt="">
<img src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<span class="tag price2">￥ <strong>299</strong> 起</span>
</div>
<div class="content-tit">
......@@ -789,9 +790,9 @@
<el-col :span="14">
<div class="content-item-box2">
<div class="img-box img-box2">
<img src="../../assets/img/activy.jpg" alt="">
<img src="../../assets/img/activy.jpg" alt="">
<img src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<span class="tag price2">￥ <strong>299</strong> 起</span>
</div>
<div class="content-tit">
......@@ -819,7 +820,7 @@
<div class="price price2">
<p class="now-p">￥<strong>{{item.b2c_price}}</strong>/人</p>
</div>
<img :src="KkdayDomain+item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain+item.prod_img_url" alt="">
<div class="tag">
<span><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
</div>
......@@ -831,7 +832,7 @@
</div>
</div>
</div>
<div id="cheliang" class="content-item">
<div id="cheliang" class="content-item" v-if="list3.length>0">
<div class="left-btn _btn">
</div>
......@@ -846,7 +847,7 @@
<div class="price">
<p class="now-p">￥<strong>{{item.b2c_price}}</strong>/人</p>
</div>
<img :src="KkdayDomain+item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain+item.prod_img_url" alt="">
<div class="tag">
<span class="PingFangR"><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
</div>
......@@ -858,7 +859,7 @@
</div>
</div>
</div>
<div id="menpiao" class="content-item">
<div id="menpiao" class="content-item" v-if="menPiaoList.length>0">
<div class="left-btn _btn">
</div>
......@@ -873,7 +874,7 @@
<div class="price price4">
<p class="now-p">￥<strong>{{item.b2c_price}}</strong>/人</p>
</div>
<img :src="KkdayDomain+item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain+item.prod_img_url" alt="">
<div class="tag">
<span class="PingFangR"><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
</div>
......@@ -893,14 +894,14 @@
</div>
<el-carousel :interval="999999" type="card" height="490px">
<el-carousel-item v-for="(item, index) in TaoCanList" v-if="item.pkgs" :key="index">
<div class="jingxuan-item">
<div class="jingxuan-item" @click="goDetails(item.pkgs[0], 2)">
<div>
<div class="img-item">
<img :src="item.url" alt="">
<img :onerror="defaultImg" :src="item.url" alt="">
</div>
</div>
<div class="jingxuanbg">
<img src="../../assets/img/freeHome/jingxuanbg.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/jingxuanbg.png" alt="">
</div>
<div class="jinxuan-time">
<span class="number">{{getMonth(item.sale_dates.saleDt[0].sale_day)}}</span><span class="text"> 月</span><span class="number number2"> {{getDay(item.sale_dates.saleDt[0].sale_day)}}</span><span class="text"> 日</span>
......@@ -964,6 +965,7 @@ export default {
}],
KkdayDomain: "",
CCList: [],
defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
}
},
mounted() {
......@@ -1028,11 +1030,11 @@ export default {
null
);
},
goDetails(obj){
goDetails(obj, type){
this.$router.push({
name: "FreeDetail",
query: {
id: obj.prod_url_no,
id: type ? obj.pkg_no : obj.prod_url_no,
}
});
},
......
src/components/FreeTravel/FreeList.vue
View file @ 48ca7c5b
......@@ -128,6 +128,7 @@
.city-list>p span{
display: inline-block;
padding-right: 20px;
padding-bottom: 5px;
}
.freeList .city-right-tag .el-tabs--card>.el-tabs__header,.freeList .shaixuan-top .el-tabs--card>.el-tabs__header,.freeList .el-tabs--card>.el-tabs__header .el-tabs__nav,.freeList .el-tabs--card>.el-tabs__header .el-tabs__item{
border: none;
......@@ -451,43 +452,43 @@
<div class="contet-nav">
<div @click="goHome">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon4.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon4.png" alt="">
</div>
<p>首页</p>
</div>
<div @click="goScroll('list')">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon5.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon5.png" alt="">
</div>
<p>活动</p>
</div>
<div @click="goScroll('list')">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon6.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon6.png" alt="">
</div>
<p>体验</p>
</div>
<div @click="goScroll('list')">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon1.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon1.png" alt="">
</div>
<p>特色餐食</p>
</div>
<div @click="goScroll('list')">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon.png" alt="">
</div>
<p>一日游</p>
</div>
<div @click="goScroll('list')">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon2.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon2.png" alt="">
</div>
<p>景点门票</p>
</div>
<div>
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon3.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon3.png" alt="">
</div>
<p>当地交通</p>
</div>
......@@ -509,7 +510,7 @@
<div class="pro-item" >
<span class="pro-item-tag bgc-b cff" :class="`bgc-b${sItem.prod_type == 'M01' ? 0 : sItem.prod_type == 'M04' ? 1 : sItem.prod_type == 'M05' ? 2 : 3}`">{{sItem.prod_type == 'M01' ? '一日游' : sItem.prod_type == 'M04' ? '交通' : sItem.prod_type == 'M05' ? '门票' : '其他'}}</span>
<div class="pro-item-top">
<img src="../../assets/img/activy.jpg" alt="">
<img :onerror="defaultImg" src="../../assets/img/activy.jpg" alt="">
<p class="text4 f14 PingFangR">{{sItem.prod_name}}</p>
</div>
<div class="pro-item-btm">
......@@ -572,15 +573,20 @@
placeholder="选择日期">
</el-date-picker>
</div>
<div class="f14 __cp" @click="pSort()">
<span>价格排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu1}"></i>
<div class="f14 flex">
<div @click="pSort(2)" class="__cp" style="margin-right: 20px;">
<span>热门排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu2}"></i>
</div>
<div @click="pSort()" class="__cp">
<span>价格排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu1}"></i>
</div>
</div>
</div>
<el-row :gutter="26" v-loading="laoding">
<el-col :span="6" v-for="(item, index) in dataList" :key="index">
<div class="shangpinliebiao-item" @click="goDetails(item)">
<div class="top-img">
<img :src="KkdayDomain + item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain + item.prod_img_url" alt="">
</div>
<div class="tag">
<span><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
......@@ -621,8 +627,10 @@
export default {
data () {
return {
defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
newCityCheck: [],
paixu1: false,
paixu2: false,
addShow: false,
cities: ['上海', '北京', '广州', '深圳','上海4', '北京2', '广州2', '深圳2','上海2', '北京3', '广州3', '深圳3','上海3', '北京4', '广州5', '深圳5'],
checkedCities: ['上海', '北京'],
......@@ -940,9 +948,17 @@ export default {
this.newCityList = this.CCList[index]
this.$forceUpdate()
},
pSort(){
this.paixu1 = !this.paixu1;
this.priceSort = this.paixu1 ? "PASC" : "PDESC"
pSort(t){
// 排序方式包含： PDESC(價格由高至低), PASC(價格由低至高)，HDESC（热门商品由高到低），HASC（热门商品由低到高）
if(t) {
this.paixu2 = !this.paixu2;
this.paixu1 = false;
this.priceSort = this.paixu2 ? "HASC" : "HDESC"
} else {
this.paixu1 = !this.paixu1;
this.paixu2 = false;
this.priceSort = this.paixu1 ? "PASC" : "PDESC"
}
this.getList()
},
goListPage(type, id, name, index){
......
src/components/FreeTravel/FreeList2.vue
View file @ 48ca7c5b
......@@ -128,6 +128,7 @@
.city-list>p span{
display: inline-block;
padding-right: 20px;
padding-bottom: 5px;
}
.freeList2 .city-right-tag .el-tabs--card>.el-tabs__header,.freeList2 .shaixuan-top .el-tabs--card>.el-tabs__header,.freeList2 .el-tabs--card>.el-tabs__header .el-tabs__nav,.freeList2 .el-tabs--card>.el-tabs__header .el-tabs__item{
border: none;
......@@ -467,54 +468,54 @@
</div>
<!-- 天气 -->
<div>
天气预报
</div>
<div class="contet-nav">
<div @click="goHome">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon4.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon4.png" alt="">
</div>
<p>首页</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_1', 4)" :class="{'active': typeTagIndex == 4}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon5.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon5.png" alt="">
</div>
<p>活动</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_3', 5)" :class="{'active': typeTagIndex == 5}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon6.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon6.png" alt="">
</div>
<p>体验</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_0', 3)" :class="{'active': typeTagIndex == 3}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon1.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon1.png" alt="">
</div>
<p>特色餐食</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_4', 1)" :class="{'active': typeTagIndex == 1}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon.png" alt="">
</div>
<p>一日游</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_2', 0)" :class="{'active': typeTagIndex == 0}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon2.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon2.png" alt="">
</div>
<p>景点门票</p>
<p class="line"><span></span></p>
</div>
<div @click="changeNav('TAG_5', 2)" :class="{'active': typeTagIndex == 2}">
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon3.png" alt="">
<img :onerror="defaultImg" src="../../assets/img/freeHome/lanse-icon3.png" alt="">
</div>
<p>当地交通</p>
<p class="line"><span></span></p>
......@@ -543,15 +544,20 @@
placeholder="选择日期">
</el-date-picker>
</div>
<div class="f14 __cp" @click="pSort()">
<span>价格排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu1}"></i>
<div class="f14 flex" >
<div @click="pSort(2)" class="__cp" style="margin-right: 20px;">
<span>热门排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu2}"></i>
</div>
<div @click="pSort()" class="__cp">
<span>价格排序</span><i class="iconfont icon-xia c88" :class="{'paixu': paixu1}"></i>
</div>
</div>
</div>
<el-row :gutter="26" v-loading="laoding">
<el-col :span="6" v-for="(item, index) in dataList" :key="index">
<div class="shangpinliebiao-item" @click="goDetails(item)">
<div class="top-img">
<img :src="KkdayDomain + item.prod_img_url" alt="">
<img :onerror="defaultImg" :src="KkdayDomain + item.prod_img_url" alt="">
</div>
<div class="tag">
<span><i class="iconfont icon-mudedi"></i> <span class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
......@@ -594,8 +600,10 @@
export default {
data () {
return {
defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
ccIdNew: null,
newCityCheck: [],
paixu2: false,
paixu1: false,
addShow: false,
Cities: ['上海', '北京', '广州', '深圳','上海4', '北京2', '广州2', '深圳2','上海2', '北京3', '广州3', '深圳3','上海3', '北京4', '广州5', '深圳5'],
......@@ -912,9 +920,17 @@ export default {
}
});
},
pSort(){
this.paixu1 = !this.paixu1;
this.priceSort = this.paixu1 ? "PASC" : "PDESC"
pSort(t){
// 排序方式包含： PDESC(價格由高至低), PASC(價格由低至高)，HDESC（热门商品由高到低），HASC（热门商品由低到高）
if(t) {
this.paixu2 = !this.paixu2;
this.paixu1 = false;
this.priceSort = this.paixu2 ? "HASC" : "HDESC"
} else {
this.paixu1 = !this.paixu1;
this.paixu2 = false;
this.priceSort = this.paixu1 ? "PASC" : "PDESC"
}
this.getList()
},
goListPage(type, id, name, index){
......
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