Commit 25263139 authored by youjie's avatar youjie

修复

parent 20d27a98
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<view> <view>
{{RoomInfo.Currency}} {{RoomInfo.Currency}}
<!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}--> <!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}-->
{{ (orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney }} {{ ((orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney).toFixed(2) }}
</view> </view>
</view> </view>
</view> </view>
...@@ -241,7 +241,8 @@ ...@@ -241,7 +241,8 @@
<text class="f11">{{RoomInfo.Currency}}</text> <text class="f11">{{RoomInfo.Currency}}</text>
<text> <text>
<!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}--> <!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}-->
{{ (orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney }} <!-- {{ (orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney }} -->
{{ ((orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney).toFixed(2) }}
</text> </text>
</view> </view>
<view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view> <view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view>
...@@ -381,6 +382,7 @@ ...@@ -381,6 +382,7 @@
CreateBy: 0, CreateBy: 0,
submit: false, submit: false,
orderInfo: null, orderInfo: null,
price: 0,
} }
}, },
created() { created() {
...@@ -434,6 +436,7 @@ ...@@ -434,6 +436,7 @@
OccupancyDetails: [], OccupancyDetails: [],
hotelId: this.orderMsg.hotelId hotelId: this.orderMsg.hotelId
} }
this.price = this.RoomInfo.Currency + this.RoomInfo.RatePlanPrice
this.getUserCouponList() this.getUserCouponList()
this.CalTotalPrice(); this.CalTotalPrice();
this.GetCountryInfo() this.GetCountryInfo()
...@@ -516,6 +519,7 @@ ...@@ -516,6 +519,7 @@
this.apipost("AddOrderInfo_post", msg, (res) => { this.apipost("AddOrderInfo_post", msg, (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res.data,'-----33');
this.orderInfo = JSON.parse(res.data.sPayInfo) this.orderInfo = JSON.parse(res.data.sPayInfo)
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
...@@ -548,10 +552,12 @@ ...@@ -548,10 +552,12 @@
title: "支付成功", title: "支付成功",
}); });
setTimeout(() => { setTimeout(() => {
// (that.getPrice(that.orderMsg.TotalPrice) - that
// .currentCoupon.discountMoney).toFixed(2) +
// "&isFrom=5
uni.redirectTo({ uni.redirectTo({
url: "/pages/jiuzhai/paysuccess?PreferPrice=" + url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
(that.getPrice(that.orderMsg.TotalPrice) - that (that.orderMsg.TotalPrice - that.currentCoupon.discountMoney).toFixed(2) +
.currentCoupon.discountMoney).toFixed(2) +
"&isFrom=5", "&isFrom=5",
}); });
}, 100); }, 100);
...@@ -779,7 +785,7 @@ ...@@ -779,7 +785,7 @@
}, },
//计算总价 //计算总价
CalTotalPrice() { CalTotalPrice() {
this.price = this.orderMsg.TotalPrice*this.orderMsg.RoomCount
}, },
validate() { validate() {
let email = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/ let email = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
......
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