Skip to content

A
Athena
Commit 1f1c6ce6 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 452fb592 3918fc89
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2497 additions and 34 deletions
src/assets/mall/PsMyCoupon.css
View file @ 1f1c6ce6
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
cursor: pointer; cursor: pointer;
} }
.PsMyCoupon ._item ._bottom{ .PsMyCoupon ._item ._bottom{
padding: 15px 10px 0 10px; padding: 15px 10px;
background-color: #F9F9F9; background-color: #F9F9F9;
} }
.PsMyCoupon ._item ._bottom p{ .PsMyCoupon ._item ._bottom p{
...@@ -159,6 +159,9 @@ ...@@ -159,6 +159,9 @@
color: #666666; color: #666666;
font-weight: 300; font-weight: 300;
} }
.PsMyCoupon ._item ._bottom p._margin_bt0{
margin-bottom: 0 !important;
}
.PsMyCoupon p._info_coupon_name{ .PsMyCoupon p._info_coupon_name{
font-size: 18px !important; font-size: 18px !important;
max-width: 140px; max-width: 140px;
......
src/assets/mall/PsOrder.css
View file @ 1f1c6ce6
.PsOrder ._content table{ .PsOrder ._content table{
width: 100%; width: 100%;
border-collapse: collapse;
} }
.PsOrder ._content tbody td{ .PsOrder ._content tbody td{
padding: 6px 0; padding: 6px 0;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
border-bottom: 1px solid #E6E6E6; border: 1px solid #E6E6E6;
} }
.PsOrder ._el_tab{ .PsOrder ._el_tab{
margin: 20px 0 0 0; margin: 20px 0 0 0;
} }
.PsOrder ._el_tab ul{ .PsOrder ._el_tab ul{
padding: 0 80px; padding: 0 80px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6;
} }
.PsOrder ._el_tab ul li{ .PsOrder ._el_tab ul li{
...@@ -33,4 +34,8 @@ ...@@ -33,4 +34,8 @@
color: #E73828; color: #E73828;
border-bottom: 2px solid #E73828; border-bottom: 2px solid #E73828;
} }
.PsOrder .hgh_table{margin-bottom: 20px;} .PsOrder .table_box{
\ No newline at end of file min-height: 565px;
}
.PsOrder .hgh_table{margin-bottom: 20px;}
.PsOrder .hgh_table tr td{line-height: 30px}
\ No newline at end of file
src/components/PersonalCenter/PsCenter.vue
View file @ 1f1c6ce6
...@@ -203,6 +203,7 @@ export default { ...@@ -203,6 +203,7 @@ export default {
value: year, value: year,
label: year+'年' label: year+'年'
} }
this.year = year+'年'
this.yearList.push(obj); this.yearList.push(obj);
for(let a = 0;a<12;a++){ for(let a = 0;a<12;a++){
num = num-1; num = num-1;
......
src/components/PersonalCenter/PsMyCoupon.vue
View file @ 1f1c6ce6
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
<p class="_info_sale" v-else><span>￥</span>{{item.denomination}}</p> <p class="_info_sale" v-else><span>￥</span>{{item.denomination}}</p>
<p class="_info_full">满{{item.useCondition}}可用</p> <p class="_info_full">满{{item.useCondition}}可用</p>
<p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p> <p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_info_bottom">去使用</p> <p class="_info_bottom" @click="goUrl('heel',true)">去使用</p>
</div> </div>
</div> </div>
<div class="_bottom"> <div class="_bottom">
<p class="_bottom_tit">可用线路及系列</p> <p class="_bottom_tit">可用线路及系列</p>
<p class="_bottom_info">{{item.lineName === '' ? '不限' : item.lineName}}-{{item.lineTeamName === '' ? '不限' : item.lineTeamName}}</p> <p class="_bottom_info">{{item.lineName === '' ? '不限' : item.lineName}}-{{item.lineTeamName === '' ? '不限' : item.lineTeamName}}</p>
<p class="_bottom_tit">优惠券来源</p> <p class="_bottom_tit">优惠券来源</p>
<p class="_bottom_info">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p> <p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -176,6 +176,16 @@ export default { ...@@ -176,6 +176,16 @@ export default {
resetPageIndex() {//查询初始化页码 resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
}, },
goUrl(path,bl){
// console.log("path",path)
if(path=='heel'){
sessionStorage.setItem("defaultKey",'2-1');
this.$emit('forword', '2-1')
}
sessionStorage.setItem("Homepage",bl);
this.$store.commit('HomePage',bl)
this.$router.push({name:path});
}
} }
} }
</script> </script>
\ No newline at end of file
src/components/PersonalCenter/PsOrder.vue
View file @ 1f1c6ce6
<style> <style>
@import "../../assets/mall/PsOrder.css"; @import "../../assets/mall/PsOrder.css";
.TC_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
.TC_tripDetails .popper__arrow::after {border-bottom-color: #ededed !important;}
.TC_tripDetails table { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
.TC_tripDetails table th { background-color: #ededed; padding: 5px;}
.TC_tripDetails table td { background-color: #ffffff; padding: 9px 15px;color: #333333;border: 1px solid #d2d2d2;}
.TC_tripDetails table td._d_name {background-color: #ededed;}
.TC_tripDetails table ._color_666 {color: #666666;}
.TC_tripDetails table tr._color_666 th { padding: 9px 15px;}
</style> </style>
<template> <template>
...@@ -7,21 +15,23 @@ ...@@ -7,21 +15,23 @@
<el-col :span="20" :offset="2" class="_content"> <el-col :span="20" :offset="2" class="_content">
<el-row class="_el_tab"> <el-row class="_el_tab">
<ul> <ul>
<li :class="active==0?'active':''" @click="active=0,getList(),resetPageIndex()">全部订单</li> <li :class="active==0?'active':''" @click="active=0,resetPageIndex(),getList()">全部订单</li>
<li :class="active==1?'active':''" @click="active=1,getList(),resetPageIndex()">待付款</li> <li :class="active==1?'active':''" @click="active=1,resetPageIndex(),getList()">待付款</li>
<li :class="active==2?'active':''" @click="active=2,getList(),resetPageIndex()">等待出团</li> <li :class="active==2?'active':''" @click="active=2,resetPageIndex(),getList()">等待出团</li>
<li :class="active==3?'active':''" @click="active=3,getList(),resetPageIndex()">已出团</li> <li :class="active==3?'active':''" @click="active=3,resetPageIndex(),getList()">已出团</li>
<li :class="active==4?'active':''" @click="active=4,getList(),resetPageIndex()">已取消</li> <li :class="active==4?'active':''" @click="active=4,resetPageIndex(),getList()">已取消</li>
</ul> </ul>
</el-row> </el-row>
<el-row class="_table_box" v-loading='dateLoading'> <el-row class="_table_box" v-loading='dateLoading'>
<table style="border:1px solid #E6E6E6;" class="hgh_table" border="0" cellspacing="0" cellpadding="0" v-if="MyOrderPageList.length"> <div class="table_box" v-if="MyOrderPageList.length">
<table class="hgh_table" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<tr> <tr>
<th >出发日期</th> <th >出发日期</th>
<th >订单号/来源</th> <th >订单号/来源</th>
<th >人数</th> <th >人数</th>
<th >总金额(元)</th> <th >总金额(元)</th>
<th >优惠金额(元)</th>
<th >实付金额</th> <th >实付金额</th>
<th >状态</th> <th >状态</th>
<th >下单时间</th> <th >下单时间</th>
...@@ -33,8 +43,42 @@ ...@@ -33,8 +43,42 @@
<td>{{item.startDate}}</td> <td>{{item.startDate}}</td>
<td>{{item.orderId}}</td> <td>{{item.orderId}}</td>
<td>{{item.guestNum}}</td> <td>{{item.guestNum}}</td>
<td class="hgh_font_color_org">{{item.preferPrice}}</td> <td class="hgh_font_color_org">{{moneyFormat(item.preferPrice)}}</td>
<td class="hgh_font_color_org">￥{{item.income}}</td> <td class="hgh_font_color_org">
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-for="(fItem,fIndex) in item.couponAllotList" :key="fIndex" style="text-align:center;">
<td>
{{fItem.couponsName}}
</td>
<td>
{{fItem.couponsType === 1 ? '抵用券' : '折扣券'}}
</td>
<td>
{{fItem.denomination}}
</td>
<td>
满{{fItem.useCondition}}使用
</td>
<td>{{fItem.accessType === 1 ? '抽奖' : '其他'}}</td>
<td>{{fItem.acessDate}}</td>
</tr>
</table>
<div slot="reference" style="cursor: pointer;text-decoration: underline;">
{{moneyFormat(item.discountMoney)}}
</div>
</el-popover>
</td>
<td class="hgh_font_color_org">￥{{moneyFormat(item.income)}}</td>
<td> <td>
<span v-if="item.orderType==1">待付款</span> <span v-if="item.orderType==1">待付款</span>
<span v-if="item.orderType==2">待出团</span> <span v-if="item.orderType==2">待出团</span>
...@@ -49,12 +93,14 @@ ...@@ -49,12 +93,14 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="item-pager" v-if="MyOrderPageList.length"> <div class="item-pager" v-if="MyOrderPageList.length">
<el-pagination <el-pagination
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="totalCount" :total="totalCount"
:page-size='pageSize' :page-size='pageSize'
:current-page.sync="currentPage"
@current-change='handleCurrentChange'> @current-change='handleCurrentChange'>
</el-pagination> </el-pagination>
</div> </div>
...@@ -79,11 +125,12 @@ export default { ...@@ -79,11 +125,12 @@ export default {
pageSize:1, pageSize:1,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:11, pageSize:12,
orderType:0, orderType:0,
}, },
MyOrderPageList:[], MyOrderPageList:[],
dateLoading:true, dateLoading:true,
currentPage: 1,
} }
}, },
computed: { computed: {
...@@ -137,6 +184,7 @@ export default { ...@@ -137,6 +184,7 @@ export default {
}, },
resetPageIndex() {//查询初始化页码 resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1;
}, },
} }
} }
......
src/components/global/head.vue
View file @ 1f1c6ce6
...@@ -65,7 +65,8 @@ color:rgba(51,51,51,1); ...@@ -65,7 +65,8 @@ color:rgba(51,51,51,1);
<el-menu-item index="3-2">中国（繁体）</el-menu-item> <el-menu-item index="3-2">中国（繁体）</el-menu-item>
<el-menu-item index="3-3">英语</el-menu-item> <el-menu-item index="3-3">英语</el-menu-item>
</el-submenu> --> </el-submenu> -->
<el-menu-item index="2" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">我的订单</a></el-menu-item> <!-- 我的订单 -->
<el-menu-item index="2" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人中心</a></el-menu-item>
<el-menu-item index="1" @click="goUrl('heel',true)"><a href="javascript:void(0);">首页</a></el-menu-item> <el-menu-item index="1" @click="goUrl('heel',true)"><a href="javascript:void(0);">首页</a></el-menu-item>
</el-menu> </el-menu>
</el-col> </el-col>
...@@ -84,11 +85,11 @@ color:rgba(51,51,51,1); ...@@ -84,11 +85,11 @@ color:rgba(51,51,51,1);
<el-submenu index="1"> <el-submenu index="1">
<template slot="title">旅游</template> <template slot="title">旅游</template>
<el-menu-item index="2-1">跟团游</el-menu-item> <el-menu-item index="2-1">跟团游</el-menu-item>
<el-menu-item index="2-2">小包团</el-menu-item> <el-menu-item index="2-2">一日游</el-menu-item>
<!-- <el-menu-item index="2-3">单团</el-menu-item> <!-- <el-menu-item index="2-3">单团</el-menu-item>
<el-menu-item index="2-4">私人订制</el-menu-item> --> <el-menu-item index="2-4">私人订制</el-menu-item> -->
</el-submenu> </el-submenu>
<el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item> <!-- <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item> -->
<!-- <el-menu-item index="4" @click="goUrl('VisaHomePage',true)"><a href="javascript:void(0);">签证</a></el-menu-item> --> <!-- <el-menu-item index="4" @click="goUrl('VisaHomePage',true)"><a href="javascript:void(0);">签证</a></el-menu-item> -->
<!-- <el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item> --> <!-- <el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item> -->
...@@ -100,7 +101,7 @@ color:rgba(51,51,51,1); ...@@ -100,7 +101,7 @@ color:rgba(51,51,51,1);
</el-menu> </el-menu>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="position"> <div class="position" v-if="!ifOneDay">
<el-select v-model="city" placeholder="请选择" size="mini" @change="changeSite"> <el-select v-model="city" placeholder="请选择" size="mini" @change="changeSite">
<el-option v-for="item in sites" :key="item.companyId" :label="item.siteName" :value="item.companyId"></el-option> <el-option v-for="item in sites" :key="item.companyId" :label="item.siteName" :value="item.companyId"></el-option>
...@@ -136,7 +137,7 @@ color:rgba(51,51,51,1); ...@@ -136,7 +137,7 @@ color:rgba(51,51,51,1);
<el-menu default-active="" class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455"> <el-menu default-active="" class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455">
<el-menu-item index="1" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人主页</a></el-menu-item> <el-menu-item index="1" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人主页</a></el-menu-item>
<el-menu-item index="2" @click="goUrl('PsOrder',false)"><a href="javascript:void(0);">订单管理</a></el-menu-item> <el-menu-item index="2" @click="goUrl('PsOrder',false)"><a href="javascript:void(0);">订单管理</a></el-menu-item>
<el-menu-item index="6" @click="goUrl('AirlineTicketOrder',false)"><a href="javascript:void(0);">机票订单</a></el-menu-item> <!-- <el-menu-item index="6" @click="goUrl('AirlineTicketOrder',false)"><a href="javascript:void(0);">机票订单</a></el-menu-item> -->
<el-menu-item index="3"><a href="javascript:void(0);">经营管理</a></el-menu-item> <el-menu-item index="3"><a href="javascript:void(0);">经营管理</a></el-menu-item>
<el-menu-item index="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item> <el-menu-item index="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item>
<el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item> <el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item>
...@@ -163,7 +164,8 @@ export default { ...@@ -163,7 +164,8 @@ export default {
isLogin:false, isLogin:false,
// homePage:localStorage.homePage?localStorage.homePage:false, // homePage:localStorage.homePage?localStorage.homePage:false,
// homePage:this.$store.state.homePage, // homePage:this.$store.state.homePage,
groupInfo:{} groupInfo:{},
ifOneDay: false,
} }
}, },
created(){ created(){
...@@ -213,6 +215,13 @@ export default { ...@@ -213,6 +215,13 @@ export default {
this.defaultKey=key; this.defaultKey=key;
sessionStorage.setItem("defaultKey",this.defaultKey); sessionStorage.setItem("defaultKey",this.defaultKey);
this.$emit('forword', key) this.$emit('forword', key)
if(key === '2-1') {
this.$router.push({ path: '/heel'})
this.ifOneDay = false
} else if(key === '2-2') {
this.$router.push({ path: '/OneDayTour'})
this.ifOneDay = true
}
}, },
loadSites(){ loadSites(){
let msg={} let msg={}
......
src/components/mall/LuckDraw.vue 0 → 100644
View file @ 1f1c6ce6
<style>
.LuckDraw{
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
background-color: rgba(0, 0, 0, 0.55);
z-index: 9999;
}
</style>
<template>
<div class="LuckDraw">
<div>
抽奖活动@！~~~
</div>
</div>
</template>
<script>
export default {
components: {},
data() {
return {};
},
computed: {},
created() {},
mounted() {},
methods: {}
};
</script>
\ No newline at end of file
src/components/mall/OneDayDetailTwo.vue 0 → 100644
View file @ 1f1c6ce6
This diff is collapsed.
src/components/mall/OneDaySearch.vue 0 → 100644
View file @ 1f1c6ce6
This diff is collapsed.
src/components/mall/OneDaySwiper.vue 0 → 100644
View file @ 1f1c6ce6
<style>
@import url('../../assets/mall/swiper.css');
</style>
<template>
<div class="mall-swiper">
<el-carousel :interval="20000" arrow="never" :height="swiperHeight" trigger="click" :style="{'background':'#ddd'}" v-loading='isLoading'>
<el-carousel-item>
<img src='../../assets/img/01.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/02.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/03.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/04.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/05.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/06.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/07.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/08.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/09.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/10.jpg'>
</el-carousel-item>
</el-carousel>
<div class="search-box" :style="{'width':searchBoxWidth,'left':searchBoxLeft}">
<div class="chosen-item">旅游</div>
<div class="search-content">
<el-row>
<el-col :span="2" style="text-align:center">
<i class="iconfont icon-search"></i>
</el-col>
<el-col :span="15">
<input type="text" v-model='searchText' class="s-input" placeholder="快速搜索如出游国家，目的地名称等" @keyup.enter='goSearch'/>
</el-col>
<el-col :span="6" :offset="1" style="text-align:right;line-height:29px;">
<el-button type="danger" size="mini" @click="goSearch">立即搜索</el-button>
</el-col>
</el-row>
</div>
</div>
</div>
</template>
<script>
export default {
data () {
return {
swiperHeight:'500px',
searchBoxWidth:'580px',
searchBoxLeft:'270px',
swipers:[],
isLoading:true,
companyId:-1,
searchText:''
}
},
mounted () {
this.companyId=this.$store.state.site
this.changeScreen()
this.loadSwiper()
},
methods: {
goSearch(){
if(this.searchText!=''){
let query={keywords:encodeURIComponent(this.searchText)}
this.$router.push({
path:'OneDaySearch',
query
});
}else{
this.Error('请输入搜索关键词')
}
},
loadSwiper(){
if(this.companyId!=-1){
this.apipost('b2b_get_HomeSlide',{'companyId':this.companyId},r=>{
this.swipers=r.data.data
this.isLoading=false
},null)
}
},
changeScreen(){
let h=window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
this.swiperHeight=h/3.84+'px'
this.searchBoxWidth=h/3.01+'px'
this.searchBoxLeft=(h-(h/3.01))/2+'px'
}
}
}
</script>
src/components/mall/OneDayTour.vue 0 → 100644
View file @ 1f1c6ce6
This diff is collapsed.
src/components/mall/heeltour.vue
View file @ 1f1c6ce6
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
}, },
loadRecoItems(){ loadRecoItems(){
if(this.companyId!=-1){ 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=>{ r.data.data.line.forEach(x=>{
x.chosenLineTeam='0' x.chosenLineTeam='0'
}) })
......
src/components/trade/order/OneDayIndex.vue 0 → 100644
View file @ 1f1c6ce6
This diff is collapsed.
src/components/trade/order/indexTwo.vue
View file @ 1f1c6ce6
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
<el-row> <el-row>
<el-col class="_trip_xiangqing"> <el-col class="_trip_xiangqing">
<template v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer &&customer.customerId'> <template v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer &&customer.customerId'>
<p >航班</p> <p v-if="numPeople.oneDay!==1">航班</p>
<div class="_info_trip" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId'> <div class="_info_trip" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId && numPeople.oneDay!==1'>
<table border="0" cellspacing="0" cellpadding="0"> <table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>航空公司</th> <th>航空公司</th>
...@@ -224,23 +224,25 @@ ...@@ -224,23 +224,25 @@
<label>成人</label>： <label>成人</label>：
<el-input-number :min="0" :max='sumSeat-chosenObj.etCount-chosenObj.lrCount' v-model="chosenObj.crCount" size="small"></el-input-number> <el-input-number :min="0" :max='sumSeat-chosenObj.etCount-chosenObj.lrCount' v-model="chosenObj.crCount" size="small"></el-input-number>
</el-col> </el-col>
<el-col :span='4' v-show="false"> <el-col v-if="numPeople.oneDay!==1" :span='4' v-show="false">
<label class="underline">儿童： </label> <label class="underline">儿童： </label>
<el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etbzcCount' v-model="chosenObj.etCount" size="small"></el-input-number> <el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etbzcCount' v-model="chosenObj.etCount" size="small"></el-input-number>
</el-col> </el-col>
<el-col :span='4'> <el-col v-if="numPeople.oneDay!==1" :span='4'>
<label class="underline">儿童不占床： </label> <label class="underline">儿童不占床： </label>
<el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etzc' v-model="chosenObj.etbzcCount" size="small"></el-input-number> <el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etzc' v-model="chosenObj.etbzcCount" size="small"></el-input-number>
</el-col> </el-col>
<el-col :span='4'> <el-col v-if="numPeople.oneDay!==1" :span='4'>
<label class="underline">儿童占床： </label> <label class="underline">儿童占床： </label>
<el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etbzcCount' v-model="chosenObj.etzc" size="small"></el-input-number> <el-input-number :min="0" :max='sumSeat-chosenObj.crCount-chosenObj.lrCount-chosenObj.etbzcCount' v-model="chosenObj.etzc" size="small"></el-input-number>
</el-col> </el-col>
<el-col :span='4'> <el-col v-if="numPeople.oneDay!==1" :span='4'>
<label>婴儿</label>： <label>婴儿</label>：
<el-input-number :min="0" v-model="chosenObj.yeCount" size="small"></el-input-number> <el-input-number :min="0" v-model="chosenObj.yeCount" size="small"></el-input-number>
</el-col> </el-col>
<el-col v-if="numPeople.oneDay===1" style="color:#fff">
.
</el-col>
<!-- <el-col :span='4'> <!-- <el-col :span='4'>
<label>老人</label>： <label>老人</label>：
<el-input-number :min="0" @change="peopleMax(3)" :max='sumSeat-chosenObj.etCount-chosenObj.crCount' v-model="chosenObj.lrCount" size="small"></el-input-number> <el-input-number :min="0" @change="peopleMax(3)" :max='sumSeat-chosenObj.etCount-chosenObj.crCount' v-model="chosenObj.lrCount" size="small"></el-input-number>
...@@ -389,12 +391,13 @@ ...@@ -389,12 +391,13 @@
</div> </div>
</div> --> </div> -->
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment' import moment from 'moment'
import bus from '../../../plugins/event-bus' import bus from '../../../plugins/event-bus'
import LuckDraw from '../../mall/LuckDraw'
export default { export default {
components: {LuckDraw},
props:['ID','tcid','numPeople'], props:['ID','tcid','numPeople'],
data () { data () {
let that=this let that=this
......
src/components/trip/waterfall/index.vue
View file @ 1f1c6ce6
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
<div v-for="(item,index) in tripList" :key="index"> <div v-for="(item,index) in tripList" :key="index">
<div class="timeline-item"> <div class="timeline-item">
<div class="left"> <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>
<div class="right"> <div class="right">
<span class="medium"> <span class="medium">
...@@ -24,8 +25,8 @@ ...@@ -24,8 +25,8 @@
<hotel v-if="son.type==3" :tripItem='son'></hotel> <hotel v-if="son.type==3" :tripItem='son'></hotel>
<restaurant v-if="son.type==4" :tripItem='son'></restaurant> <restaurant v-if="son.type==4" :tripItem='son'></restaurant>
<activity v-if="son.type==5" :tripItem='son'></activity> <activity v-if="son.type==5" :tripItem='son'></activity>
<tips v-if="son.type==6" :tripItem='son'></tips> <tips v-if="son.type==6" :tripItem='son'></tips>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
src/router.js
View file @ 1f1c6ce6
...@@ -57,6 +57,23 @@ export default new Router({ ...@@ -57,6 +57,23 @@ export default new Router({
title: '团队详情-印象之旅~感动与世界同步' title: '团队详情-印象之旅~感动与世界同步'
} }
}, },
{
path: "/OneDayDetailTwo/:id/:tcid",
name: "OneDayDetailTwo",
component: resolve =>
require(["@/components/mall/OneDayDetailTwo"], resolve),
meta: {
title: "团队详情-印象之旅~感动与世界同步"
}
},
{
path: '/OneDayDetailTwo/:id/:tcid/:pre',
name: 'OneDayDetailTwo',
component: resolve => require(['@/components/mall/OneDayDetailTwo'], resolve),
meta: {
title: '团队详情-印象之旅~感动与世界同步'
}
},
{ {
path: "/heel", path: "/heel",
name: "heel", name: "heel",
...@@ -66,6 +83,15 @@ export default new Router({ ...@@ -66,6 +83,15 @@ export default new Router({
title: "跟团游-印象之旅~感动与世界同步" title: "跟团游-印象之旅~感动与世界同步"
} }
}, },
{
path: "/OneDayTour",
name: "OneDayTour",
component: resolve =>
require(["@/components/mall/OneDayTour"], resolve),
meta: {
title: "一日游-印象之旅~感动与世界同步"
}
},
{ {
path: "/coding", path: "/coding",
name: "coding", name: "coding",
...@@ -82,6 +108,14 @@ export default new Router({ ...@@ -82,6 +108,14 @@ export default new Router({
title: "搜索行程-印象之旅~感动与世界同步" title: "搜索行程-印象之旅~感动与世界同步"
} }
}, },
{
path: "/OneDaySearch",
name: "OneDaySearch",
component: resolve => require(["@/components/mall/OneDaySearch"], resolve),
meta: {
title: "搜索行程-印象之旅~感动与世界同步"
}
},
{ {
path: "/PersonalHome", path: "/PersonalHome",
name: "PersonalHome", name: "PersonalHome",
......
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