修改

pages/face/index.vue

@@ -159,10 +159,12 @@
 				};
 				let platform = uni.getSystemInfoSync().platform
 				console.log(platform)
-				if(platform == 'ios') {
-				    this.test()
-				    return
-				}
+				this.test()
+				return
+				// if(platform == 'ios') {
+				//     this.test()
+				//     return
+				// }
 				//初始化摄像头参数
 				if (navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia) {
 					navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator

pages/leave/index.vue

@@ -20,7 +20,7 @@
 				</view>
 				
 				<view class="choice" v-if="tobu == 2">
-					<Sever v-if="classData.length != 0" :classData="classData" @search="search"></Sever>
+					<Sever v-if="classData.length != 0" :classData="classData" @search="searchTwo"></Sever>
 					
 					<div @click="timeShow=true" class="time-show">
 						{{currentDateArray1[0]}}~{{currentDateArray2[0]}}
@@ -396,6 +396,7 @@
 						endTimeStr: this.currentDateArray2[0],
 						size: 999,
 						current: 1,
+						status: 1,
 					}
 				}).then(res=>{
 					// console.log('res', res)
@@ -420,14 +421,25 @@
 				this.getData()
 				this.getStati()
 				this.getList()
-				this.getListTwo()
+				// this.getListTwo()
 				
 			},
 			
+			searchTwo(data){
+				console.log(data)
+				this.classId = data
+				this.getListTwo()
+			},
+			
 			// 点击改变是否观察或者处理记录
 			to(data){
 				this.tobu = data
-				this.getListTwo()
+				// this.getListTwo()
+				if(data == 1){
+					this.getList()
+				}else if(data == 2){
+					this.getListTwo()
+				}
 			},
 
 			// 跳转新增
@@ -464,7 +476,7 @@
 				this.getData()
 				this.getList()
 				this.getStati()
-				this.getListTwo()
+				// this.getListTwo()
 			},
 			
 			onDayClicks1(data){