From 70172e2a98ca0a3b85007b07a1c684c02439f17c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 30 Mar 2023 17:26:33 +0800
Subject: [PATCH] bug

---
 .../app/AppIntegratingTask/components/Detail.vue   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingTask/components/Detail.vue b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
index 8c993543..14034b67 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
@@ -4,7 +4,6 @@
       <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
     </template>
     <template slot="content">
-      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
       <ai-card title="基本信息" v-if="currIndex === 0">
         <template #content>
           <ai-wrapper>
@@ -34,7 +33,7 @@
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card title="打卡记录" v-if="currIndex === 1 && info.type === '0'">
+      <ai-card title="打卡记录" v-if="info.type === '0'">
         <template #content>
           <ai-wrapper>
             <ai-info-item label="参与人数" :value="search1.total"></ai-info-item>
@@ -49,7 +48,7 @@
           </ai-table>
         </template>
       </ai-card>
-      <ai-card title="报名记录" v-if="currIndex === 1 && info.type === '1'">
+      <ai-card title="报名记录" v-if="info.type === '1'">
         <template #content>
           <ai-wrapper>
             <ai-info-item label="参与人数" :value="search1.total"></ai-info-item>
@@ -83,7 +82,6 @@
         info: {},
         mapDetail: null,
         map: null,
-        currIndex: 0,
         search1: {
           total: 0,
           current: 1,
@@ -94,15 +92,15 @@
           {prop: 'realName', label: '姓名', align: 'center' },
           {prop: 'phone', label: '联系方式', align: 'center' },
           {prop: 'areaName', label: '所属地区', align: 'center' },
-          {prop: 'clockTime', label: '打卡时间', align: 'center' }
+          {prop: 'intoClockTime', label: '进场打卡时间', align: 'center' },
+          {prop: 'exitClockTime', label: '离场打卡时间', align: 'center' }
         ],
         colConfigs2: [
           {prop: 'realName', label: '姓名', align: 'center' },
           {prop: 'phone', label: '联系方式', align: 'center' },
           {prop: 'areaName', label: '所属地区', align: 'center' },
-          {prop: 'clockTime', label: '报名时间', align: 'center' }
-        ],
-        tabList: ['基本信息', '参与任务情况']
+          {prop: 'enrollClockTime', label: '报名时间', align: 'center' }
+        ]
       }
     },