diff --git a/project/fengdu/app/AppIntegratingTask/components/Detail.vue b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
index 4d5c2db7..5534e229 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
@@ -4,7 +4,8 @@
       <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
     </template>
     <template slot="content">
-      <ai-card title="基本信息">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <ai-card title="基本信息" v-if="currIndex === 0">
         <template #content>
           <ai-wrapper>
             <ai-info-item label="活动名称" :value="info.title"></ai-info-item>
@@ -33,6 +34,36 @@
           </ai-wrapper>
         </template>
       </ai-card>
+      <ai-card title="打卡记录" v-if="currIndex === 1 && info.type === '0'">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="参与人数" :value="search1.total"></ai-info-item>
+          </ai-wrapper>
+          <ai-table
+            :tableData="tableData1"
+            :col-configs="colConfigs1"
+            :total="search1.total"
+            :current.sync="search1.current"
+            :size.sync="search1.size"
+            @getList="getList1">
+          </ai-table>
+        </template>
+      </ai-card>
+      <ai-card title="报名记录" v-if="currIndex === 1 && info.type === '1'">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="参与人数" :value="search1.total"></ai-info-item>
+          </ai-wrapper>
+          <ai-table
+            :tableData="tableData1"
+            :col-configs="colConfigs2"
+            :total="search1.total"
+            :current.sync="search1.current"
+            :size.sync="search1.size"
+            @getList="getList1">
+          </ai-table>
+        </template>
+      </ai-card>
     </template>
   </ai-detail>
 </template>
@@ -51,7 +82,27 @@
         id: '',
         info: {},
         mapDetail: null,
-        map: null
+        map: null,
+        currIndex: 0,
+        search1: {
+          total: 0,
+          current: 1,
+          size: 10
+        },
+        tableData1: [],
+        colConfigs1: [
+          {prop: 'realName', label: '姓名', align: 'center' },
+          {prop: 'phone', label: '联系方式', align: 'center' },
+          {prop: 'areaName', label: '所属地区', align: 'center' },
+          {prop: 'clockTime', 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: ['基本信息', '参与任务情况']
       }
     },
 
@@ -60,6 +111,8 @@
       this.$dict.load('tfx_activityStatus').then(() => {
         this.getDetail()
       })
+
+      this.getList1()
     },
 
     methods: {
@@ -70,6 +123,18 @@
         })
       },
 
+      getList1 () {
+        this.instance.post(`/app/appintegraltask/clockList?taskId=${this.params.id}`,null, {
+          params: {
+            ...this.search1,
+          }
+        }).then(res=> {
+          if(res?.data) {
+            this.tableData1 = res.data.records
+            this.search1.total = res.data.total
+          }
+        })
+      },
       getMap(lng,lat,address) {
         AMapLoader.load({
           key: '54a02a43d9828a8f9cd4f26fe281e74e',
diff --git a/project/fengdu/app/AppIntegratingTask/components/List.vue b/project/fengdu/app/AppIntegratingTask/components/List.vue
index 3e887a8c..30c2788e 100644
--- a/project/fengdu/app/AppIntegratingTask/components/List.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/List.vue
@@ -118,7 +118,7 @@
       colConfigs() {
         return [
           { prop: "title", label: "活动名称", align: "left" },
-          { prop: "areaName", label: "活动名称", align: "center" },
+          { prop: "areaName", label: "活动地区", align: "center" },
           { prop: "createUserName", label: "创建人", align: "center" },
           {
             prop: "intoBegintime",
@@ -129,7 +129,7 @@
               {
                 textAlign: 'center'
               },
-              `${row.intoBegintime}至${row.exitEndtime}`)
+              `${row.intoBegintime}至${row.exitEndtime || '-'}`)
             },
           { prop: "status", label: "活动状态", align: "center", dict:"fdIntegralTaskStatus" },
           { slot: "qrcode" },