From 285d1999cd736e01595214e95752230ddf3ff0a4 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Tue, 27 May 2025 18:03:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(my=5Fattendance):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-动态显示考勤状态、日期、校区名称和备注信息
- 增加签到和签退时间的显示逻辑
-优化地图样式
- 调整列表项样式，增加最小宽度和换行显示
---
 pages/common/my_attendance.vue | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index eb23fd0..dcc2626 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -211,19 +211,26 @@
       <view class="info_ul">
         <view class="li">
           <view class="title">考勤状态：</view>
-          <view class="content">请假</view>
+          <view class="content">{{info_data.status_name}}</view>
         </view>
         <view class="li">
           <view class="title">考勤日期：</view>
-          <view class="content">请假</view>
+          <view class="content">
+            <text style="padding: 0;">{{info_data.attendance_date}}</text>
+            <text v-if="info_data.status == 'present'">{{info_data.check_in_time}}</text>
+            <text v-if="info_data.status == 'present' && (info_data.check_out_time || '')">-</text>
+            <text v-if="info_data.status == 'present' && (info_data.check_out_time || '')">{{info_data.check_out_time || ''}}</text>
+
+            <text v-if="info_data.status == 'present' && !(info_data.check_out_time || '')">(未签退)</text>
+          </view>
         </view>
         <view class="li">
           <view class="title">校区名称：</view>
-          <view class="content">请假</view>
+          <view class="content">{{info_data.campus_id_name || ''}}</view>
         </view>
         <view class="li">
           <view class="title">备注：</view>
-          <view class="content">请假</view>
+          <view class="content">{{info_data.remarks || ''}}</view>
         </view>
         <view class="map_section" v-if="info_data.id && info_data.latitude">
           <view class="title">地图：</view>
@@ -915,10 +922,15 @@ export default {
   gap: 20rpx;
   width: 100%;
   .li{
-    border: 1px solid red;
     display: flex;
     .title{
-      width: 130rpx;
+      min-width: 140rpx;
+    }
+    .content{
+      word-break: break-all;
+      text{
+        padding:0 10rpx;
+      }
     }
   }
   .map_section{
@@ -928,8 +940,8 @@ export default {
       width: 130rpx;
     }
     .map{
+      border: 1px solid #8b8b8b;
       margin-top: 10rpx;
-      border: 1px solid red;
       width: 100%;
     }
   }