Skip to content

A
Athena
Commit 61bf754b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

新增1日游

parent 7d0592a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2462 additions and 10 deletions
src/components/global/head.vue
View file @ 61bf754b
......@@ -85,7 +85,7 @@ color:rgba(51,51,51,1);
<el-submenu index="1">
<template slot="title">旅游</template>
<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-4">私人订制</el-menu-item> -->
</el-submenu>
......@@ -101,7 +101,7 @@ color:rgba(51,51,51,1);
</el-menu>
</el-col>
<el-col :span="3">
<div class="position">
<div class="position" v-if="!ifOneDay">
<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>
......@@ -164,7 +164,8 @@ export default {
isLogin:false,
// homePage:localStorage.homePage?localStorage.homePage:false,
// homePage:this.$store.state.homePage,
groupInfo:{}
groupInfo:{},
ifOneDay: false,
}
},
created(){
......@@ -214,6 +215,13 @@ export default {
this.defaultKey=key;
sessionStorage.setItem("defaultKey",this.defaultKey);
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(){
let msg={}
......
src/components/mall/LuckDraw.vue 0 → 100644
View file @ 61bf754b
<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 @ 61bf754b
This diff is collapsed.
src/components/mall/OneDaySearch.vue 0 → 100644
View file @ 61bf754b
This diff is collapsed.
src/components/mall/OneDaySwiper.vue 0 → 100644
View file @ 61bf754b
<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 @ 61bf754b
This diff is collapsed.
src/components/trade/order/OneDayIndex.vue 0 → 100644
View file @ 61bf754b
This diff is collapsed.
src/components/trade/order/indexTwo.vue
View file @ 61bf754b
......@@ -189,8 +189,8 @@
<el-row>
<el-col class="_trip_xiangqing">
<template v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer &&customer.customerId'>
<p >航班</p>
<div class="_info_trip" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId'>
<p v-if="numPeople.oneDay!==1">航班</p>
<div class="_info_trip" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId && numPeople.oneDay!==1'>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<th>航空公司</th>
......@@ -224,23 +224,25 @@
<label>成人</label>：
<el-input-number :min="0" :max='sumSeat-chosenObj.etCount-chosenObj.lrCount' v-model="chosenObj.crCount" size="small"></el-input-number>
</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>
<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 :span='4'>
<el-col v-if="numPeople.oneDay!==1" :span='4'>
<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-col>
<el-col :span='4'>
<el-col v-if="numPeople.oneDay!==1" :span='4'>
<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-col>
<el-col :span='4'>
<el-col v-if="numPeople.oneDay!==1" :span='4'>
<label>婴儿</label>：
<el-input-number :min="0" v-model="chosenObj.yeCount" size="small"></el-input-number>
</el-col>
<el-col v-if="numPeople.oneDay===1" style="color:#fff">
.
</el-col>
<!-- <el-col :span='4'>
<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>
......
src/router.js
View file @ 61bf754b
......@@ -57,6 +57,23 @@ export default new Router({
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",
name: "heel",
......@@ -66,6 +83,15 @@ export default new Router({
title: "跟团游-印象之旅~感动与世界同步"
}
},
{
path: "/OneDayTour",
name: "OneDayTour",
component: resolve =>
require(["@/components/mall/OneDayTour"], resolve),
meta: {
title: "一日游-印象之旅~感动与世界同步"
}
},
{
path: "/coding",
name: "coding",
......@@ -82,6 +108,14 @@ export default new Router({
title: "搜索行程-印象之旅~感动与世界同步"
}
},
{
path: "/OneDaySearch",
name: "OneDaySearch",
component: resolve => require(["@/components/mall/OneDaySearch"], resolve),
meta: {
title: "搜索行程-印象之旅~感动与世界同步"
}
},
{
path: "/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