diff --git a/project/fengdu/app/AppIntegratingTask/components/Add.vue b/project/fengdu/app/AppIntegratingTask/components/Add.vue
index f8f31201..f7edd201 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Add.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Add.vue
@@ -13,7 +13,7 @@
             <el-form-item label="活动说明" style="width: 100%">
               <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
             </el-form-item>
-            <el-form-item label="活动图片" prop="files" :rules="[{required: true, message: '请上传活动图片', trigger: 'change'}]" style="width: 100%;">
+            <el-form-item label="活动图片" prop="files">
               <ai-uploader
                 :instance="instance"
                 v-model="form.files"
@@ -49,7 +49,7 @@
               </el-input>
             </el-form-item>
 
-            <el-form-item :label="form.type === '0' ? '进场打卡时间' : '进场时间'" prop="intoTime">
+            <el-form-item :label="form.type === '0' ? '进场打卡时间' : '报名时间'" prop="intoTime">
               <el-date-picker  style="width: 100%" v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
               end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker>
             </el-form-item>
@@ -60,7 +60,7 @@
               </el-input>
             </el-form-item>
 
-            <el-form-item :label="form.type === '0' ? '离场打卡时间' : '离场时间'" prop="exitTime">
+            <el-form-item v-if="form.type === '0'" :label="form.type === '0' ? '离场打卡时间' : '离场时间'" prop="exitTime">
               <el-date-picker style="width: 100%" v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
                 end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
diff --git a/project/fengdu/app/AppIntegratingTask/components/Detail.vue b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
index 0c3cdc38..d6c93ff8 100644
--- a/project/fengdu/app/AppIntegratingTask/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/Detail.vue
@@ -19,20 +19,50 @@
             </ai-info-item>
             <ai-info-item label="活动地区" isLine :value="info.areaName"></ai-info-item>
             <ai-info-item label="活动地点" :value="info.address"></ai-info-item>
-            <ai-info-item label="标绘地址" isLine><div id="mapDetail"></div></ai-info-item>
+            <ai-info-item label="地图位置" isLine><div id="mapDetail"></div></ai-info-item>
             <ai-info-item label="积分类型" isLine :value="info.type === '0' ? '打卡得积分' : '报名得积分'"></ai-info-item>
             <ai-info-item label="活动状态">
-              {{ dict.getLabel('tfx_activityStatus',info.status) }}
+              {{ dict.getLabel('fdIntegralTaskStatus',info.status) }}
             </ai-info-item>
-            <ai-info-item label="打卡范围">{{ info.clockRange }}米</ai-info-item>
-            <ai-info-item :label="info.type === '0' ? '进场打卡时间' : '进场时间'">{{ info.intoBegintime }}至{{ info.intoEndtime}}</ai-info-item>
-            <ai-info-item v-if="info.type === '0'" label="进场得积分">{{ info.intoIntegral }}分</ai-info-item>
-            <ai-info-item :label="info.type === '0' ? '离场打卡时间' : '离场时间'">{{ info.exitBegintime }}至{{ info.exitEndtime}}</ai-info-item>
-            <ai-info-item v-if="info.type === '0'" label="离场得积分">{{ info.exitIntegral }}分</ai-info-item>
-            <ai-info-item v-if="info.type === '1'" label="报名得积分">{{ info.enrollIntegral }}分</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" label="打卡范围">{{ info.clockRange }}米</ai-info-item>
+            <ai-info-item :label="info.type === '0' ? '进场打卡时间' : '报名时间'">{{ info.intoBegintime }}至{{ info.intoEndtime}}</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" label="进场得积分">{{ info.intoIntegral || 0 }}分</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" :label="info.type === '0' ? '离场打卡时间' : '离场时间'">{{ info.exitBegintime }}至{{ info.exitEndtime}}</ai-info-item>
+            <ai-info-item v-if="info.type === '0'" label="离场得积分">{{ info.exitIntegral || 0 }}分</ai-info-item>
+            <ai-info-item v-if="info.type === '1'" label="报名得积分">{{ info.enrollIntegral || 0 }}分</ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
+      <ai-card title="打卡记录" v-if="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="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 +81,26 @@
         id: '',
         info: {},
         mapDetail: null,
-        map: null
+        map: null,
+        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: '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: 'enrollClockTime', label: '报名时间', align: 'center' }
+        ]
       }
     },
 
@@ -60,6 +109,8 @@
       this.$dict.load('tfx_activityStatus').then(() => {
         this.getDetail()
       })
+
+      this.getList1()
     },
 
     methods: {
@@ -70,6 +121,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 de85698c..bb9e69dc 100644
--- a/project/fengdu/app/AppIntegratingTask/components/List.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/List.vue
@@ -11,9 +11,43 @@
       @change="search.current = 1, getList()">
     </ai-title>
     <template #content>
-      <ai-search-bar>
+      <ai-search-bar bottomBorder>
         <template #left>
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >创建活动</el-button>
+          <el-date-picker
+            v-model="search.beginDate"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <el-date-picker
+            v-model="search.endDate"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="活动状态"
+            :selectList="dict.getDict('fdIntegralTaskStatus')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            size="small"
+            placeholder="活动名称/创建人"
+            clearable
+            v-throttle="() => {getList()}"
+            @clear="search.title = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
         </template>
       </ai-search-bar>
       <ai-table
@@ -31,12 +65,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column slot="options" label="操作" fixed="right" align="center" width="140px">
+        <el-table-column slot="options" label="操作" fixed="right" align="center" width="120px">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click.native="toDetail(row.id)">详情</el-button>
               <el-button type="text" :disabled="row.status ==2" @click.native="stopBtn(row.id)">结束</el-button>
-              <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
+              <!-- <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button> -->
             </div>
           </template>
         </el-table-column>
@@ -61,7 +95,11 @@
           current: 1,
           size: 10,
           total: 0,
-          areaId: ''
+          title: '',
+          areaId: '',
+          status: '',
+          beginDate: '',
+          endDate: ''
         },
         tableData: [],
         img: '',
@@ -79,7 +117,8 @@
     computed: {
       colConfigs() {
         return [
-          { prop: "title", label: "活动名称", align: "left", showOverflowTooltip: true },
+          { prop: "title", label: "活动名称", align: "left" },
+          { prop: "areaName", label: "活动地区", align: "center" },
           { prop: "createUserName", label: "创建人", align: "center" },
           {
             prop: "intoBegintime",
@@ -90,7 +129,7 @@
               {
                 textAlign: 'center'
               },
-              `${row.intoBegintime}至${row.exitEndtime}`)
+              row.exitEndtime ? `${row.intoBegintime}至${row.exitEndtime}` : row.intoBegintime)
             },
           { prop: "status", label: "活动状态", align: "center", dict:"fdIntegralTaskStatus" },
           { slot: "qrcode" },