Skip to content

A
Athena
Commit 3918fc89 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

一日游

parent 61bf754b
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 126 deletions
src/components/mall/OneDayDetailTwo.vue
View file @ 3918fc89
......@@ -321,8 +321,8 @@
</div>
<div v-if='dayList&&dayList.length>0'>
<!-- <trip :tripList="dayList"></trip> -->
<block :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block>
<trip :tripList="dayList"></trip>
<!-- <block :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block> -->
</div>
<div class="item-title" id='feiyong'>
<span class="t">费用</span>
......
src/components/mall/OneDaySearch.vue
View file @ 3918fc89
......@@ -7,7 +7,7 @@
<el-col :span="20" :offset="2" class="topic">
<el-col :span='12'>
<div class="chosend-box">
*你的选择：
你的选择：
<el-tag closable hit size='medium' v-for='(item,index) in searchItem' :key="index" v-if='item!==""&&item!=="0"' @close='handleClose(index)'>{{item}}</el-tag>
</div>
</el-col>
......
src/components/mall/OneDaySwiper.vue
View file @ 3918fc89
......@@ -36,7 +36,7 @@
</el-carousel-item>
</el-carousel>
<div class="search-box" :style="{'width':searchBoxWidth,'left':searchBoxLeft}">
<div class="chosen-item">*旅游</div>
<div class="chosen-item">旅游</div>
<div class="search-content">
<el-row>
<el-col :span="2" style="text-align:center">
......
src/components/mall/OneDayTour.vue
View file @ 3918fc89
......@@ -5,114 +5,60 @@
<template>
<div class="heel-box">
<swiper />
<!-- <el-row>
<el-col :span="20" :offset="2">
<div class="hot_topics">
<table>
<tbody>
<tr>
<th>*热门主题</th>
<td><a href="javascript:" target="_blank" class="topics_color1"><strong>·</strong>海岛</a></td>
<td><a href="javascript:" target="_blank" class="topics_color2"><strong>·</strong>古镇</a></td>
<td><a href="javascript:" target="_blank" class="topics_color3"><strong>·</strong>迪士尼</a></td>
<td><a href="javascript:" target="_blank" class="topics_color4"><strong>·</strong>爸妈游</a></td>
<td><a href="javascript:" target="_blank" class="topics_color5"><strong>·</strong>亲子游</a></td>
<td><a href="javascript:" target="_blank" class="topics_color6"><strong>·</strong>草原</a></td>
<td><a href="javascript:" target="_blank" class="topics_color7"><strong>·</strong>沙滩</a></td>
<td><a href="javascript:" target="_blank" class="topics_color8"><strong>·</strong>乐园</a></td>
</tr>
</tbody>
</table>
</div>
</el-col>
</el-row> -->
<!-- <el-row>
<el-col :span="20" :offset="2">
<div class="title">
<div class="t1">
<img src="../../assets/img/img-title-red.png" />
<span class="t2">精品推荐</span>
<img src="../../assets/img/img-title-red.png" />
<template v-for="(item,index) in recoItems.line">
<el-row :style="{'margin-top':`${index>0?'50px':'10px'}`}" v-for="(sItem, sIndex) in item.lineTeam" :key="sIndex">
<el-col :span="20" :offset="2">
<div class="title">
<div class="t1">
<span class="t2" style='font-size:20px'>{{sItem.name}}</span>
</div>
</div>
<el-tabs v-model="activeName">
<el-tab-pane :label="item.name" :name="`${item.id}`" v-for="(item,i) in recoItems.recommend" :key="i"></el-tab-pane>
</el-tabs>
</div>
</el-col>
</el-row> -->
<!-- <el-row v-if="activeName=='1'">
<el-col :span="20" :offset="2">
<div class="item-box">
<el-row :gutter="17">
<el-col :span="4" v-for='(item,index) in tehuis' :key="index" v-if='index<6'>
<div class="team-item" :style="{'height':`${itemHeight}`}" @click="goUrl('detail',item.id,item)">
<img class="notamin" v-if='item.imgCover!=null&&item.imgCover.length' :src='compressImg(JSON.parse(item.imgCover)[0].Url, "filt", 245, "")' />
<img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
<div class="info-box">
<div class="item-title">{{item.ltName}}</div>
<div>
<span class="day">{{item.dataStr}} 出发</span>
<span class="price">￥{{isLogin!==1 ? item.b2CPrice : item.b2BPrice}}</span> 起
</div>
</div>
</div>
</el-col>
</el-row>
<el-row :gutter="17">
<el-col :span="4" v-for='(item,index) in tehuis' :key="index" v-if='index>5'>
<div class="team-item" :style="{'height':`${itemHeight}`}" @click="goUrl('detail',item.id,item)">
<img v-if="item.imgCover!=null&&item.imgCover.length" :src='compressImg(JSON.parse(item.imgCover)[0].Url, "filt", 245, "")' />
<div class="info-box">
<div class="item-title">{{item.ltName}}</div>
<div>
<span class="day">{{item.dataStr}} 出发</span>
<span class="price">￥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}</span> 起
</div>
</div>
</div>
</el-col>
</el-row>
</div>
</el-col>
</el-row> -->
<el-row v-if="activeName=='2'">
<el-col :span="20" :offset="2">
<div class="item-box">
<el-row :gutter="17">
<el-col :span="4" v-for="(item,index) in tiaoshui" :key="index">
<div class="team-item noradius" :style="{'height':`${itemHeight}`}" @click="goUrl('detail',item.id, item)">
<img class="notamin" v-if='item.imgCover!=null&&item.imgCover.length' :src='compressImg(JSON.parse(item.imgCover)[0].Url, "filt", 245, "")' />
<img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
<div class="company">
{{item.startCityName}}出发
</div>
<div class="limit">
跳水
<div class="item-content-box none-margin">
<el-row style="background:#f1f1f1">
<el-col :span="4" >
<img src="../../assets/img/img-01.png" style="width:100%" v-if='sItem.name.indexOf("日本")!=-1'/>
<img src="../../assets/img/img-03.png" style="width:100%" v-else />
</el-col>
<el-col :span="20" style="padding-left:10px;position:relative;" :style="{'min-height':`${groupHeight}px`}" v-loading='item.pageDate==="undefined"'>
<div class="item-box">
<el-row :gutter="10">
<el-col :span="6" v-for='(data,index) in sItem.pageData' :key="index" >
<div class="group-item" :style="{'height':`${groupHeight}px`}" @click="goUrl('detail',data.id,data)">
<div class="team-item noradius" :style="{'height':`${groupItemHeight}`}">
<img class="notamin" v-if='data.imgCover!=null&&data.imgCover.length' :src='compressImg(JSON.parse(data.imgCover)[0].Url, "filt", 245, "")'/>
<img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
<div class="company">
{{data.startCityName}}出发
</div>
<div class="group-new" v-if='index<2'>
新团上市
</div>
</div>
<div class="info none-border">
<div class="item-title"><a href="javascript:" :style="{'font-size':`${groupHeight>400?'16px':'14px'}`}">{{data.title}}</a></div>
<div class="seatinfo" :style="{'margin-top':`${groupHeight>400?'0px':'-10px'}`}">
<div class="seat" style='font-size:12px;'>最近团期：<span style='font-size:14px; color:#795548;'>{{data.startDate}}</span></div>
<div class="day">{{data.dayNum}}天</div>
</div>
<div v-if='groupHeight>400 && data.discountPrice>0'>
<el-tag type="danger">早鸟立减{{data.discountPrice}}</el-tag>
</div>
<div class="price">￥{{isLogin!==1?data.b2CPrice:data.b2BPrice}}<span class="ful">起</span></div>
<div class="yuding" v-if='groupHeight>300'>
<el-button type="danger" size="small">预订</el-button>
</div>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
<div class="info">
<div class="item-title"><a href="javascript:">{{item.title}}</a></div>
<div class="seat"><span class="day">{{item.dataStr}} </span>仅余{{item.surplus}}席</div>
<div class="price">￥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}<span class="ful">起</span></div>
</div>
</el-col>
</el-row>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="20" :offset="2">
<div class="title">
<div class="t1">
<img src="../../assets/img/img-title-blue.png" />
<span class="t2">出境跟团游</span>
<img src="../../assets/img/img-title-blue.png" />
</el-col>
</el-row>
</div>
</div>
</el-col>
</el-row>
<el-row v-loading='loadingIndex==index' v-for="(item,index) in recoItems.line" :key="index" v-if="item.id==115" :style="{'margin-top':`${index>0?'50px':'10px'}`}">
</el-col>
</el-row>
</template>
<!-- <el-row v-loading='loadingIndex==index' v-for="(item,index) in recoItems.line" :key="index" v-if="item.id==115" :style="{'margin-top':`${index>0?'50px':'10px'}`}">
<el-col :span="20" :offset="2">
<div class="title">
<div class="t1">
......@@ -129,9 +75,6 @@
<img src="../../assets/img/img-01.png" style="width:100%" v-if='item.name.indexOf("日本")!=-1'/>
<img src="../../assets/img/img-02.png" style="width:100%" v-else-if='item.name.indexOf("韩国")!=-1'/>
<img src="../../assets/img/img-03.png" style="width:100%" v-else />
<!-- <div class="tags">
<div v-for="tItem in item.ticketList" :key="tItem.id" @click="goSearch(tItem.name)"><span class="tag">{{tItem.name}}</span></div>
</div> -->
</el-col>
<el-col :span="20" style="padding-left:10px;position:relative;" :style="{'min-height':`${groupHeight}px`}" v-loading='item.pageDate==="undefined"'>
<div class="item-box">
......@@ -141,9 +84,6 @@
<div class="team-item noradius" :style="{'height':`${groupItemHeight}`}">
<img class="notamin" v-if='data.imgCover!=null&&data.imgCover.length' :src='compressImg(JSON.parse(data.imgCover)[0].Url, "filt", 245, "")'/>
<img class="notamin" src="../../assets/img/bg_c2@3x.png" v-else />
<!-- <div class="seat" :style="{'left':`${(w-100)/2}px`,'top':`${(h-100)/2}px`}">
仅于<span class="cnt">3</span>席
</div> -->
<div class="company">
{{data.startCityName}}出发
</div>
......@@ -173,7 +113,7 @@
</el-row>
</div>
</el-col>
</el-row>
</el-row> -->
</div>
</template>
<script>
......@@ -244,28 +184,29 @@ export default {
},
loadRecoItems(){
if(this.companyId!=-1){
this.apipost('b2b_get_GetHomeSearchItem',{'companyId':this.companyId},r=>{
this.apipost('b2b_get_GetHomeSearchItem',{'companyId':this.companyId,lineDirection: 3,},r=>{
r.data.data.line.forEach(x=>{
x.chosenLineTeam='0'
})
this.recoItems=r.data.data
this.activeName=r.data.data.recommend[0].id.toString()
this.recoItems.line.forEach((x, index)=>{
if (x.id === 115) {
x.lineTeam.forEach((y, sIndex)=>{
this.loadingIndex=index
let msg={
pageIndex:1,
pageSize:4,
companyId:this.companyId,
lineId:115,
lineTeamId:0
lineId:x.id,
lineTeamId:y.id
}
this.apipost('b2b_get_GetB2BHomeLineTravelPageList',msg,res=>{
this.recoItems.line[index].pageData=res.data.data.pageData
this.recoItems.line[index].lineTeam[sIndex].pageData=res.data.data.pageData
//this.$set(this.recoItems.line[sno],this.recoItems.line[sno])
this.$forceUpdate()
this.loadingIndex=-1
},null)
}
})
})
},null)
}
......
src/components/mall/heeltour.vue
View file @ 3918fc89
......@@ -370,7 +370,7 @@ export default {
},
loadRecoItems(){
if(this.companyId!=-1){
this.apipost('b2b_get_GetHomeSearchItem',{'companyId':this.companyId},r=>{
this.apipost('b2b_get_GetHomeSearchItem',{'companyId':this.companyId,lineDirection: 2,},r=>{
r.data.data.line.forEach(x=>{
x.chosenLineTeam='0'
})
......
src/components/trip/waterfall/index.vue
View file @ 3918fc89
......@@ -8,7 +8,8 @@
<div v-for="(item,index) in tripList" :key="index">
<div class="timeline-item">
<div class="left">
<span class="big">D{{item.dayNum}}</span>
<!-- <span class="big">D{{item.dayNum}}</span> -->
<span class="big" style=" font-size: 20px;">行程</span>
</div>
<div class="right">
<span class="medium">
......@@ -24,8 +25,8 @@
<hotel v-if="son.type==3" :tripItem='son'></hotel>
<restaurant v-if="son.type==4" :tripItem='son'></restaurant>
<activity v-if="son.type==5" :tripItem='son'></activity>
<tips v-if="son.type==6" :tripItem='son'></tips>
</div>
<tips v-if="son.type==6" :tripItem='son'></tips>
</div>
</div>
</div>
</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