Commit 469a3a08 authored by youjie's avatar youjie

修复bug

parent deb6fc59
...@@ -211,6 +211,13 @@ ...@@ -211,6 +211,13 @@
handler(val, oldval) { handler(val, oldval) {
if (val) { if (val) {
this.RoomList = val this.RoomList = val
uni.getStorage({
key: "Time",
success: (res) => {
let obj = JSON.parse(res.data);
this.dayObj = obj
},
});
} }
}, },
deep: true, deep: true,
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
(line <= end[0] && index < end[1] && line > start[0]) || (line <= end[0] && index < end[1] && line > start[0]) ||
(line < end[0] && line > start[0]) (line < end[0] && line > start[0])
? 'bg-higlt-orange': '', ? 'bg-higlt-orange': '',
((line==0||line==start[0])&& index + 1 < nowDay)||res.month<nowMonth ? 'time-out' : '', ((line==0||line==1)&& index + 1 < nowDay)||res.month<nowMonth ? 'time-out' : '',
isNaN(item) ? 'is-festival' : '', isNaN(item) ? 'is-festival' : '',
(isNaN(item) && line == start[0] && index == start[1]) || (isNaN(item) && line == start[0] && index == start[1]) ||
(isNaN(item) && line == end[0] && index == end[1]) (isNaN(item) && line == end[0] && index == end[1])
...@@ -452,7 +452,7 @@ export default { ...@@ -452,7 +452,7 @@ export default {
//选择入住离开 //选择入住离开
selectDay(line, index) { selectDay(line, index) {
if (((line==0||line==this.start[0])&& index + 1 < this.nowDay)||this.resDate[line].month<this.nowMonth) return; if (((line==0||line==1)&& index + 1 < this.nowDay)||this.resDate[line].month<this.nowMonth) return;
//如果有入住情况和价格则需要进行一些列的判断 //如果有入住情况和价格则需要进行一些列的判断
if (this.priceStauts.length > 0) { if (this.priceStauts.length > 0) {
if ( if (
......
...@@ -164,9 +164,10 @@ ...@@ -164,9 +164,10 @@
<view class="val f14 regular" style="text-align: right;"> <view class="val f14 regular" style="text-align: right;">
<text style="margin-right: 30rpx;">{{searchObj.peoples}}</text> <text style="margin-right: 30rpx;">{{searchObj.peoples}}</text>
<text style="margin-right: 30rpx;">{{orderMsg.RoomCount}}间房</text> <text style="margin-right: 30rpx;">{{orderMsg.RoomCount}}间房</text>
<text style="margin-right: 30rpx;">{{ dayObj.day }}</text>
<text class="red">{{RoomInfo.Currency}} <text class="red">{{RoomInfo.Currency}}
<!--{{getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount}}--> <!--{{getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount}}-->
{{orderMsg.TotalPrice*orderMsg.RoomCount}} {{orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day}}
</text> </text>
</view> </view>
</view> </view>
...@@ -181,7 +182,7 @@ ...@@ -181,7 +182,7 @@
<text style="margin-right: 30rpx">房间</text> <text style="margin-right: 30rpx">房间</text>
</view> </view>
<view style="text-align: right"> <view style="text-align: right">
{{orderMsg.RoomCount}}间×{{RoomInfo.Currency}} {{orderMsg.RoomCount}}间×{{dayObj.day}}晚×{{RoomInfo.Currency}}
<!--{{ getPrice(orderMsg.TotalPrice) }}--> <!--{{ getPrice(orderMsg.TotalPrice) }}-->
{{ orderMsg.TotalPrice }} {{ orderMsg.TotalPrice }}
</view> </view>
...@@ -197,9 +198,9 @@ ...@@ -197,9 +198,9 @@
<view class="flex f12"> <view class="flex f12">
<view style="flex: 1">小计</view> <view style="flex: 1">小计</view>
<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).toFixed(2) }} {{ ((orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day)-currentCoupon.discountMoney).toFixed(2) }}
</view> </view>
</view> </view>
</view> </view>
...@@ -245,7 +246,7 @@ ...@@ -245,7 +246,7 @@
<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) }} {{ ((orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day)-currentCoupon.discountMoney).toFixed(2) }}
</text> </text>
</view> </view>
<view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view> <view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view>
......
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