Skip to content

G
gxpt_wechat
Commit 9d7bf76a by zhangzhen
Options

细节优化

parent 5cae7c58
Showing with 39 additions and 32 deletions
pages/orderResult/orderResult.vue
...@@ -373,44 +373,51 @@ ...@@ -373,44 +373,51 @@
let continueStatus = true; let continueStatus = true;
if(res.data.code ==200 && res.data.data && res.data.data.length){ if(res.data.code ==200 && res.data.data && res.data.data.length){
res.data.data.forEach(item=>{
new Promise((resolve,reject) => {
let start = moment(item.timeHour+':00:00').valueOf(); res.data.data.forEach((item,i)=>{
let end = moment(item.timeHour+':59:59').valueOf(); console.log(i)
let start = moment(item.timeHour+':00:00').valueOf();
if( end >= startDateStemp && start <= end ){ let end = moment(item.timeHour+':59:59').valueOf();
if(item.stauts ==1){
if(this.onCheckHourUse(item.startHoldTime,item.endHoldTime)){ if( end >= startDateStemp && start <= end ){
continueStatus = false; if(item.stauts ==1){
console.log("节点1") if(this.onCheckHourUse(item.startHoldTime,item.endHoldTime)){
}else{
if( startDateStemp > moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){
continueStatus = false;
console.log("节点2")
}
if( endDateStemp >= moment(item.startHoldTime).valueOf() && endDateStemp <= moment(item.endHoldTime).valueOf()){
continueStatus = false; continueStatus = false;
console.log("节点3") console.log("节点1")
}else{
if( startDateStemp > moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){
continueStatus = false;
console.log("节点2")
}
if( endDateStemp >= moment(item.startHoldTime).valueOf() && endDateStemp <= moment(item.endHoldTime).valueOf()){
continueStatus = false;
console.log("节点3")
}
} }
} }
} }
if(i>= res.data.data.length-1){
resolve(continueStatus)
}
})
}).then(continueStatus =>{
console.log(continueStatus,"节点3")
if(continueStatus){
uni.navigateTo({
url:`/pages/order/order?roomId=${this.orderInfo.roomId}&orderNo=${this.orderInfo.orderNo}`
})
}else{
uni.showToast({
icon:"none",
title:"此订单已无可续单时段"
})
} }
}) })
if(continueStatus){
uni.navigateTo({
url:`/pages/order/order?roomId=${this.orderInfo.roomId}&orderNo=${this.orderInfo.orderNo}`
})
}else{
uni.showToast({
icon:"none",
title:"此订单已无可续单时段"
})
}
} }
}).catch(err=>{ }).catch(err=>{
uni.hideLoading() uni.hideLoading()
......
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