Commit 3cbc0601 authored by 华国豪's avatar 华国豪 🙄

合并代码

parents aeaa60f7 e2d6f573
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_mmwwh61s03g.css';
@import '//at.alicdn.com/t/font_863923_naoz0fqofi.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
......@@ -262,6 +262,34 @@
cursor: pointer;
box-shadow:0px 1px 4px 0px rgba(94,94,94,0.61);
}
.AdmissionTicket .hottour_ul li{
position: relative;
width:212px;
height:159px;
margin-top:20px;
}
.AdmissionTicket .hottour_ul li img{
width: 100%;
height: 100%;
}
.AdmissionTicket .hottour_ul li .hotcontent{
position: absolute;
bottom: 0;
box-sizing: border-box;
padding:6px;
box-sizing: border-box;
background:linear-gradient(0deg,rgba(0,0,0,1),rgba(0,0,0,-0.01));
}
.AdmissionTicket .hottour_ul li:hover{
cursor: pointer;
box-shadow:0px 1px 4px 0px rgba(94,94,94,0.61);
}
.AdmissionTicket .hottour_ul li .hotcontent>span{
display: inline-block;
}
.Localtourhome .ticketContent>div{
float: left;
}
......@@ -622,7 +650,7 @@
}
.LocalTourList .sortDiv>div i{
color:#8F9199;
margin-right: -5px;
font-size: 14px;
cursor: pointer;
}
.LocalTourList .sortDiv>div .iconfontActive{
......@@ -911,6 +939,12 @@
top: 0;
margin-top: -20px;
z-index: 100;
width: 1200px;
background: #fff;
}
.TicketDetails .searchFixed .TicketTab{
/* border: none; */
border-right: 1px solid rgba(220,220,220,1);
}
.TicketDetails .green{
background: #ddd!important;
......@@ -1070,6 +1104,13 @@
border: 1px solid #dcdfe6;
display: inline-block;
padding-left:10px;
position: relative;
}
.Appointment .formline .calendarSpan .icon-img-rili{
position: absolute;
right: 13px;
color: #4CB960;
font-size: 14px;
}
.calendarPopover{
padding:0;
......
......@@ -20,6 +20,7 @@
</div>
<div class="threeDiv">
<p><span style="color:#FDAC11;font-size:22px">{{item.b2bPrice | NoDesnum}}</span></p>
<p style="margin-top:10px;cursor:pointer"><span @click="GoUrl(item)">查看详情</span></p>
</div>
</li>
<ul class="ticketDiv">
......@@ -32,7 +33,7 @@
<!-- <span style="color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through">原价:¥300</span> -->
</span>
<span class="ThreeSpan">
<span @click="GoUrl(item)" class="yd">预定</span>
<span @click="YdUrl(item,ticket)" class="yd">预定</span>
</span>
</li>
......@@ -47,13 +48,15 @@
</ul>
<ul class="hottour_ul">
<p class="pfR font14" style="margin-bottom:8px">热门景点</p>
<div class="hotsecn">
<span>日本-急乐园 </span>
<span>日本-急乐园 </span>
<span>日本-豪斯登堡主题乐园</span>
<span>韩国-首尔乱打秀</span>
<span>日本-豪斯登堡主题乐园</span>
</div>
<li @click="GoUrl(item)" v-for="(item,index) in hotList" :key="index+2000">
<img :src="item.coverImgs[0]" alt="">
<div class="hotcontent">
<span style="color:#fff;width:125px;" class="textHidden font12">{{item.name}}</span>
<span style="width:75px;color:#FDAC11;text-align:right">
<span class="pfR font18">{{item.b2bPrice | NoDesnum}}</span>
</span>
</div>
</li>
</ul>
</div>
......@@ -61,10 +64,11 @@
</template>
<script>
export default {
props:["ticketList"],
props:["ticketList","hotList"],
data () {
return {
dataList:[],
hotdataList:[],
}
},
mounted() {
......@@ -72,6 +76,13 @@ export default {
},
methods: {
YdUrl(item,ticket){
sessionStorage.dataDes=JSON.stringify(item);
sessionStorage.Ticketinfo=JSON.stringify(ticket);
this.$router.push({ path:'/Appointment',
query:{idDes:encodeURIComponent(ticket.idDes)} })
},
GoUrl(item){
this.$router.push({ path:'/TicketDetails',
query:{idDes:encodeURIComponent(item.idDes)} })
......@@ -84,7 +95,14 @@ export default {
}
}
},
hotList:{
handler:function(val,oldvalue){
this.hotdataList=val;
}
},
}
}
</script>
......@@ -141,7 +159,7 @@ export default {
top: -15px;
}
.AdmissionTicket .ticketDiv li .firsrSpan{
width:660px;
width:680px;
padding-left:20px;
color:#2A5532;
}
......
......@@ -41,27 +41,30 @@
</v-calendar>
</div>
<span class="calendarSpan" slot="reference">{{form.useDate}}</span>
<span class="calendarSpan" slot="reference">{{form.useDate}}
<span class="iconfont icon-img-rili"></span>
</span>
</el-popover>
</el-form-item>
<el-form-item label="购买数量">
<el-input-number size="small" v-model="form.purchaseQuantity" :min="1" :max="10" @change="PurchaseQuantity"></el-input-number>
<el-input-number size="small" v-model="form.purchaseQuantity" :min="1" @change="PurchaseQuantity"></el-input-number>
</el-form-item>
<div class="fg"></div>
<div style="padding:0 20px">
<p class="pfR" style="color:#000000;margin:30px 0">取票人/出行人信息</p>
<el-form-item class="formline" label="中文姓名" prop="contactCNName">
<el-input size="small" v-model="form.contactCNName"></el-input>
<el-input size="small" v-model="form.contactCNName" placeholder="请输入中文姓名"></el-input>
</el-form-item>
<el-form-item class="formline" label="英文姓名">
<el-input size="small" v-model="form.contactENName"></el-input>
<el-input size="small" v-model="form.contactENName" placeholder="请输入英文姓名"></el-input>
</el-form-item>
<el-form-item class="formline" label="手机号" prop="contactMobile">
<el-input size="small" v-model="form.contactMobile"></el-input>
<el-input size="small" v-model="form.contactMobile" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item class="formline" label="E-mail" prop="contactEmail">
<el-input size="small" v-model="form.contactEmail"></el-input>
<el-input size="small" v-model="form.contactEmail" placeholder="请输入E-mail"></el-input>
</el-form-item>
</div>
......@@ -78,7 +81,10 @@
<span v-else>不可叠加</span>
</span>
<p style="margin-top:10px"><span>{{item.denomination}}</span></p>
<p style="margin-top:10px">
<span v-if="item.couponsType==1"><span>{{item.denomination}}</span></span>
<span v-else>{{item.denomination}}</span>
</p>
<p style="font-size:14px">{{item.useCondition}}使用</p>
<p style="font-size:12px;color:#4C58A4;margin-top:6px">
有效期:{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
......@@ -95,7 +101,7 @@
<div style="text-align:right">
<div class="payMoney basefix">
<p style="font-size:12px;margin-top:20px">小计:<span>{{price}}</span></p>
<p style="margin:7px 0">优惠:<span class="pfR">-{{form.discountMoney}}</span></p>
<p style="margin:7px 0">优惠:<span class="pfR">{{form.discountMoney}}</span></p>
<p class="pfR">实付款:<span style="color:#AAAAAA;font-size:24px"><span style="color:#E95252;font-size:24px">{{SettlementPrice}}</span></span></p>
</div>
</div>
......@@ -170,7 +176,7 @@ export default {
this.dataDes=JSON.parse(sessionStorage.dataDes);
this.Ticketinfo=JSON.parse(sessionStorage.Ticketinfo);
this.price=(this.Ticketinfo.b2bPrice*this.form.purchaseQuantity).toFixed(2);
this.SettlementPrice=this.price;
this.SettlementPrice=this.price-this.form.discountMoney;
},
mounted() {
......@@ -193,7 +199,10 @@ export default {
methods: {
PurchaseQuantity(val){
this.form.discountMoney=0;
this.price=(this.Ticketinfo.b2bPrice*val).toFixed(2);
this.SettlementPrice= this.price;
},
clickCoupon: function (item) {
......@@ -294,6 +303,8 @@ export default {
this.apiJavaPost("/api/b2b/scenic/setTicketOrder",this.form,res => {
if(res.data.resultCode==1){
this.Success(res.data.message);
this.$router.push({ path: '/newPersonalCenter?key=8-8'})
}else{
this.Error(res.data.message)
......@@ -308,7 +319,6 @@ export default {
});
},
SelectChild(item) {
console.log(item);
this.form.useDate=item.date_str;
this.form.couponsId=item.couponsId;
this.form.ticketId=item.ticketId;
......@@ -363,8 +373,11 @@ export default {
MonthdayList.push(month)
}
let DayList=[];
this.timeStr.forEach(time=>{
// this.timeStr.forEach(time=>{
// console.log("time",time)
MonthdayList.forEach(item=>{
this.timeStr.forEach(time=>{
if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){
let msg={
price:time.b2bPrice,
......@@ -375,14 +388,16 @@ export default {
dateStr:item.dateStr,
};
DayList.push(msg)
}else{
let date={
dateStr:item.dateStr,
}
DayList.push(date)
}
// else{
// let date={
// dateStr:item.dateStr,
// }
// DayList.push(date)
// }
})
})
console.log("DayList",DayList)
this.creatCalendar(DayList);
},
......
......@@ -168,24 +168,25 @@
</li> -->
</ul>
</div>
<!-- 排序条件 -->
<div class="sortDiv basefix">
<div>
销量
<i :class="msg.orderBySales==1?'iconfontActive':''" @click="ChangeOrderBySales(1)" class="iconfont icon-jiang1"></i>
<i :class="msg.orderBySales==2?'iconfontActive':''" @click="ChangeOrderBySales(2)" class="iconfont icon-jiang"></i>
<i :class="msg.orderBySales==1?'iconfontActive':''" @click="ChangeOrderBySales(1)" class="iconfont icon-jiantou"></i>
<i :class="msg.orderBySales==2?'iconfontActive':''" @click="ChangeOrderBySales(2)" class="iconfont icon-jiantou-copy"></i>
</div>
<div>
价格
<i :class="msg.orderByPrice==1?'iconfontActive':''" @click="ChangeOrderByPrice(1)" class="iconfont icon-jiang1"></i>
<i :class="msg.orderByPrice==2?'iconfontActive':''" @click="ChangeOrderByPrice(2)" class="iconfont icon-jiang"></i>
<i :class="msg.orderByPrice==1?'iconfontActive':''" @click="ChangeOrderByPrice(1)" class="iconfont icon-jiantou"></i>
<i :class="msg.orderByPrice==2?'iconfontActive':''" @click="ChangeOrderByPrice(2)" class="iconfont icon-jiantou-copy"></i>
</div>
</div>
<!-- 数据 -->
<div style="margin-top:14px" v-loading="Loading">
<OnedayList :onelist="onelist" v-show="tab==1"></OnedayList>
<AdmissionTicket :ticketList="ticketList" v-show="tab==2"></AdmissionTicket>
<AdmissionTicket :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
</div>
<div style="text-align:right;width:950px;margin-top:15px">
<el-pagination
......@@ -264,6 +265,7 @@ export default {
cityList:[],
cityshow:false,
ticketList:[],
hotList:[],
}
},
components:{
......@@ -285,9 +287,26 @@ export default {
},
mounted() {
this.CountryCity();
this.GetHotScen();
},
methods: {
GetHotScen(){
let msg={
pageIndex:0,
pageSize:5,
countryId:0,
};
msg.countryId=this.msg.countryId;
this.apiJavaPost("/api/b2b/scenic/getHotTickeCouponstList",msg,
res => {
if(res.data.resultCode==1){
this.hotList=res.data.data.pageData;
}
},
null
);
},
handleCurrentChange(val){
this.msg.pageIndex=val;
if(this.tab==1){
......@@ -316,6 +335,7 @@ export default {
},
SelectCountry(countryId){
this.msg.countryId=countryId;
this.GetHotScen();
if(countryId==0){
this.cityList=[];
this.msg.cityId=0;
......
......@@ -28,7 +28,10 @@
<p class="pfR" style="color:#2A5532;font-size:20px;">{{dataDes.name}}</p>
<!-- <p style="margin-top:20px" class="ticketSpan">票类包括:<span>大小同价</span><span>大小价</span></p> -->
<div class="price">
{{dataDes.minPrice | NoDesnum}}~¥{{dataDes.maxPrice | NoDesnum}}
{{dataDes.minPrice | NoDesnum}}
<span v-if="dataDes.minPrice!=dataDes.maxPrice">
~¥{{dataDes.maxPrice | NoDesnum}}
</span>
</div>
<p>
<span style="color:#666666">景点地址:</span>
......@@ -70,8 +73,8 @@
<li v-for="item in dataDes.ticketList" :key="item.id">
<el-row>
<el-col :span="19">
{{item.ticketDesc}}
<span class="pfR">({{item.ticketName}})</span>
{{item.ticketName}}
<span v-if="item.ticketDesc" class="pfR">({{item.ticketDesc}})</span>
<!-- <span>(18-64周岁)</span> -->
<!-- <span class="colorG">可订今日</span>
<span class="colorG">可订今日</span> -->
......@@ -208,7 +211,7 @@ export default {
mounted() {
this.idDes=decodeURIComponent(this.$route.query.idDes);
this.scrollobj = document.getElementsByClassName("el-scrollbar__wrap")[0];
// this.scrollobj.addEventListener("scroll", this.handleScroll);
this.scrollobj.addEventListener("scroll", this.handleScroll);
this.GetDes();
},
......@@ -247,6 +250,9 @@ export default {
this.ImgIndex=0;
},
ImgNext(){
if(this.next<2){
return;
}
this.$refs.Changeimg.style.left="-440px";
this.ImgIndex=1;
......
......@@ -58,13 +58,23 @@
color: #FF5A00;
font-size: 12px;
padding-right: 5px;
box-sizing: border-box;
box-sizing: border-box;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.LocalTourCalendar .monthDayList{
overflow: auto;
/* overflow: auto; */
border-top:1px solid #E1E1E1;
}
}
.LocalTourCalendar .monthDayList:after {
clear: both;
content: '.';
display: block;
height: 0;
overflow: hidden;
}
.LocalTourCalendar .dayList.yesPrice:hover{
background: #FF680B;
color:#fff!important;
......
......@@ -13,6 +13,8 @@
<TdOrder v-if="data === '8-7'"/>
<!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/>
<!-- 景点门票订单 -->
<ScenOrder v-if="data === '8-8'"/>
</div>
</template>
<script>
......@@ -20,6 +22,7 @@ import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder'
import ScenOrder from './model/ScenOrder'
export default {
props:{
data: ''
......@@ -29,6 +32,7 @@ export default {
TdOrder: TdOrder,
TkOrder: TkOrder,
TzOrder: TzOrder,
ScenOrder:ScenOrder,
},
data() {
return {
......
......@@ -183,11 +183,11 @@
</thead>
<tbody>
<template v-for="(item, index) in tableData">
<tr class="top" :class="{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<tr class="top" :key="index" :class="{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<td colspan="5">
<span class="time">2019-04-28 08:25:23</span>
<span class="num">订单号:<span>451648</span></span>
<span class="contacts"><i class="iconfont icon-dianhua"></i> <span>李晓敏 13880688956</span></span>
<span class="time">{{item.startDate}}</span>
<span class="num">订单号:<span>{{item.orderId}}</span></span>
<span class="contacts"><i class="iconfont icon-dianhua"></i> <span>{{item.serviceName}} {{item.servicePhone}}</span></span>
</td>
</tr>
<tr class="info" @mouseenter="enter(index)" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
......@@ -195,9 +195,9 @@
<div class="tc_info">
<div class="_left"></div>
<div class="_right">
<p class="color333 font-size14">日本跟团游</p>
<p class="color333 font-size14">{{item.title}}</p>
<p>系列名称系列名称系列名称...</p>
<p>团号:XY336889999</p>
<p>团号:{{item.tcid}}</p>
</div>
</div>
</td>
......@@ -284,33 +284,35 @@ export default {
components: {
payurlItem: payURL,
},
// props:["tableData"],
props:["tableData"],
data() {
return {
activeRow: '',
activeNames: ['1'],
dropTitTwo: "10天内",
tableData: [
{
title: '111',
payShow: false,
orderState: 1
},{
title: '222',
payShow: false,
orderState: 0
},
{
title: '333',
payShow: false,
orderState: 2
},
{
title: '444',
payShow: false,
orderState: 3
}
],
dataList:[],
// tableData: [
// {
// title: '111',
// payShow: false,
// orderState: 1
// },{
// title: '222',
// payShow: false,
// orderState: 0
// },
// {
// title: '333',
// payShow: false,
// orderState: 2
// },
// {
// title: '444',
// payShow: false,
// orderState: 3
// }
// ],
dayList: [
{
Day: "10天",
......@@ -330,7 +332,9 @@ export default {
],
};
},
mounted() {},
mounted() {
console.log("tableData",this.tableData)
},
methods: {
enter: function (t) {
if (t+1) {
......
<template>
<div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="订单状态">
<el-select style="width:150px" size="small" v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option>
<el-option label="正常" :value="1"></el-option>
<el-option label="取消" :value="2"></el-option>
<el-option label="待付款" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出发日期">
<el-date-picker style="width:150px" size="small" type="date" v-model="form.startDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="返回日期">
<el-date-picker style="width:150px" size="small" type="date" v-model="form.backDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getList" type="danger" size="small">查询</el-button>
</el-form-item>
</el-form>
<div>
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column
prop="couponsName"
label="景区名称">
</el-table-column>
<el-table-column
prop="ticketName"
label="门票名">
</el-table-column>
<el-table-column
label="优惠金额">
<template slot-scope="scope">
<p>{{scope.row.preferPrice}}</p>
<p>优惠金额:{{scope.row.discountMoney}}</p>
</template>
</el-table-column>
<el-table-column width="170px"
label="采购信息">
<template slot-scope="scope">
<p>数量:{{scope.row.purchaseQuantity}}</p>
<p>使用日期:{{scope.row.useDate}}</p>
</template>
</el-table-column>
<el-table-column
label="订单状态">
<template slot-scope="scope">
<span v-if="scope.row.status==1">正常</span>
<span v-if="scope.row.status==2">取消</span>
<span v-if="scope.row.status==3">待付款</span>
</template>
</el-table-column>
<el-table-column
fixed="right" width="180px"
label="操作">
<template slot-scope="scope">
<el-button v-if="scope.row.status==3"
size="mini"
type="danger">付款</el-button>
<el-button v-if="scope.row.status!=2"
size="mini"
>取消订单</el-button>
</template>
</el-table-column>
</el-table>
<el-row class="_pagination" v-if="totalCount > 1">
<el-pagination
:page-size="form.pageSize"
layout="total, prev, pager, next"
:total="totalCount"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</div>
</div>
</template>
<script>
export default {
data () {
return {
totalCount:0,
provideItem:[],
form:{
pageIndex:1,
pageSize:10,
customerId:0,
},
tableData:[],
}
},
mounted() {
let userInfo=JSON.parse(localStorage.userInfo);
this.form.customerId=userInfo.customerId;
this.getList();
},
methods: {
gourl(scope){
let path = 'CustomizedTourism'
this.$router.push({
name:path,
query: {
customId: scope.customId,
blank: "y"
}
});
},
getList(){
this.apiJavaPost('/api/b2b/scenic/getTicketCouponsOrder',this.form,res=>{
this.loading=false;
// console.log("景点门票",res.data.data);
this.tableData=res.data.data.pageData;
this.totalCount=res.data.data.count;
},null)
},
handleCurrentChange(val) {
// 翻页
this.form.pageIndex = parseInt(val);
this.getList();
}
}
}
</script>
<style>
.CustomizedList ._pagination{
height: 45px;
background-color: #EBEBEB;
display: flex;
align-items: center;
justify-content: flex-end;
}
.CustomizedList .el-pagination .btn-next,.CustomizedList .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.CustomizedList .el-form-item{
display: inline-block;
}
.CustomizedList .el-pagination{
display: flex;
align-items: center;
}
.CustomizedList .el-pager li{
background: transparent;
font-weight: initial;
}
.CustomizedList .el-pager li:hover{
color: #f56c6c;
}
.CustomizedList .el-pager li.active{
color: #f56c6c;
}
.CustomizedList ._row_2{
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
}
</style>
......@@ -6,7 +6,7 @@
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
<li :key="item.ID"
class="__cp"
@click="handleClick(item)"
:class="{_active: activeName === item.ID}"
......@@ -15,6 +15,7 @@
</ul>
<!-- 表格 -->
<TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉,你想要的信息我们真的找不到了
......@@ -100,7 +101,6 @@ export default {
},
computed: {},
created() {
console.log("定制游订单");
},
mounted() {
let userInfo = localStorage.userInfo
......@@ -136,9 +136,9 @@ export default {
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
console.log("定制游订单",res);
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
console.log("this.tableData",this.tableData)
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
......
......@@ -69,6 +69,7 @@
<el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item>
<el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item>
<el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item>
<el-menu-item index="8-8" @click="clickMenu('8-8')">门票订单</el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title">
......
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