Skip to content

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

定制游等

parent d20dd21a
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 33 deletions
src/assets/css/home.css
View file @ d63d1689
......@@ -15,12 +15,16 @@
}
.Home .el-tabs__item.is-active {
color: #fd6473;
font-family: "PingFangR";
}
.Home .tag_active {
background: #fff;
color: #fd6473 !important;
font-weight: bold;
}
.Home .tag_active .iconfont{
color: #fd6473 !important;
}
.Home .form_ul {
overflow: auto;
}
......@@ -60,6 +64,7 @@
}
.Home .Home_top .tag_left li .iconfont {
font-size: 20px;
color: #ababab;
}
.Home ul,
p {
......@@ -78,7 +83,7 @@ p {
font-size: 12px;
padding-top: 12px;
box-sizing: border-box;
border-bottom: 1px dashed #aaaaaa;
border-bottom: 1px dashed #737373;
cursor: pointer;
}
.Home .Home_top .tag_left {
......
src/components/DependentTravel/CustomizedTourism.vue
View file @ d63d1689
<template>
<div class="CustomizedTourism">
<div class="w1200" v-loading="loading">
<div class="step_head">
<div class="step_head" style="position:relative">
<p class="step_head_title">{{dataInfo.departureName}}-{{dataInfo.destinationNames}}/{{dataInfo.playDays}}天*定制游</p>
<p style="padding:20px 0;color:#333333;font-size:12px">需求编号：{{customId}}</p>
<el-steps :active="actice_step">
<span class="exitorder" @click="ExitOrder">取消订单{{actice_step}}</span>
<el-row class="top" v-if="actice_step!=7">
<el-col :span="4">
<div :class="actice_step>0?'bule':'grey'" class="line"></div>
<div class="text">
<span class="bottom" :class="actice_step>0?'bule_back':''">
<span class="circle">
<i class="iconfont icon-yuandian"></i>
</span>
<p>提交需求</p>
</span>
</div>
</el-col>
<el-col :span="4">
<div :class="actice_step>1?'bule':'grey'" class="line"></div>
<!-- <div v-show="actice_step<=1" class="line grey"></div> -->
<div class="text">
<span class="bottom" :class="actice_step>1?'bule_back':''">
<span class="circle">
<i class="iconfont icon-yuandian"></i>
</span>
<p>设计方案</p>
</span>
</div>
</el-col>
<el-col :span="4">
<div v-if="actice_step>2 && actice_step<4" class="stepHalf">
<i></i><i></i>
</div>
<div v-else :class="actice_step>3?'bule':'grey'" class="line"></div>
<!-- <div v-show="actice_step<=2" class="line grey"></div> -->
<div class="text">
<span class="bottom" :class="actice_step>2?'bule_back':''">
<span class="circle">
<i class="iconfont icon-yuandian"></i>
</span>
<p >签证合同</p>
</span>
</div>
</el-col>
<el-col :span="4">
<div :class="actice_step>4?'bule':'grey'" class="line"></div>
<!-- <div v-show="actice_step<=4" class="line grey"></div> -->
<div class="text">
<span class="bottom" :class="actice_step>4?'bule_back':''">
<span class="circle">
<i class="iconfont icon-yuandian"></i>
</span>
<p>恭喜成团</p>
</span>
</div>
</el-col>
<el-col :span="4">
<div :class="actice_step>5?'bule':'grey'" class="line"></div>
<!-- <div v-show="step<=5" class="line grey"></div> -->
<div class="text">
<span class="bottom" :class="actice_step>5?'bule_back':''">
<span class="circle">
<i class="iconfont icon-yuandian"></i>
</span>
<p>成团结束</p>
</span>
</div>
</el-col>
</el-row>
<!-- <el-steps v-if="actice_step!=7" :active="actice_step">
<el-step title="提交需求" icon="iconfont icon-yuandian"></el-step>
<el-step title="设计方案" icon="iconfont icon-yuandian"></el-step>
<el-step title="签订合同" icon="iconfont icon-yuandian"></el-step>
<el-step title="恭喜成团" icon="iconfont icon-yuandian"></el-step>
<el-step title="成团结束" icon="iconfont icon-yuandian"></el-step>
</el-steps> -->
<el-steps style="width:280px" v-if="actice_step==7" :active="actice_step">
<el-step title="提交需求" icon="iconfont icon-yuandian"></el-step>
<el-step title="取消订单" icon="iconfont icon-yuandian"></el-step>
</el-steps>
</div>
<div>
......@@ -39,7 +122,7 @@
<div v-show="actice_step==2">
<DesignScheme :customId="customId" :tcid="tcid"></DesignScheme>
</div>
<div class="commonStyle Signcontract" v-if="actice_step==3 || actice_step==4 || actice_step==5">
<div class="commonStyle Signcontract" v-if="actice_step==3 || actice_step==4 || actice_step==5 || actice_step==7">
<p class="title">订单信息</p>
<ul class="orderinfo">
<li>
......@@ -66,11 +149,12 @@
<p class="title">合同签订</p>
<div class="htqd">
<div v-for="(item,index) in dataInfo.contractFile" :key="index+200">
<p><a href="#">xxxxxxxxxxxx合同</a></p>
<p style="margin-top: 17px"><span class="downorder">
<p style="margin:17px 0"><a style="color:#558EE5;font-size:14px;font-family:'PingFangR'" :href="item.url">{{item.name}}</a></p>
<a :href="item.url" style="text-decoration: none;"><span class="downorder">
<span style="background:#B4B4B4;padding: 0px 3px;"><i class="iconfont icon-xiazai"></i></span>
下载合同</span></p>
下载合同</span></a>
</div>
</div>
......@@ -92,7 +176,7 @@ export default {
data () {
return {
actice_step:0,
customId:14,
customId:0,
loading:false,
dataInfo:{},
tcid:0,
......@@ -101,16 +185,36 @@ export default {
components:{
DesignScheme
},
created(){
this.customId=this.$route.query.customId ? Number(this.$route.query.customId):this.customId;
},
mounted() {
this.GetStatus();
},
methods: {
ExitOrder(){
this.$confirm("确认取消订单?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apiJavaPost('/api/b2b/free/cancelTravelCoupom',{customId:this.customId},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.GetStatus();
}else{
this.Error(res.data.message);
}
},null)
}).catch(() => {
});
},
GetStatus(){
this.loading=true;
this.apiJavaPost('/api/b2b/free/getTravelCustomOrderInfo',{customId: this.customId},res=>{
this.loading=false;
console.log(res);
// console.log("GetStatus父组件");
if(res.data.resultCode==1){
this.dataInfo=res.data.data;
this.tcid=this.dataInfo.tcid;
......@@ -125,6 +229,94 @@ export default {
</script>
<style>
.stepHalf{
width: 100%;
height: 4px;
position: absolute;
top: 22px;
left:0;
}
.stepHalf i{
display: inline-block;
width: 50%;
height: 100%;
position: absolute;
top: 0;
}
.stepHalf i:nth-child(1){
background: #409EFF;
left: 0;
}
.stepHalf i:nth-child(2){
background: #CCCCCC;
left: 50%;
}
.CustomizedTourism .bule_back i{
color: #409EFF!important;
}
.CustomizedTourism .bule_back p{
color: #409EFF!important;
font-family: "PingFangR";
}
.top .el-col-4{
width: 20%;
position: relative;
}
.CustomizedTourism .bottom {
display: inline-block;
background: #fff;
}
.CustomizedTourism .text .circle{
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
line-height: 48px;
text-align: center;
}
.CustomizedTourism .text .iconfont{
color: #e1e1e1;
}
.CustomizedTourism .text p{
font-size: 12px;
}
.CustomizedTourism .text{
text-align: center;
font-size: 14px;
z-index: 1;
position: relative;
}
.CustomizedTourism .bule{
background: #5893EB;
}
.CustomizedTourism .grey{
background: #CCCCCC;
}
.CustomizedTourism .line{
width: 100%;
height: 4px;
position: absolute;
top: 22px;
left:0;
}
.CustomizedTourism .exitorder{
position: absolute;
right: 60px;
top: 26px;
display: block;
font-size: 12px;
color:rgba(102,102,102,1);
width:76px;
height:26px;
line-height: 26px;
text-align: center;
background:rgba(244,244,244,1);
border:1px solid rgba(220,220,220,1);
cursor: pointer;
}
.CustomizedTourism .Signcontract .yct{
position: absolute;
top: 82px;
......
src/components/DependentTravel/DesignScheme.vue
View file @ d63d1689
......@@ -60,8 +60,9 @@
</span>
<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">
{{des.childItem.description}}
<div v-if="des.childItem.description" style="font-size:14px;margin-top:20px">
<div v-html="des.childItem.description">
</div>
</div>
......@@ -131,11 +132,11 @@
<span class="iconfont icon-Shape4"></span>
</span>
<p style="font-size:16px;"><span>景点</span><span style="margin-left:5px;font-size:12px;">（3个）</span></p>
<div v-for="img in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<p style="font-size:16px;"><span>景点</span></p>
<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="">
<div style="float:left;margin-left:20px;width:719px">
<!-- <p>晚餐</p> -->
<div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="des.childItem.description"></p>
</div>
</div>
......@@ -151,11 +152,11 @@
<span class="iconfont icon-Shape5"></span>
</span>
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一兰拉面(道顿堀店)(大阪)</span></p>
<div v-for="img in des.childItem.imaArray" style="font-size:14px;margin-top:20px;overflow:auto">
<img src="../../assets/img/visa/activy.jpg" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px">
<p>晚餐</p>
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{des.childItem.dinnerName}}</span></p>
<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="">
<div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="des.childItem.description"></p>
</div>
</div>
......@@ -255,6 +256,7 @@ export default {
if(res.data.resultCode==1){
this.Success(res.data.message);
this.GetData();
this.$parent.GetStatus();
}else{
this.Error(res.data.message);
}
......@@ -276,12 +278,14 @@ export default {
if(res.data.resultCode==1){
this.datades=res.data.data;
}else{}
},err=>{})
},
GetData(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{
// console.log(res)
if(res.data.resultCode==1){
this.dataList=res.data.data.pageData;
......
src/components/DependentTravel/PersonalTailor.vue
View file @ d63d1689
......@@ -428,10 +428,12 @@ export default {
},
methods: {
goUrl(path,id,tcid){
// detailTwo
path = 'CustomizedTourism'
// path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
this.$router.push({
name: "CustomizedTourism",
query: {
customId: this.OrderId,
}
});
},
dateChange(val){
if(val){
......
src/components/Home.vue
View file @ d63d1689
<template>
<div class="Home">
<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>
<img src='../assets/img/ticket/banner01.jpg'>
</el-carousel-item>
......
src/components/global/newHead.vue
View file @ d63d1689
......@@ -45,6 +45,7 @@
<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', '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', '3-1')">个人信息</el-dropdown-item>
<el-dropdown-item @click.native="">我的积分</el-dropdown-item>
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ d63d1689
......@@ -7,12 +7,15 @@
<div>
<!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-2'"/>
<!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/>
</div>
</template>
<script>
import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TkOrder from './model/TkOrder'
export default {
props:{
......@@ -20,6 +23,7 @@ export default {
},
components: {
TcOrder: TcOrder,
TdOrder: TdOrder,
TkOrder: TkOrder,
},
data() {
......
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ d63d1689
......@@ -50,10 +50,13 @@
<i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span>
</el-menu-item>
<el-menu-item index="9" @click="clickMenu('9')">
<i class="iconfont icon-huiyuanicon"></i>
<span slot="title">定制游</span>
</el-menu-item>
<el-submenu index="3">
<template slot="title">
<i class="iconfont icon-huiyuanicon"></i>
<span>定制游</span>
</template>
<el-menu-item index="9-1" @click="clickMenu('9-1')">定制游列表</el-menu-item>
</el-submenu>
<el-submenu index="8">
<template slot="title">
<i class="iconfont icon-dingdanicon"></i>
......@@ -107,6 +110,8 @@
<MemberCenter v-else-if="active === '2'" :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"/>
<!-- 优惠券 -->
......@@ -122,6 +127,7 @@
<script>
import HomePage from '@/components/newPersonalCenter/block/HomePage'
import Information from '@/components/newPersonalCenter/block/Information'
import CustomizedList from '@/components/newPersonalCenter/block/CustomizedList'
import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter'
import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter'
import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon'
......@@ -133,7 +139,8 @@ export default {
MemberCenter,
OrderCenter,
MyCoupon,
Integral
Integral,
CustomizedList
},
data () {
return {
......@@ -142,14 +149,14 @@ export default {
},
methods: {
handleOpen(key, keyPath) {
console.log(key, keyPath);
// console.log(key, keyPath);
},
handleClose(key, keyPath) {
console.log(key, keyPath);
// console.log(key, keyPath);
},
clickMenu: function (key) {
this.active = key
console.log(key)
// console.log(key)
},
setActive: function(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