Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -774,7 +774,7 @@ export default {
 		
 		//获取百度地图ak
 		GET_AK() {
-			let ak = ['zdBn8ZVlAELEK3rsBsxin7cXaYxjT1uE','Nx9VQtQEgzUm5GuBVt5SHoO5jt204xNo']
+			let ak = ['zdBn8ZVlAELEK3rsBsxin7cXaYxjT1uE','78iR1wqm8cER7Gjt4tT26HrGGtGuk9LI']
 			let current = this.GET_STORAGE('baiduAK')
 			if(!current){
 				let ri = Math.floor(Math.random()*2);

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>

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>