Skip to content

G
gxpt_wechat
Commit fafeb31f by zhangzhen
Options

细节优化

parent 9d7bf76a
Showing with 10 additions and 24 deletions
pages/order/order.vue
...@@ -1525,45 +1525,29 @@ ...@@ -1525,45 +1525,29 @@
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点2") console.log("节点2")
} }else if( endStemp > moment(item.startHoldTime).valueOf() && endStemp <= moment(item.endHoldTime).valueOf()){
if( endStemp > moment(item.startHoldTime).valueOf() && endStemp <= moment(item.endHoldTime).valueOf()){
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点3") console.log("节点3")
} }else if(startStemp <= moment(item.endHoldTime).valueOf() && endStemp >= moment(item.startHoldTime).valueOf()){
if(startStemp <= moment(item.endHoldTime).valueOf() && endStemp >= moment(item.startHoldTime).valueOf()){
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点4") console.log("节点4")
} }
} else if(this.orderType == 2){
} else if(this.orderType == 2){
// if( m <= 60 && !(startStemp >= moment(item.endHoldTime).valueOf() && endStemp < end) ){
// useStatus = true;
// nextStatus = true;
// console.log("节点5")
// }
if( startStemp > moment(item.startHoldTime).valueOf() && startStemp < moment(item.endHoldTime).valueOf()){ if( startStemp > moment(item.startHoldTime).valueOf() && startStemp < moment(item.endHoldTime).valueOf()){
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点2") console.log("节点2")
} } else if(startStemp < moment(item.endHoldTime).valueOf() && endStemp >= moment(item.startHoldTime).valueOf()){
if( endStemp >= moment(item.startHoldTime).valueOf() && endStemp <= moment(item.endHoldTime).valueOf()){
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点3") console.log("节点4")
} } else if( endStemp >= moment(item.startHoldTime).valueOf() && endStemp <= moment(item.endHoldTime).valueOf()){
if(startStemp < moment(item.endHoldTime).valueOf() && endStemp >= moment(item.startHoldTime).valueOf()){
useStatus = true; useStatus = true;
nextStatus = true; nextStatus = true;
console.log("节点4") console.log("节点3")
} }
} }
} }
...@@ -1609,6 +1593,7 @@ ...@@ -1609,6 +1593,7 @@
startStamp = moment(params.startDateTime).valueOf(); startStamp = moment(params.startDateTime).valueOf();
endStamp = startStamp + m*60000; endStamp = startStamp + m*60000;
dateObj.useStatus = this.onUseByStartAndDuration(params.startDateTime,m,2) dateObj.useStatus = this.onUseByStartAndDuration(params.startDateTime,m,2)
console.log(dateObj.useStatus,999)
} else if(params.duration){ } else if(params.duration){
dateObj = this.onComputeByDuration(m,2); dateObj = this.onComputeByDuration(m,2);
......
pages/orderResult/orderResult.vue
...@@ -352,7 +352,8 @@ ...@@ -352,7 +352,8 @@
storeId: this.orderInfo.storeId, storeId: this.orderInfo.storeId,
roomId: this.orderInfo.roomId, roomId: this.orderInfo.roomId,
day: this.orderInfo.endDate, day: this.orderInfo.endDate,
orderType:2 orderType:2,
orderId: this.orderInfo.id
}).then(res=>{ }).then(res=>{
uni.hideLoading() uni.hideLoading()
if(res.data.code != 200){ if(res.data.code != 200){
......
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