Commit d4f8883b by zhangzhen

细节优化

parent c6b72935
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<view class="action text-pink" @tap="onSelectedDate">确定</view> <view class="action text-pink" @tap="onSelectedDate">确定</view>
</view> </view>
<view class="select-box"> <view class="select-box">
<picker-view class="picker-view" indicator-style="height: 42px;" v-model="checkedDateList" <picker-view class="picker-view" indicator-style="height: 42px;" :immediate-change="true" v-model="checkedDateList"
@change="onBindChange"> @change="onBindChange">
<picker-view-column> <picker-view-column>
<view class="item" v-for="(item,index) in hourList" :key="index"> <view class="item" v-for="(item,index) in hourList" :key="index">
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
<view class="action text-pink" @tap="onSelectedDuration">确定</view> <view class="action text-pink" @tap="onSelectedDuration">确定</view>
</view> </view>
<view class="select-box"> <view class="select-box">
<picker-view class="picker-view" indicator-style="height: 42px;" v-model="durationIndex" <picker-view class="picker-view" indicator-style="height: 42px;" :immediate-change="true" v-model="durationIndex"
@change="onBindDuratin"> @change="onBindDuratin">
<picker-view-column> <picker-view-column>
<view class="item" v-for="(item,index) in hourList" :key="index"> <view class="item" v-for="(item,index) in hourList" :key="index">
...@@ -695,7 +695,7 @@ ...@@ -695,7 +695,7 @@
start +=24 start +=24
this.setStartTime.days = 1 this.setStartTime.days = 1
} }
if (end < start) { if (end <= start) {
end += 24 end += 24
} }
// 重新将数据还原到元数据 // 重新将数据还原到元数据
...@@ -842,7 +842,7 @@ ...@@ -842,7 +842,7 @@
h = val+duration h = val+duration
} }
this.endTime = `${h>=10?h:'0'+h}:${startM}`; this.endTime = `${h>=10?h:'0'+h}:${startM>=10?startM:'0'+startM}`;
this.dateObj = this.onSetDateTime(this.startTime, this.endTime); this.dateObj = this.onSetDateTime(this.startTime, this.endTime);
let showHourUse = false; let showHourUse = false;
this.intervalList = this.intervalList.map((item,index) =>{ this.intervalList = this.intervalList.map((item,index) =>{
...@@ -979,7 +979,7 @@ ...@@ -979,7 +979,7 @@
this.onOrderCreate() this.onOrderCreate()
}, },
complete: (res) => { complete: (res) => {
console.log(res, 909090)
} }
}) })
}, },
...@@ -1108,11 +1108,11 @@ ...@@ -1108,11 +1108,11 @@
title: '当前时段不可选' title: '当前时段不可选'
}) })
} else { } else {
this.startTime = `${i}:${mTime}`; this.startTime = `${i>=10?i:'0'+i}:${mTime>=10?mTime:'0'+mTime}`;
this.onSetEndTime() this.onSetEndTime()
} }
} else { } else {
this.startTime = `${i}:00`; this.startTime = `${i>=10?i:'0'+i}:00`;
this.onSetEndTime() this.onSetEndTime()
} }
} }
...@@ -1126,7 +1126,7 @@ ...@@ -1126,7 +1126,7 @@
let startArr = startTime.split(":") let startArr = startTime.split(":")
let endArr = endTime.split(":") let endArr = endTime.split(":")
obj.startDate = `${this.dateList[this.dateIndex].readDate} ${startTime}:00` obj.startDate = `${this.dateList[this.dateIndex].readDate} ${startTime}:00`
if (Number(endArr[0]) < Number(startArr[0])) { if (Number(endArr[0]) <= Number(startArr[0])) {
obj.endDate = obj.endDate =
`${moment(this.dateList[this.dateIndex].readDate).add(1,"days").format("YYYY-MM-DD")} ${endTime}:00` `${moment(this.dateList[this.dateIndex].readDate).add(1,"days").format("YYYY-MM-DD")} ${endTime}:00`
} else { } else {
......
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
<view class="flex-col part-2"> <view class="flex-col part-2">
<view class="flex-row"> <view class="flex-row">
<text class="text-title">预约开始时间</text> <text class="text-title">预约开始时间</text>
<text class="text-title">{{item.preStartDate +':00'}}</text> <text class="text-title">{{item.preStartDate}}</text>
</view> </view>
<view class="flex-row "> <view class="flex-row ">
<text class="text-title">预约结束时间</text> <text class="text-title">预约结束时间</text>
<text class="text-title">{{item.preEndDate +':00'}}</text> <text class="text-title">{{item.preEndDate}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -85,11 +85,11 @@ ...@@ -85,11 +85,11 @@
</view> </view>
<view v-if="item.startDate" class="flex-between part-1"> <view v-if="item.startDate" class="flex-between part-1">
<text class="text-gray">开始时间:</text> <text class="text-gray">开始时间:</text>
<text class="text-title">{{item.startDate}}:00</text> <text class="text-title">{{item.startDate}}</text>
</view> </view>
<view v-if="item.endDate" class="flex-between part-1"> <view v-if="item.endDate" class="flex-between part-1">
<text class="text-gray">结束时间:</text> <text class="text-gray">结束时间:</text>
<text class="text-title">{{item.endDate}}:00</text> <text class="text-title">{{item.endDate}}</text>
</view> </view>
<!-- <view class="flex-between part-1"> <!-- <view class="flex-between part-1">
<text class="text-gray">订单总计:</text> <text class="text-gray">订单总计:</text>
...@@ -289,9 +289,9 @@ import NoLogin from "@/components/noLogin/noLogin" ...@@ -289,9 +289,9 @@ import NoLogin from "@/components/noLogin/noLogin"
} }
.room-image-box{ .room-image-box{
width: 100%; width: 100%;
height: 240upx; height: 200upx;
.img-box{ .img-box{
width: 200upx; width: 240upx;
height: 100%; height: 100%;
image{ image{
height: 100%; height: 100%;
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
<text class="text-title ">{{orderInfo.updateTime || orderInfo.createTime||'-'}}</text> <text class="text-title ">{{orderInfo.updateTime || orderInfo.createTime||'-'}}</text>
</view> </view>
<view class="info"> <view class="info">
<text class="text-title text-bold">预约开始时间:</text> <text class="text-title text-bold">开始时间:</text>
<text class="text-title ">{{orderInfo.preStartDate||'00:00'}}:00</text> <text class="text-title ">{{orderInfo.preStartDate||'00:00'}}</text>
</view> </view>
<view class="info"> <view class="info">
<text class="text-title text-bold">预约结束时间:</text> <text class="text-title text-bold">结束时间:</text>
<text class="text-title ">{{orderInfo.preEndDate ||'00:00'}}:00</text> <text class="text-title ">{{orderInfo.preEndDate ||'00:00'}}</text>
</view> </view>
</view> </view>
</view> </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