Commit 64b7193e authored by huangyuanyuan's avatar huangyuanyuan

解决日历无数据,修改机票订单页面

parent 3cbc0601
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_naoz0fqofi.css';
@import '//at.alicdn.com/t/font_863923_8f4ml296bz3.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
......@@ -172,7 +172,6 @@ export default {
created(){
let userInfo=JSON.parse(localStorage.userInfo);
this.form.customerId=userInfo.customerId;
// console.log("StorageInfo.customerId",userInfo.customerId);
this.dataDes=JSON.parse(sessionStorage.dataDes);
this.Ticketinfo=JSON.parse(sessionStorage.Ticketinfo);
this.price=(this.Ticketinfo.b2bPrice*this.form.purchaseQuantity).toFixed(2);
......@@ -270,7 +269,6 @@ export default {
} else {
this.SettlementPrice = this.price
}
console.log("SettlementPrice",this.SettlementPrice)
// this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2);
let allmonney=this.price - this.SettlementPrice;
this.form.discountMoney = (this.price - this.SettlementPrice).toFixed(2);
......@@ -374,10 +372,16 @@ export default {
}
let DayList=[];
// this.timeStr.forEach(time=>{
// console.log("time",time)
let len=this.timeStr.length;
MonthdayList.forEach(item=>{
if(moment(this.timeStr[len-1].endDate).isBefore(MonthdayList[0].dateStr)){
let msg={
dateStr:item.dateStr,
};
DayList.push(msg)
}
this.timeStr.forEach(time=>{
if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){
let msg={
price:time.b2bPrice,
......@@ -389,15 +393,17 @@ export default {
};
DayList.push(msg)
}
// else{
// let date={
// dateStr:item.dateStr,
// }
// DayList.push(date)
// }
})
if(this.timeStr.length<1){
let msg={
dateStr:item.dateStr,
};
DayList.push(msg)
}
})
console.log("DayList",DayList)
this.creatCalendar(DayList);
},
......
......@@ -11,6 +11,8 @@
<TzOrder v-if="data === '8-2'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-7'"/>
<!-- 签证订单 -->
<TQOrder v-if="data === '8-4'"/>
<!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/>
<!-- 景点门票订单 -->
......@@ -20,6 +22,7 @@
<script>
import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TQOrder from './model/TQOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder'
import ScenOrder from './model/ScenOrder'
......@@ -33,6 +36,7 @@ export default {
TkOrder: TkOrder,
TzOrder: TzOrder,
ScenOrder:ScenOrder,
TQOrder:TQOrder,
},
data() {
return {
......
......@@ -248,7 +248,7 @@
<p>婴儿:0</p>
</td>
<td class="money">
<p>总额 ¥8680.00</p>
<p>总额 ¥{{item.preferPrice | priceFormat}}</p>
<p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥8680.00 <i class="iconfont icon-xia"></i></p>
<p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥8680.00 <i class="iconfont icon-xia shang"></i></p>
<!-- :class="{height_aotu: item.payShow}" -->
......
<style>
/* 定制游订单 */
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
......
<style>
/* 机票订单 */
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
......@@ -14,7 +15,7 @@
</template>
</ul>
<!-- 表格 -->
<TKTable :tableData="tableData"/>
<NewTKtable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉,你想要的信息我们真的找不到了
......@@ -32,10 +33,10 @@
</el-row>
</template>
<script>
import TKTable from "./OrderInfoModel/TKTable";
import NewTKtable from "./OrderInfoModel/NewTKtable";
export default {
components: {
TKTable: TKTable
NewTKtable: NewTKtable
},
data() {
return {
......@@ -136,6 +137,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
console.log("机票订单",this.tableData)
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
......
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