From fa862be068911f18194e356d648a13a2090f7a30 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Mon, 18 Dec 2023 12:07:55 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E6=89=93=E5=8D=A1=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/AttendanceCard/single_zc.vue        | 27 +++++++++++--------
 .../pages/AttendanceCardTeacher/single_zc.vue | 27 +++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue
index 82641642c..9a02c5565 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue	
@@ -9,7 +9,8 @@
 
 		<view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
 			<l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
-				确认打卡({{second}}s)
+				确认打卡
+				<!-- ({{second}}s) -->
 			</l-button>
 		</view>
 	</view>
@@ -102,15 +103,15 @@
 					() => {}
 				])
 				await this.fetchForm()
-				this.timer = setInterval(()=>{
-					this.second--
-					if(this.second>0)return
-					this.TOAST('拍照超时，请重新打卡')
-					setTimeout(()=>{
-						this.NAV_BACK()
-					},500)
-					return
-				},1000)
+				// this.timer = setInterval(()=>{
+				// 	this.second--
+				// 	if(this.second>0)return
+				// 	this.TOAST('拍照超时，请重新打卡')
+				// 	setTimeout(()=>{
+				// 		this.NAV_BACK()
+				// 	},500)
+				// 	return
+				// },1000)
 
 				this.ready = true
 				this.HIDE_LOADING()
@@ -140,6 +141,10 @@
 						const postData = await this.getPostData(this.id)
 						console.log(postData)
 						let strEntity = JSON.parse(postData.strEntity)
+						if(!strEntity.Img){
+							this.TOAST('图片上传失败')
+							return
+						}
 						// let strEntity_ = {...strEntity,...this.params}
 						this.HTTP_POST('learun/adms/attendance/clockin', JSON.stringify(strEntity), '打卡失败').then(success => {
 							this.HIDE_LOADING()
@@ -177,7 +182,7 @@
 			},
 		},
 		destroyed() {
-			clearInterval(this.timer)
+			// clearInterval(this.timer)
 		}
 	}
 </script>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue
index 4a9832a38..29ca085ec 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue	
@@ -9,7 +9,8 @@
 
 		<view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
 			<l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
-				确认打卡({{second}}s)
+				确认打卡
+				<!-- ({{second}}s) -->
 			</l-button>
 		</view>
 	</view>
@@ -102,15 +103,15 @@
 					() => {}
 				])
 				await this.fetchForm()
-				this.timer = setInterval(()=>{
-					this.second--
-					if(this.second>0)return
-					this.TOAST('拍照超时，请重新打卡')
-					setTimeout(()=>{
-						this.NAV_BACK()
-					},500)
-					return
-				},1000)
+				// this.timer = setInterval(()=>{
+				// 	this.second--
+				// 	if(this.second>0)return
+				// 	this.TOAST('拍照超时，请重新打卡')
+				// 	setTimeout(()=>{
+				// 		this.NAV_BACK()
+				// 	},500)
+				// 	return
+				// },1000)
 
 				this.ready = true
 				this.HIDE_LOADING()
@@ -140,6 +141,10 @@
 						const postData = await this.getPostData(this.id)
 						console.log(postData)
 						let strEntity = JSON.parse(postData.strEntity)
+						if(!strEntity.Img){
+							this.TOAST('图片上传失败')
+							return
+						}
 						// let strEntity_ = {...strEntity,...this.params}
 						this.HTTP_POST('learun/adms/attendance/clockinTeacher', JSON.stringify(strEntity), '打卡失败').then(success => {
 							this.HIDE_LOADING()
@@ -177,7 +182,7 @@
 			},
 		},
 		destroyed() {
-			clearInterval(this.timer)
+			// clearInterval(this.timer)
 		}
 	}
 </script>
\ No newline at end of file