细节优化

pages/orderResult/orderResult.vue

@@ -168,9 +168,7 @@
 			};
 		},
 		onLoad(option) {
-			
 			this.userInfo = uni.getStorageSync('userInfo')
-			console.log(this.userInfo,"用户信息")
 			
 			this.orderNo = option.orderNo;
 			if(option.share && option.share =="share"){
@@ -267,6 +265,7 @@
 					if(nowTime - endTime< 15*60*1000){
 						this.continStatus = true;
 					}
+					console.log(this.continStatus,888)
 					this.orderInfo = {
 						...res.data.data,
 						roomImages: res.data.data.roomImages.split(','),
@@ -371,45 +370,33 @@
 					//订单结束时间
 					let orderEndDate = `${this.orderInfo.endDate} ${this.orderInfo.endTime}:00`;
 					// 续单开始时间戳,订单未结束使用订单实际结束时间，订单结束使用当前时间
-					let startDateStemp = this.orderInfo.status == 2? moment(moment().format("YYYY-MM-DD HH:mm:00")).valueOf(): moment(orderEndDate).valueOf();
-					
+					let startDateStemp = this.orderInfo.status == 2? moment(moment().format("YYYY-MM-DD HH:mm:00")).valueOf(): moment(orderEndDate).valueOf()
 					//可续单的结束时间戳
 					let endDateStemp = startDateStemp + 60*60*1000;
-					
 					let continueStatus = true;
-					
 					if(res.data.code ==200 && res.data.data && res.data.data.length){
-						
 						new Promise((resolve,reject) => {
 							res.data.data.forEach((item,i)=>{
-								console.log(i)
-								let start = moment(item.timeHour+':00:00').valueOf();
-								let end   = moment(item.timeHour+':59:59').valueOf();
-								
-								if( end >= startDateStemp && start <= end ){
-									if(item.stauts ==1){
+								let start = moment(item.timeHour +':00:00').valueOf();
+								let end   = moment(item.timeHour +':59:59').valueOf();
+								if(start < endDateStemp && start >= startDateStemp && item.status ==1 ){
 										if(this.onCheckHourUse(item.startHoldTime,item.endHoldTime)){
 											continueStatus = false;
-											console.log("节点1")
 										}else{
 											
 							                if( startDateStemp >= moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){
 												continueStatus = false;
-												console.log("节点2")
 											}else if( endDateStemp >= moment(item.startHoldTime).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}`