细节优化

pages/order/order.vue

@@ -746,21 +746,24 @@
 				this.intervalList = [
 					...this.dateIntervalList
 				]
-				for (start; start <= end; start++) {
+				for (let index = start; index <= end; index++) {
+						let endTimeM = 0
+						if(this.dateIntervalList[index].status ==1){
+							endTimeM = moment(this.dateIntervalList[index].startHoldTime).format('mm')
+						}
 					// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
-					if (this.dateIntervalList[start].status === 1 &&
-						startM < moment(this.dateIntervalList[start].endHoldTime).format("mm") &&
-						endM >= moment(this.dateIntervalList[start].startHoldTime).format("mm")
+					if ((this.dateIntervalList[index].status == 1 && index > start && index < start+this.duration)||
+					    (this.dateIntervalList[index].status == 1 && index == end && Number(startM)>= Number(endTimeM) )
 					) {
 						// 表示时间点被占用,无法选择
 						this.useDateStatus = false
-						this.intervalList[start] = {
-							...this.dateIntervalList[start],
+						this.intervalList[index] = {
+							...this.dateIntervalList[index],
 							status: 2
 						}
 					} else {
-						this.intervalList[start] = {
-							...this.dateIntervalList[start],
+						this.intervalList[index] = {
+							...this.dateIntervalList[index],
 							status: 2
 						}
 					}
@@ -928,7 +931,14 @@
 					let status = item.status;
 					if(index>=val && index<= val+duration){
 						status = 2
-						if(this.dateIntervalList[index].status === 1 && index !== val){
+						
+						let endTimeM = 0
+						
+						if(this.dateIntervalList[index].status ==1){
+							endTimeM = moment(this.dateIntervalList[index].startHoldTime).format('mm')
+						}
+						if((this.dateIntervalList[index].status === 1 && index > val && index < val+duration)  ||  
+						(this.dateIntervalList[index].status === 1 && index == val+duration && Number(startM)>= Number(endTimeM))){
 							this.useDateStatus = false
 						}
 					}else{