对接接口

pages/subPack/human/human.vue

@@ -189,11 +189,12 @@
 				})
 			},
 			async submit(){
+				this.form.pic = ''
 				if (this.$utils.verificationAll(this.form, {
 						lat : '经纬度缺失，请打开GPS',
 						lon : '经纬度缺失，请打开GPS',
 						address : '获取地址失败',
-						pic : '请拍照',
+						// pic : '请拍照',
 					})) {
 					return
 				}
@@ -372,16 +373,16 @@
 						// 	icon: 'icon'
 						// })
 						this.isVerifyFace = true
-						this.$refs.successPopup.open()
+						// this.$refs.successPopup.open()
 						
-						// if(self.form.lat){
-						// 	self.submit()
-						// }else{
-						// 	uni.showLoading({
-						// 		title: '定位中...'
-						// 	})
-						// 	self.isLocationSubmit = true
-						// }
+						if(self.form.lat){
+							self.submit()
+						}else{
+							uni.showLoading({
+								title: '定位中...'
+							})
+							self.isLocationSubmit = true
+						}
 					}else{
 						this.tempImg = ''
 						this.form.pic = ''

pages/subPack/record/record.vue

@@ -53,14 +53,17 @@
 				:key="item.id">
 					<template #title>
 						<view class="today-detail-main">
-							<image :src="item.pic"
+							
+							<!-- <image :src="item.pic"
 							@click="previewImage([item.pic])" 
-							mode="aspectFill"></image>
+							mode="aspectFill"></image> -->
+							
 							<view class="sign-detail">
 								<view class="time" v-if="item.clockInTime">{{ item.clockInTime }}</view>
 								<view class="time" v-else>
 									{{ selectDate.format('YYYY-MM-DD ') + item.clockStartTime }}
-									<view class="tag">
+									<view class="tag"
+									v-if="item.type != 2">
 										缺卡
 									</view>
 								</view>
@@ -140,6 +143,10 @@
 				this.queryParams.date = this.selectDate.format('YYYY-MM-DD HH:mm:ss')
 				this.getData()
 			},
+			isShowTag(date){
+				let index = new Date(date).getDay()
+				return ![0, 6].includes(index)
+			},
 		}
 	}
 </script>