细节优化

pages/cleanManage/cleanManage.vue

@@ -218,7 +218,7 @@ import moment from "@/common/moment";
 				})
 			},
 			onNavSearch(val){
-				if(val.recordsStatus == 0){
+				if(val.recordsStatus == 0 ||val.recordsStatus == 1){
 					uni.navigateTo({
 						url:"/pages/cleanOrderInfo/cleanOrderInfo?id="+val.recordsId
 					})

pages/cleanOrderInfo/cleanOrderInfo.vue

@@ -146,7 +146,7 @@
 				uni.chooseImage({
 					count: 4, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album'], //从相册选择
+					sourceType: ['camera'], //仅拍照
 					success: (res) => {
 						console.log(res,"文件")
 						// if (this.imgList.length != 0) {

pages/order/order.vue

@@ -476,18 +476,21 @@
 				endHours:48,
 				content:'',
 				toDayDate: '', // 今天日期
+				
 			};
 		},
 		filters:{
 			resetStartTime(val){
-				let time = null;
-				let hour = val.split(':')
-				if(hour>=24){
-					time = `${hour-24}:00`
-				}else{
-					time = val
+				let hour = val.split(':').map((n,k)=> {
+					let t = Number(n)
+					if(k == 0){
+						if(n>=24){
+							t = n>=24? n-24: n
 						}
-				return time;
+					}
+					return t>=10? t: `0${t}`
+				}).join(":")
+				return hour;
 			}
 		},
 		watch:{
@@ -537,7 +540,8 @@
 				if(this.dateIndex === 0){
 					let h = new Date().getHours()
 					this.hourList = this.hourList.filter(item=> Number(item)>=h).map(item=> {
-						return item>=10? item: `0${item}`
+						let i = Number(item)
+						return i>=10? i: `0${i}`
 					} )
 				}else{
 					this.hourList = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15",
@@ -712,6 +716,7 @@
 							this.setStartTime.duration+=1;
 						}
 						if(index >= this.dateIntervalList.length-1){
+							console.log(this.addM,"是否加一分钟")
 							if(!this.addM && this.dateIntervalList[0].status){
 								console.log(this.startTime,909090)
 								this.addM = true
@@ -952,6 +957,7 @@
 				if (this.index === i || !this.packageMode.length) return;
 				this.index = i
 				this.modeIndex = 0;
+				this.addM = false;
 				this.distanceIndex = this.orderType == 2? 1: 0;
 				this.setStartTime = {
 					status:false,
@@ -966,7 +972,7 @@
 				// 	this.days =1
 				// }
 				this.days =1
-				this.checkedDateList= [0,0]
+				// this.checkedDateList= [0,0]
 				// this.onSetEndTime();
 				this.onGetSortDistance();
 			},
@@ -1164,11 +1170,16 @@
 			},
 			onOrderConfirm() {
 				
-				let nowDate = moment().format("HHmm")
-				let setDate = moment(this.dateObj.startDate).format("HHmm");
+				let nowDate = moment().format("MMDD")
+				
+				let nowTime = moment().format("HHmm")
+				
+				let setDate = moment(this.dateObj.startDate).format("MMDD");
+				
+				let setTime = moment(this.dateObj.startDate).format("HHmm");
 				
 				// 如果当前时间大于开始时间，则不允许下单
-				if(nowDate > setDate){
+				if(this.orderType ==1 && nowDate == setDate && nowTime > setTime){
 					uni.showToast({
 						icon:"none",
 						title:"当前时间晚于预约开始时间，请重新选择预约时间"
@@ -1365,7 +1376,7 @@
 						this.dateIndex+=1;
 					}
 				}
-				if (val.status == 1) {
+				if (val.status == 1 || val.status == 2) {
 						let mTime = Number(moment(val.endHoldTime).format("mm"))
 						if (mTime >= 59) {
 							uni.showToast({
@@ -1375,7 +1386,7 @@
 							return;
 						} else {
 							this.startTime = `${time>=10?time:'0'+time}:${mTime>=10?mTime:'0'+mTime}`;
-							if(time > 0){
+							if(time >= 0){
 									// 开始时间加一分钟
 									let arr = this.startTime.split(":");
 									let m = Number(arr[1])+1
@@ -1391,25 +1402,14 @@
 							}).join(":")
 						}
 				} else {
-					let mTime = Number(moment(val.endHoldTime).format("mm"))
 						this.startTime = `${time>=10?time:'0'+time}:00`;
-						
-						if(time > 0 && this.dateIntervalList[time-1].status == 1 && mTime>=59){
-								// 开始时间加一分钟
-								let arr = this.startTime.split(":");
-								let m = Number(arr[1])+1
-								let h = Number(arr[0])
-								this.startTime = `${h>=10?h:'0'+h}:${m>=10?m:'0'+m}`
-						}
-						
 						this.endTime = this.startTime.split(":").map((item,k)=>{
 							let n = Number(item);
 							if(k==0){
-								n = n+this.duration>=24? n+this.duration-24:n+this.duration
+								n = n+this.duration >=24 ? n+this.duration-24: n+this.duration
 							}
 							return n>=10? n: `0${n}`
 						}).join(":")
-						
 				}
 				this.dateObj = this.onSetDateTime(this.startTime, this.endTime);
 				this.onGetUseCoupon();