auto commit

pages/attence/attence.scss

@@ -89,9 +89,7 @@ page{
 	font-size: 24rpx;
 	font-weight: 400;
 	color: #7D7D7D;
-	line-height: 33rpx;
-	padding-bottom: 45rpx;
-	border-bottom: 1px solid #EAEAEA;
+	line-height: 33rpx;	
 	margin-bottom: 37rpx;
 	.u-icon{
 		margin-right: 11rpx;
@@ -99,6 +97,8 @@ page{
 }
 
 .statistics{
+	padding-top: 45rpx;
+	border-top: 1px solid #EAEAEA;
 	.statistics-item{
 		flex: 1;
 		text-align: center;

pages/attence/attence.vue

@@ -40,11 +40,11 @@
 					<view class="attence-button-type">{{workType|filterWorkType}}打卡</view>
 					<view class="attence-button-time">{{ $u.timeFormat(currentTime, 'hh:MM:ss') }}</view>
 				</view>
-				<view class="position-tip" v-if="!outPosition">
+				<view class="position-tip" v-if="!outPosition&&positionInfo">
 					<u-icon name="checkmark-circle-fill" color="#21CF3D" size="28"></u-icon>
 					您已进入考勤范围：{{payeeinfo.roadName}}
 				</view>
-				<view class="position-tip" v-else>
+				<view class="position-tip" v-else-if="outPosition&&positionInfo">
 					<u-icon name="checkmark-circle-fill" color="#da0808" size="28"></u-icon>
 					您已超出考勤范围：{{payeeinfo.roadName}}
 				</view>
@@ -100,7 +100,7 @@
 				theRoad:[],
 				currentTime: new Date().getTime(), // 获取当前时间
 				outPosition:true,//是否超出打卡范围
-				positionInfo:true,//是否线上位置关系信息
+				positionInfo:false,//是否线上位置关系信息
 				remarkPopupShow:false,//备注弹框
 				remarkTip:'',
 				remark:'',
@@ -139,6 +139,7 @@
 						var dst = `${that.payeeinfo.longitude},${that.payeeinfo.latitude}`;
 						var src = res.latitude + ',' + res.longitude;
 						var locRet = location?.distance?.(src, dst);
+						that.positionInfo = true;
 						// console.log('locRet',locRet);
 						ALog.info({msg:locRet.distance})
 						if(locRet<=that.payeeinfo.workDistance){//在打卡范围内