细节优化

pages/orderResult/orderResult.vue

@@ -348,8 +348,10 @@
 					//订单开始时间
 					let orderStartTime = 0;
 					
+					let continueStatus = false;
 					if(res.data.code ==200 && res.data.data && res.data.data.length){
 						res.data.data.forEach(item=>{
+							if(continueStatus) return;
 	                        if(orderStartTime){
 								if(item.status == 0){
 									uni.navigateTo({
@@ -367,20 +369,35 @@
 											icon:"none",
 											title:"此订单已无可续单时段"
 										})	
+										continueStatus = true;
 										return
 									}
 								}
 							}else{
-								let d = 0;
 								if(item.status == 0){
-									 d = moment(item.timeHour).valueOf()
-								}else{
-									 d = moment(item.endHoldTime).add(1,'m').valueOf()
-								}
+									let d = moment(item.timeHour).valueOf()
 									 if(d > startDateStemp){
 									 	orderStartTime = d;
 									 	console.log(moment(orderStartTime).format("YYYY-MM-DD HH:mm:ss"),"续单可开始的时间")
 									 }
+									 
+								}else{
+									let d = moment(item.endHoldTime).valueOf();
+									let s = moment(item.startHoldTime).valueOf()
+									 if(startDateStemp>d){
+                                        orderStartTime = d;
+										console.log(moment(orderStartTime).format("YYYY-MM-DD HH:mm:ss"),"续单可开始的时间2")
+									 }
+									 if(startDateStemp > s && startDateStemp< d){
+										 uni.showToast({
+										 	icon:"none",
+										 	title:"此订单已无可续单时段"
+										 });
+										 continueStatus = true;
+										 return
+									 }
+								}
+
 							}
 						})
 					}