Commit 312a8b40 authored by youjie's avatar youjie

修复

parent ad30fdbc
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
...this.orderMsg, ...this.orderMsg,
...msg, ...msg,
} }
console.log(msg,'--------') this.orderMsg.TotalPeopl = this.orderMsg.PeopleNum*this.orderMsg.Num
} }
if (options.CreateBy) { if (options.CreateBy) {
......
...@@ -62,6 +62,25 @@ ...@@ -62,6 +62,25 @@
{{ orderData.ProductName }} {{ orderData.ProductName }}
</view> </view>
</view> </view>
<view class="ReservationInforBox">
<view class="ReservationInforTitle">订单信息</view>
<view class="ResInforText row-sb-n">
<view class="ResInforL">订单编号</view>
<view class="ResInforR">
<text>
{{ orderData.OrderId }}
</text>
</view>
</view>
<view class="ResInforText row-sb-n">
<view class="ResInforL">创建日期</view>
<view class="ResInforR">
<text>
{{ orderData.CreateTime }}
</text>
</view>
</view>
</view>
<view class="ReservationInforBox" v-if="orderData.OrderType<3"> <view class="ReservationInforBox" v-if="orderData.OrderType<3">
<view class="ReservationInforTitle">航班信息</view> <view class="ReservationInforTitle">航班信息</view>
<view class="ResInforText row-sb-n"> <view class="ResInforText row-sb-n">
...@@ -562,7 +581,11 @@ ...@@ -562,7 +581,11 @@
this.orderStatus.code = -2; this.orderStatus.code = -2;
this.orderStatus.text = "已完成"; this.orderStatus.text = "已完成";
this.showPayBtn = true; this.showPayBtn = true;
} else if (status == 2) { } else if (status == 2&&Income<TotalPrice) {
this.orderStatus.code = 1;
this.orderStatus.text = "待付款";
this.showPayBtn = false;
} else if (status == 2&&Income==TotalPrice) {
this.orderStatus.code = 1; this.orderStatus.code = 1;
this.orderStatus.text = "待出行"; this.orderStatus.text = "待出行";
this.showPayBtn = false; this.showPayBtn = false;
...@@ -601,7 +624,9 @@ ...@@ -601,7 +624,9 @@
this.peopleNum = Number(this.orderData.ManNum) + Number(this.orderData.ChildNum) +Number(this.orderData.BabyNum); this.peopleNum = Number(this.orderData.ManNum) + Number(this.orderData.ChildNum) +Number(this.orderData.BabyNum);
// #ifdef MP-AG // #ifdef MP-AG
this.formatStatus( this.formatStatus(
res.data.OrderStatus res.data.OrderStatus,
res.data.Income,
(res.data.Money-res.data.DiscountsMoney).toFixed(2),
); );
// #endif // #endif
// #ifdef MP-DI // #ifdef MP-DI
......
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