diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 378aca3d..eb47711a 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -2,33 +2,44 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="状态">
+        <el-form-item label="活动发布状态：">
           <el-select v-model="dataForm.actStatus" placeholder="状态" clearable>
             <el-option label="上架" :value="1"></el-option>
             <el-option label="下架" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间"
-                      prop="startTime">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
+        <el-form-item label="活动标题：">
+          <el-input v-model="dataForm.title"></el-input>
         </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
-                      prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+        <el-form-item label="活动创建时间："
+                      prop="startTime">
+<!--          <el-date-picker v-model="dataForm.startTime"-->
+<!--                          type="date"-->
+<!--                          :picker-options="pickerBeginDateBefore"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          placeholder="选择日期时间">-->
+<!--          </el-date-picker>-->
+          <el-date-picker  @change='setRegistTime'
+                  v-model="time"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
+<!--        <el-form-item label="至"-->
+<!--                      label-width="25px"-->
+<!--                      prop="endTime">-->
+<!--          <el-date-picker v-model="dataForm.endTime"-->
+<!--                          type="date"-->
+<!--                          :picker-options="pickerBeginDateAfter"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          placeholder="选择日期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -101,8 +112,10 @@ export default {
       dataForm: {
         actStatus: '',
         startTime: '',
-        endTime: ''
+        endTime: '',
+        title:'', //新增活动标题查询
       },
+        time:[],
       addOrUpdateVisible: false,
       actInfoDetailVisible: false,
       actUserRelationVisible: false,
@@ -172,7 +185,17 @@ export default {
           this.$refs.actinfoCancel.init()
         })
       }
-    }
+    },
+    setRegistTime () { //时间处理
+          if (null == this.time){
+              this.dataForm.startTime = ''
+              this.dataForm.endTime = ''
+          }else {
+              console.log(this.time[0])
+              this.dataForm.startTime = this.time[0]
+              this.dataForm.endTime = this.time[1]
+          }
+      },
   }
 }
 </script>
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index c5ea0221..988a7341 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -149,7 +149,8 @@ export default {
         status:'',
       },
       previewImgList: [],
-      isAble: false
+      isAble: false,
+      ifTime:false,
     }
   },
   mounted () {
@@ -299,6 +300,8 @@ export default {
           this.getDataList()
         })
         .catch(() => {})
+      //判断该活动是否结束
+      this.activityEndNo();
     },
     capacity (data) {
       if (data.radius > 0 && data.radius <= 25) {
@@ -338,6 +341,9 @@ export default {
           if (this.dataList == undefined || this.dataList.length <= 0){
             return this.$message.error('请先确认打卡信息')
           }
+          if (!this.ifTime){
+            return this.$message.error('请活动结束之后再来增加积分！！！')
+          }
           if (this.dataForm.failureReason.length > 100) {
             return this.$message.error('处理意见不超过100字')
           }
@@ -368,7 +374,20 @@ export default {
       },
       1000,
       { leading: true, trailing: false }
-    )
+    ),
+    //判断活动是否结束的方法
+    activityEndNo(){
+      this.$http.get(`/heart/actinfo/ifTime/${this.dataForm.actId}`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        let a = res.data;
+        if (a === "1"){
+          this.ifTime = true;
+        }
+      })
+    }
   }
 }
 </script>