Commit 3d43da31 authored by zhengke's avatar zhengke

修改

parent 3956de1b
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
<view class="date-box flex" @click="showTimePopup=true"> <view class="date-box flex" @click="showTimePopup=true">
<view class="date"> <view class="date">
<text>{{startDay}}</text> <text>{{startDay}}</text>
<text class="date-week">{{getWeek(roomMsg.StartDate)}}</text> <text class="date-week">{{dayObj.startWeek}}</text>
</view> </view>
<view class="hr-line"></view> <view class="hr-line"></view>
<view class="date"> <view class="date">
<text>{{endDay}}</text> <text>{{endDay}}</text>
<text class="date-week">{{getWeek(roomMsg.EndDate)}}</text> <text class="date-week">{{dayObj.endWeek}}</text>
</view> </view>
<view class="ver-line"></view> <view class="ver-line"></view>
<view class="date"> <view class="date">
...@@ -303,6 +303,27 @@ ...@@ -303,6 +303,27 @@
this.endDay = tempDay.endDay; this.endDay = tempDay.endDay;
this.day = tempDay.day; this.day = tempDay.day;
this.dayObj = tempDay; this.dayObj = tempDay;
}else{
let d1 = new Date();
let d = new Date();
let d2 = new Date(d.setDate(d.getDate() + 1))
let startWeek = "周" + "日一二三四五六".charAt(new Date().getDay());
let endWeek = "周" + "日一二三四五六".charAt(new Date().getDay()+1);
var obj = {
start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`,
end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`,
startDay: `${d1.getMonth()+1}-${d1.getDate()}`,
endDay: `${d2.getMonth()+1}-${d2.getDate()}`,
day: 1,
startWeek: startWeek,
endWeek: endWeek
}
this.roomMsg.StartDate = obj.start;
this.roomMsg.EndDate = obj.end;
this.startDay = obj.startDay;
this.endDay = obj.endDay;
this.day = obj.day;
this.dayObj = obj;
} }
if (this.id > 0) { if (this.id > 0) {
this.getHotelDetail(this.id); this.getHotelDetail(this.id);
......
...@@ -178,12 +178,16 @@ ...@@ -178,12 +178,16 @@
let d1 = new Date(); let d1 = new Date();
let d = new Date(); let d = new Date();
let d2 = new Date(d.setDate(d.getDate() + 1)) let d2 = new Date(d.setDate(d.getDate() + 1))
let startWeek = "周" + "日一二三四五六".charAt(new Date().getDay());
let endWeek = "周" + "日一二三四五六".charAt(new Date().getDay()+1);
var obj = { var obj = {
start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`, start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`,
end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`, end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`,
startDay: `${d1.getMonth()+1}-${d1.getDate()}`, startDay: `${d1.getMonth()+1}-${d1.getDate()}`,
endDay: `${d2.getMonth()+1}-${d2.getDate()}`, endDay: `${d2.getMonth()+1}-${d2.getDate()}`,
day: 1 day: 1,
startWeek: startWeek,
endWeek: endWeek
} }
this.dayObj = obj; this.dayObj = obj;
uni.setStorage({ uni.setStorage({
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<view class="hotel-order"> <view class="hotel-order">
<view class="o-head"> <view class="o-head">
<view class="o-timer flex"> <view class="o-timer flex">
<view class="time-item">{{getDate(dayObj.start)}} {{getWeek(dayObj.end)}}</view> <view class="time-item">{{getDate(dayObj.start)}} {{dayObj.startWeek}}</view>
<view class="time-split"> <view class="time-split">
<view>{{dayObj.day}}</view> <view>{{dayObj.day}}</view>
<image style="width: 66rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix"></image> <image style="width: 66rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix"></image>
</view> </view>
<view class="time-item">{{getDate(dayObj.end)}} {{getWeek(dayObj.end)}}</view> <view class="time-item">{{getDate(dayObj.end)}} {{dayObj.endWeek}}</view>
</view> </view>
<view class="room-name">{{HotelInfo.HotelName}}</view> <view class="room-name">{{HotelInfo.HotelName}}</view>
<view class="room-remark">{{RoomInfo.BreakfastTypeStr}} | {{RoomInfo.BedTypeStr}} | {{RoomInfo.RoomSize}}㎡ | {{RoomInfo.HasWindowStr}}</view> <view class="room-remark">{{RoomInfo.BreakfastTypeStr}} | {{RoomInfo.BedTypeStr}} | {{RoomInfo.RoomSize}}㎡ | {{RoomInfo.HasWindowStr}}</view>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</view> </view>
<view class="jz_TopPrice"> <view class="jz_TopPrice">
<view class="jz_LineTitle"> <view class="jz_LineTitle">
<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{dataList.currentPriceInfo.b2BPrice}}</text> <text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{$utils.getretailer()==true? dataList.currentPriceInfo.b2BPrice:dataList.currentPriceInfo.b2CPrice}}</text>
<text style="color:#999999;font-size:24rpx;font-weight: 400;"> /人起</text> <text style="color:#999999;font-size:24rpx;font-weight: 400;"> /人起</text>
<text style="color:#999999;font-size:24rpx;font-weight: 400;margin-left: 30rpx;">2728人出游</text> <text style="color:#999999;font-size:24rpx;font-weight: 400;margin-left: 30rpx;">2728人出游</text>
</view> </view>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<text></text> <text></text>
<text style="font-size: 28rpx;font-weight: 600;">{{item.remainNum}}</text> <text style="font-size: 28rpx;font-weight: 600;">{{item.remainNum}}</text>
</view> </view>
<view style="color:#FF3166;font-size:26rpx;">{{item.b2BPrice}}</view> <view style="color:#FF3166;font-size:26rpx;">{{$utils.getretailer()==true? item.b2BPrice:item.b2CPrice}}</view>
</view> </view>
</template> </template>
<view class="jz_StartList" :class="{'active':delMsg.tcid==customerDate.tcid}" @click="openDate"> <view class="jz_StartList" :class="{'active':delMsg.tcid==customerDate.tcid}" @click="openDate">
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
<view class="jz_OrderDiv"> <view class="jz_OrderDiv">
<view style="color:#FF3166;font-weight:bold;"> <view style="color:#FF3166;font-weight:bold;">
<text style="font-size:22rpx;">¥</text> <text style="font-size:22rpx;">¥</text>
<text style="font-size:40rpx;">{{dataList.currentPriceInfo.b2BPrice}}</text> <text style="font-size:40rpx;">{{$utils.getretailer()==true? dataList.currentPriceInfo.b2BPrice:dataList.currentPriceInfo.b2CPrice}}</text>
<text style="font-size:22rpx;">/起</text> <text style="font-size:22rpx;">/起</text>
</view> </view>
<view style="display:flex;align-items: center;"> <view style="display:flex;align-items: center;">
......
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