diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index cf71e4b..7bf632c 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -73,39 +73,33 @@
                   v-for="(v,k) in tableList"
                   :key="k"
             >
-              <view class="left">
+              <view class="left" @click="openInfo(v)">
                 <view class="content">普通考勤</view>
                 <view class="content">
                   {{v.status_name}}
                 </view>
                 <view class="content">
-                  校区：{{v.campus_id_name}}
+                  校区：{{v.campus_id_name || ''}}
                 </view>
                 <view class="content">
                   备注：{{v.remarks || ''}}
                 </view>
                 <view class="content">
-                  <text>{{v.attendance_date}} {{v.check_in_time}}</text>
-                  <text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
-                  <text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
+                  <view class="item" v-if="v.status != 'leave'">
+                    <!--考勤-->
+                    <text>开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }}</text>
+                    <text v-if="v.check_out_time">结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }}</text>
+                  </view>
+
+                  <!--请假-->
+                  <view class="item" v-else>
+                    <text>开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}}</text>
+                    <text>结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}}</text>
+                  </view>
                 </view>
               </view>
               <view class="right">
-                <view class="content">普通考勤</view>
-                <view class="content">
-                  {{v.status_name}}
-                </view>
-                <view class="content">
-                  校区：{{v.campus_id_name}}
-                </view>
-                <view class="content">
-                  备注：{{v.remarks || ''}}
-                </view>
-                <view class="content">
-                  <text>{{v.attendance_date}} {{v.check_in_time}}</text>
-                  <text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
-                  <text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
-                </view>
+                <view v-if="v.status == 'present' && !v.check_out_time" class="btn" style="background-color: #00b0f0;" @click="openSignInShow('sign_out',v)">签退</view>
               </view>
             </view>
           </view>
@@ -125,39 +119,33 @@
                   v-for="(v,k) in tableList"
                   :key="k"
             >
-              <view class="left">
+              <view class="left" @click="openInfo(v)">
                 <view class="content">普通考勤</view>
                 <view class="content">
                   {{v.status_name}}
                 </view>
                 <view class="content">
-                  校区：{{v.campus_id_name}}
+                  校区：{{v.campus_id_name || ''}}
                 </view>
                 <view class="content">
                   备注：{{v.remarks || ''}}
                 </view>
                 <view class="content">
-                  <text>{{v.attendance_date}} {{v.check_in_time}}</text>
-                  <text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
-                  <text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
+                  <view class="item" v-if="v.status != 'leave'">
+                    <!--考勤-->
+                    <text>开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }}</text>
+                    <text v-if="v.check_out_time">结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }}</text>
+                  </view>
+
+                  <!--请假-->
+                  <view class="item" v-else>
+                    <text>开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}}</text>
+                    <text>结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}}</text>
+                  </view>
                 </view>
               </view>
               <view class="right">
-                <view class="content">普通考勤</view>
-                <view class="content">
-                  {{v.status_name}}
-                </view>
-                <view class="content">
-                  校区：{{v.campus_id_name}}
-                </view>
-                <view class="content">
-                  备注：{{v.remarks || ''}}
-                </view>
-                <view class="content">
-                  <text>{{v.attendance_date}} {{v.check_in_time}}</text>
-                  <text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
-                  <text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
-                </view>
+                <view v-if="v.status == 'present' && !v.check_out_time" class="btn" style="background-color: #00b0f0;" @click="openSignInShow('sign_out',v)">签退</view>
               </view>
             </view>
           </view>