From 90925f054c01ccccaa810a698792413e41db2252 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 25 Feb 2025 17:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=EF=BC=9A=E4=BB=8A=E6=97=A55:00=E8=87=B3?=
 =?UTF-8?q?=E6=98=8E=E6=97=A55:00=E4=B8=BA=E4=BB=8A=E6=97=A5=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E2=80=9D=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/clock/index.vue | 47 ++++++++++++++++++++++++++++++++++-----
 src/pages/panel/index.vue | 19 +++++++++++-----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/pages/clock/index.vue b/src/pages/clock/index.vue
index 18d08c7..37b79ed 100644
--- a/src/pages/clock/index.vue
+++ b/src/pages/clock/index.vue
@@ -1,8 +1,15 @@
 <template>
 	<view class="clock_main">
+
 		<view class="map_nav">
 			<map style="width: 100%; height: 100%;" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
 			<view class="popup">
+        <view class="state_nav">
+          <view class="state_nav_item">
+            <view class="state_icon"></view>
+            <view class="state_txt">打卡区间：今日5:00至明日5:00为今日考勤</view>
+          </view>
+        </view>
 				<view class="tle">我的位置</view>
 				<view class="curAdres">{{curAdres}}</view>
 				<view class="tle" style="margin-top: 40rpx;">备注（选填）</view>
@@ -44,7 +51,7 @@
 			}
 		},
 		onLoad() {
-			
+
 		},
 		onHide() {
 			clearInterval(this.timer)
@@ -75,7 +82,7 @@
 					}
 				})
 			},
-			
+
 			initBmap() {
 				var fail = (err) => {
 					if (err.errMsg == 'getLocation:fail auth deny') {
@@ -100,7 +107,7 @@
 						});
 					}
 				}
-				
+
 				var success = (res) => {
 					this.curAdres = res.originalData.result.formatted_address_poi
 					if(res.originalData.status == 0) {
@@ -136,7 +143,7 @@
 					success: success
 				});
 			},
-			
+
 			// 向用户订阅服务通知
 			requestSubscribeMessage() {
 				wx.requestSubscribeMessage({
@@ -201,7 +208,7 @@
 				// })
 				console.log("remark",this.remark);
 				uni.redirectTo({
-					
+
 					url: '/pages/clock/detail?attLon=' + this.longitude + '&attLat=' + this.latitude + '&remark=' + this.remark
 				})
 			}
@@ -284,4 +291,32 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+
+
+  .state_nav {
+    width: 100%;
+    background: rgba(15, 39, 75, 0.05);
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    margin-top: 30rpx;
+
+    .state_nav_item {
+      display: flex;
+      align-items: center;
+      padding: 20rpx;
+      box-sizing: border-box;
+
+      .state_icon {
+        width: 12rpx;
+        height: 12rpx;
+        background: #3370FF;
+        border-radius: 50%;
+      }
+
+      .state_txt {
+        font-size: 28rpx;
+        color: #0F274B;
+        margin-left: 20rpx;
+      }
+    }
+  }
+</style>
diff --git a/src/pages/panel/index.vue b/src/pages/panel/index.vue
index c6b6109..2c58fb6 100644
--- a/src/pages/panel/index.vue
+++ b/src/pages/panel/index.vue
@@ -7,6 +7,13 @@
 			</view>
 		</view>
 
+    <view class="state_nav">
+      <view class="state_nav_item">
+        <view class="state_icon"></view>
+        <view class="state_txt">打卡区间：今日5:00至明日5:00为今日考勤</view>
+      </view>
+    </view>
+
 		<view class="state_nav" v-if="optionsData.length > 0">
 			<view class="state_nav_item">
 				<view class="state_icon"></view>
@@ -39,15 +46,15 @@
 							:style="{color: row.attTypeTxt?'#3370FF':row.isOutsideAtt == '1'? '#FF883C':row.isOutsideAtt == '0'? '#333333':'#3370FF'}">
 							{{row.attTypeTxt?row.attTypeTxt:row.isOutsideAtt == '1'?'外勤':row.isOutsideAtt == '0'?'已打卡':'正常'}}
 						</view> -->
-						
+
 						<view class="info"
 							:style="{color: row.attTypeTxt?'#3370FF':'#3370FF'}">
 							{{row.attTypeTxt?row.attTypeTxt:''}}
 							{{ row.isOutsideAtt == '1'?'外勤':row.isOutsideAtt == '0'?'已打卡':'正常'}}
 						</view>
-						
-						
-						
+
+
+
 						<view class="info">{{ row.attAddress }}</view>
 					</view>
 				</template>
@@ -146,7 +153,7 @@
 						this.optionsData = res.obj.wechatClocklist
 						if (this.optionsData.length > 0) {
 							this.optionsData[0].attTypeTxt = '上班'
-							
+
 							if (this.optionsData.length >= 2) {
 								this.optionsData[this.optionsData.length - 1].attTypeTxt = '下班'
 							}
@@ -320,4 +327,4 @@
 			margin-bottom: 16rpx;
 		}
 	}
-</style>
\ No newline at end of file
+</style>