Commit d63d1689 authored by huangyuanyuan's avatar huangyuanyuan

定制游等

parent d20dd21a
...@@ -15,12 +15,16 @@ ...@@ -15,12 +15,16 @@
} }
.Home .el-tabs__item.is-active { .Home .el-tabs__item.is-active {
color: #fd6473; color: #fd6473;
font-family: "PingFangR";
} }
.Home .tag_active { .Home .tag_active {
background: #fff; background: #fff;
color: #fd6473 !important; color: #fd6473 !important;
font-weight: bold; font-weight: bold;
} }
.Home .tag_active .iconfont{
color: #fd6473 !important;
}
.Home .form_ul { .Home .form_ul {
overflow: auto; overflow: auto;
} }
...@@ -60,6 +64,7 @@ ...@@ -60,6 +64,7 @@
} }
.Home .Home_top .tag_left li .iconfont { .Home .Home_top .tag_left li .iconfont {
font-size: 20px; font-size: 20px;
color: #ababab;
} }
.Home ul, .Home ul,
p { p {
...@@ -78,7 +83,7 @@ p { ...@@ -78,7 +83,7 @@ p {
font-size: 12px; font-size: 12px;
padding-top: 12px; padding-top: 12px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px dashed #aaaaaa; border-bottom: 1px dashed #737373;
cursor: pointer; cursor: pointer;
} }
.Home .Home_top .tag_left { .Home .Home_top .tag_left {
......
...@@ -60,8 +60,9 @@ ...@@ -60,8 +60,9 @@
</span> </span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.hotelName}}</span></p> <p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px"> <div v-if="des.childItem.description" style="font-size:14px;margin-top:20px">
{{des.childItem.description}} <div v-html="des.childItem.description">
</div>
</div> </div>
...@@ -131,11 +132,11 @@ ...@@ -131,11 +132,11 @@
<span class="iconfont icon-Shape4"></span> <span class="iconfont icon-Shape4"></span>
</span> </span>
<p style="font-size:16px;"><span>景点</span><span style="margin-left:5px;font-size:12px;">(3个)</span></p> <p style="font-size:16px;"><span>景点</span></p>
<div v-for="img in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px"> <div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<!-- <p>晚餐</p> --> <p v-html="des.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -151,11 +152,11 @@ ...@@ -151,11 +152,11 @@
<span class="iconfont icon-Shape5"></span> <span class="iconfont icon-Shape5"></span>
</span> </span>
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">兰拉面(道顿堀店)(大阪)</span></p> <p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.dinnerName}}</span></p>
<div v-for="img in des.childItem.imaArray" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img src="../../assets/img/visa/activy.jpg" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px"> <div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p>晚餐</p> <p v-html="des.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -255,6 +256,7 @@ export default { ...@@ -255,6 +256,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message); this.Success(res.data.message);
this.GetData(); this.GetData();
this.$parent.GetStatus();
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -276,12 +278,14 @@ export default { ...@@ -276,12 +278,14 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.datades=res.data.data; this.datades=res.data.data;
}else{} }else{}
},err=>{}) },err=>{})
}, },
GetData(){ GetData(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{ this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{
// console.log(res)
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList=res.data.data.pageData; this.dataList=res.data.data.pageData;
......
...@@ -428,10 +428,12 @@ export default { ...@@ -428,10 +428,12 @@ export default {
}, },
methods: { methods: {
goUrl(path,id,tcid){ goUrl(path,id,tcid){
// detailTwo this.$router.push({
path = 'CustomizedTourism' name: "CustomizedTourism",
// path=`${path}/${encodeURIComponent(id)}/`+tcid query: {
this.$router.push({ path }) customId: this.OrderId,
}
});
}, },
dateChange(val){ dateChange(val){
if(val){ if(val){
......
<template> <template>
<div class="Home"> <div class="Home">
<div class="Home_top"> <div class="Home_top">
<el-carousel arrow="always" :height="banner_height" :interval="10000" trigger="click" :style="{'background':'#ddd'}"> <el-carousel arrow="always" height="300px" :interval="10000" trigger="click" :style="{'background':'#ddd'}">
<el-carousel-item> <el-carousel-item>
<img src='../assets/img/ticket/banner01.jpg'> <img src='../assets/img/ticket/banner01.jpg'>
</el-carousel-item> </el-carousel-item>
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<el-dropdown-menu class="changelanguage" slot="dropdown"> <el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '1')">个人中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '1')">个人中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '2')">会员中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '2')">会员中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '9-1')">定制游</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item>
<el-dropdown-item @click.native="">我的积分</el-dropdown-item> <el-dropdown-item @click.native="">我的积分</el-dropdown-item>
......
...@@ -7,12 +7,15 @@ ...@@ -7,12 +7,15 @@
<div> <div>
<!-- 团订单 --> <!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/> <TcOrder v-if="data === '8-1'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-2'"/>
<!-- 机票订单 --> <!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/> <TkOrder v-if="data === '8-5'"/>
</div> </div>
</template> </template>
<script> <script>
import TcOrder from './model/TcOrder' import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TkOrder from './model/TkOrder' import TkOrder from './model/TkOrder'
export default { export default {
props:{ props:{
...@@ -20,6 +23,7 @@ export default { ...@@ -20,6 +23,7 @@ export default {
}, },
components: { components: {
TcOrder: TcOrder, TcOrder: TcOrder,
TdOrder: TdOrder,
TkOrder: TkOrder, TkOrder: TkOrder,
}, },
data() { data() {
......
...@@ -50,10 +50,13 @@ ...@@ -50,10 +50,13 @@
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span> <span slot="title">会员中心</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="9" @click="clickMenu('9')"> <el-submenu index="3">
<template slot="title">
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span slot="title">定制游</span> <span>定制游</span>
</el-menu-item> </template>
<el-menu-item index="9-1" @click="clickMenu('9-1')">定制游列表</el-menu-item>
</el-submenu>
<el-submenu index="8"> <el-submenu index="8">
<template slot="title"> <template slot="title">
<i class="iconfont icon-dingdanicon"></i> <i class="iconfont icon-dingdanicon"></i>
...@@ -107,6 +110,8 @@ ...@@ -107,6 +110,8 @@
<MemberCenter v-else-if="active === '2'" :data="active"/> <MemberCenter v-else-if="active === '2'" :data="active"/>
<!-- 个人信息 --> <!-- 个人信息 -->
<Information v-else-if="active.indexOf('3-') !== -1" :data="active"/> <Information v-else-if="active.indexOf('3-') !== -1" :data="active"/>
<!-- 定制游 -->
<CustomizedList v-else-if="active.indexOf('9-') !== -1" :data="active"/>
<!-- 订单中心 --> <!-- 订单中心 -->
<OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/> <OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/>
<!-- 优惠券 --> <!-- 优惠券 -->
...@@ -122,6 +127,7 @@ ...@@ -122,6 +127,7 @@
<script> <script>
import HomePage from '@/components/newPersonalCenter/block/HomePage' import HomePage from '@/components/newPersonalCenter/block/HomePage'
import Information from '@/components/newPersonalCenter/block/Information' import Information from '@/components/newPersonalCenter/block/Information'
import CustomizedList from '@/components/newPersonalCenter/block/CustomizedList'
import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter' import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter'
import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter' import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter'
import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon' import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon'
...@@ -133,7 +139,8 @@ export default { ...@@ -133,7 +139,8 @@ export default {
MemberCenter, MemberCenter,
OrderCenter, OrderCenter,
MyCoupon, MyCoupon,
Integral Integral,
CustomizedList
}, },
data () { data () {
return { return {
...@@ -142,14 +149,14 @@ export default { ...@@ -142,14 +149,14 @@ export default {
}, },
methods: { methods: {
handleOpen(key, keyPath) { handleOpen(key, keyPath) {
console.log(key, keyPath); // console.log(key, keyPath);
}, },
handleClose(key, keyPath) { handleClose(key, keyPath) {
console.log(key, keyPath); // console.log(key, keyPath);
}, },
clickMenu: function (key) { clickMenu: function (key) {
this.active = key this.active = key
console.log(key) // console.log(key)
}, },
setActive: function(t){ setActive: function(t){
if (t) { if (t) {
......
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