Skip to content

A
Athena
Commit 796f7823 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

no message

parent 2f067831
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 374 additions and 278 deletions
src/components/FreeTravel/FreeHome.vue
View file @ 796f7823
......@@ -527,13 +527,15 @@
.jingxuan-item .img-item{
margin-bottom: 5px;
position: relative;
width: 562px;
height: 406px;
}
.jingxuan-item .img-item:nth-child(2n){
margin-left: 5px;
}
.jingxuan-item .img-item img{
width: 253px;
height: 198px;
width: 100%;
height: 100%;
display: block;
}
.jingxuan-item .img-item .info{
......@@ -637,21 +639,21 @@
</div>
</div>
<div v-show="inputActive" class="inputActive" @click.stop>
<el-row>
<el-row v-if="CCList.length>0 ">
<el-col :span="6">
<div class="city-tag __cp" v-for="(item, index) in CCList" @click="CCListActive = index" :class="{'active': CCListActive == index}" :key="index">
<p>{{item.name}}</p>
<p @click="goListPage(1, item.short, item.name, index)">{{item.name}}</p>
<div class="f12 text2">
<span v-for="(s, sIndex) in item.cities" :key="sIndex">{{s.name}}</span>
<span @click="goListPage(2, s.number, s.name, sIndex)" v-for="(s, sIndex) in item.cities" :key="sIndex">{{s.name}}</span>
</div>
<div class="triangle-up"></div>
</div>
</el-col>
<el-col :span="18">
<div class="city-list">
<span class="PingFangR">{{CCList[CCListActive].name}}</span>
<span class="PingFangR __cp" @click="goListPage(1, CCList[CCListActive].short, CCList[CCListActive].name)">{{CCList[CCListActive].name}}</span>
<p>
<span v-for="(item, index) in CCList[CCListActive].cities" :key="index">{{item.name}}</span>
<span @click="goListPage(2, CCList[CCListActive].number, item.name, index)" class="f14 __cp" v-for="(item, index) in CCList[CCListActive].cities" :key="index">{{item.name}}</span>
</p>
</div>
</el-col>
......@@ -739,7 +741,7 @@
<div class="content-item-box-item" v-for="(item, index) in list1" @click="goDetails(item)" v-if="index < 4">
<div class="img-box">
<div class="price price3">
<p class="now-p">￥<strong>{{item.b2c_price}}</strong>/人</p>
<p class="now-p">￥<strong class="PingFangR">{{item.b2c_price}}</strong>/人</p>
</div>
<img :src="KkdayDomain+item.prod_img_url" alt="">
<div class="tag">
......@@ -879,58 +881,27 @@
</div>
</div>
<div class="jingxuan">
<div>
<div v-if="TaoCanList.length > 0">
<div class="tit">
<i class="iconfont icon-jingxuan"></i>
<p>精选搭配</p>
<p>精选</p>
</div>
<el-carousel :interval="999000" type="card" height="490px">
<el-carousel-item v-for="item in 6" :key="item">
<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>
<div class="img-item">
<img src="../../assets/img/country1.png" alt="">
</div>
<div class="img-item">
<img src="../../assets/img/country1.png" alt="">
</div>
<div class="img-item">
<img src="../../assets/img/country1.png" alt="">
</div>
<div class="img-item">
<img src="../../assets/img/country1.png" alt="">
<img :src="item.url" alt="">
</div>
</div>
<div class="jingxuanbg">
<img src="../../assets/img/freeHome/jingxuanbg.png" alt="">
</div>
<div class="top-zhezhao">
<div class="img-item">
<div class="info">
【三亚网红海底餐厅】亚龙湾迎宾馆v海蓝海底餐厅海鲜BBQ自助晚餐¥125
</div>
</div>
<div class="img-item">
<div class="info">
【三亚网红海底餐厅】亚龙湾迎宾馆v海蓝海底餐厅海鲜BBQ自助晚餐¥125
</div>
</div>
<div class="img-item">
<div class="info">
【三亚网红海底餐厅】亚龙湾迎宾馆v海蓝海底餐厅海鲜BBQ自助晚餐¥125
</div>
</div>
<div class="img-item">
<div class="info">
【三亚网红海底餐厅】亚龙湾迎宾馆v海蓝海底餐厅海鲜BBQ自助晚餐¥125
</div>
</div>
</div>
<div class="jinxuan-time">
<span class="number">8</span><span class="text"> 月</span><span class="number number2"> 16</span><span class="text"> 日</span>
<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>
</div>
</div>
<p class="jingxuan-tit">赠观光层票】澳门旅游观光塔360Cafe旋转餐厅自助餐</p>
<p class="jingxuan-tit">{{item.pkgs[0].pkg_name}}</p>
</el-carousel-item>
</el-carousel>
</div>
......@@ -956,6 +927,7 @@ export default {
list1: [],
list2: [],
list3: [],
TaoCanList: [],
topCityActive: 0,
CCListActive: 0,
topCityList: [{
......@@ -988,10 +960,28 @@ export default {
this.scrollobj.addEventListener('scroll', this.handleScroll);
this.getDataList()
this.getDataCanList()
this.getTaocanList()
this.getCCList()
},
methods: {
goListPage(type, id, name, index){
this.inputActive = false;
let url = type == 1 ? "FreeList" : "FreeList2"
this.$router.push({
name: url,
query: {
id: id,
type: type,
name: name,
CCListActive: index ? index : this.CCListActive,
}
});
},
getMonth(str){
return str.substring(4, 6)
},
getDay(str){
return str.substring(6, 10)
},
//获取国家 城市
getCCList(){
//http://efficient.oytour.com/api/kkday/searchCity
......@@ -1025,13 +1015,14 @@ export default {
"/api/kkday/commodityList",
{
"locale": "zh-cn",
"state":"TW" ,
"state":"CN" ,
"cat_main_keys": [
"TAG_3"
],
"cat_sub_keys": [
"TAG_3_2"
],
"sort": "PASC",
},
res => {
if (res.data.resultCode === 1) {
......@@ -1050,14 +1041,15 @@ export default {
"/api/kkday/commodityList",
{
"locale": "zh-cn",
"state":"TW" ,
"state":"CN" ,
"cat_sub_keys": [
"TAG_1_3"
],
"sort": "PASC",
},
res => {
if (res.data.resultCode === 1) {
let data = res.data.data.prods,menPiaoList = [], list1 = [], list2 = [], list3 = [];
let data = res.data.data.prods,menPiaoList = [], list1 = [], list2 = [], list3 = [], TaoCanIds = [];
this.KkdayDomain = res.data.data.KkdayDomain;
// M01 一日遊
// M02 多日遊
......@@ -1076,6 +1068,12 @@ export default {
} else if (x.prod_type == 'M02') {
// list1.push(x)
} else if (x.prod_type == 'M01' || x.prod_type == 'M06') { // M01 一日遊 M06 半日遊
if (TaoCanIds.length < 6) {
TaoCanIds.push({
num: x.prod_no,
url: this.KkdayDomain + x.prod_img_url
})
}
list2.push(x)
} else if (x.prod_type == 'M04' || x.prod_type == 'M08' || x.prod_type == 'M03') { // M04 司機/交通 M03 機場接送 M08 點對點接送
list3.push(x)
......@@ -1085,7 +1083,7 @@ export default {
this.list3 = list3;
this.dataList = data
this.menPiaoList = menPiaoList
this.getTaoCan()
this.getTaocanList(TaoCanIds)
this.$forceUpdate()
} else {
this.Error(res.data.message);
......@@ -1094,17 +1092,25 @@ export default {
null
);
},
getTaocanList(){
//http://efficient.oytour.com/api/kkday/QueryPackage
getTaocanList(TaoCanIds){
let list = '';
for(let i = 0; i < TaoCanIds.length; i ++) {
list = list + TaoCanIds[i].num + (i == TaoCanIds.length -1 ? '' : ',')
}
//http://efficient.oytour.com/api/kkday/QueryPackageList
this.apiJavaPost(
"/api/kkday/QueryPackage",
"/api/kkday/QueryPackageList",
{
"prod_no": "20140",
"locale":"zh-cn"
"prodNums": list,
},
res => {
if (res.data.resultCode === 1) {
let data = res.data.data.prods
let data = res.data.data
console.log(data)
for(let i = 0; i < data.length ; i ++){
data[i].url = TaoCanIds[i].url
}
this.TaoCanList = data
} else {
this.Error(res.data.message);
}
......
src/components/FreeTravel/FreeList.vue
View file @ 796f7823
This diff is collapsed.
src/components/FreeTravel/FreeList2.vue
View file @ 796f7823
......@@ -166,12 +166,13 @@
.freeList .contet-nav{
padding: 0 60px;
height: 87px;
width: 100%;
width: 1200px;
background:rgba(255,255,255,1);
box-shadow:0px 4px 35px 0px rgba(0, 0, 0, 0.24);
border-radius:6px;
position: absolute;
top: -50px;
bottom: -50px;
left: 0;
z-index: 0;
display: flex;
justify-content: space-between;
......@@ -341,12 +342,18 @@
.shangpinliebiao-item:hover{
top: -10px;
}
.shangpinliebiao .top-img{
width: 100%;
height: 185px;
background-color: #e0e0e0;
}
.shangpinliebiao .top-img img{
width: 100%;
height: 185px;
}
.shangpinliebiao-item>p{
margin-top: 5px;
min-height: 40px;
}
.get-nav{
height: 50px;
......@@ -362,7 +369,24 @@
align-items: center;
}
.get-nav .paixu{
transform: rotate(180deg)
display: inline-block;
transform: rotate(180deg);
color: #EE4454;
}
.shangpinliebiao-item .tag{
position: absolute;
left: 15px;
top: 25px;
}
.shangpinliebiao-item .tag>span{
padding: 8px;
background:rgba(0,0,0, .4);
border-radius:4px;
color: #FFFFFF;
margin-right: 10px;
}
.page-con{
margin-top: 25px;
}
</style>
<template>
......@@ -485,10 +509,7 @@
</div>
<!-- 天气 -->
</div>
</div>
<div class="content">
<div class="contet-nav">
<div class="contet-nav">
<div>
<div class="contet-nav-item">
<img src="../../assets/img/freeHome/lanse-icon4.png" alt="">
......@@ -520,6 +541,7 @@
<p>当地交通</p>
</div>
</div>
</div>
</div>
<div class="shaixuan">
<p class="f24 bold">日本游玩列表</p>
......@@ -580,6 +602,9 @@
<div class="top-img">
<img src="../../assets/img/activy.jpg" alt="">
</div>
<div class="tag">
<span><i class="iconfont icon-mudedi"></i> <span class="PingFangR">中国-香港</span> </span>
</div>
<p class="text2 f14 c33">【三亚网红海底餐厅】亚龙湾迎宾馆海蓝海底餐厅海鲜BBQ自助晚餐</p>
<div class="pro-item-btm">
<div>
......
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