From e81e9d73a9cc0076cb6cb6b0edeebfd355a8e0bb Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 18 Sep 2020 16:05:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?PC=E7=AB=AF=E3=80=90=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E3=80=91=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E4=BD=9C=E7=94=A8=20=20=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AE=89=E5=AE=81=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/unauthorized.vue | 148 +++++++-----------------
 1 file changed, 43 insertions(+), 105 deletions(-)

diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index 4bf7de3..a762a84 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -4,7 +4,7 @@
     <div class="mod-epdc__user}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -48,45 +48,30 @@
           </el-select>
         </el-form-item>
         <el-form-item label="昵称">
-          <el-input v-model="dataForm.nickname" @keyup.native="btKeyUpnickname"
-                    placeholder="请输入"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="手机号" @keyup.native="btKeyUpmobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model="dataForm.nickname"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
+<!--        <el-form-item label="手机号">-->
+<!--          <el-input v-model="dataForm.mobile"-->
+<!--                    placeholder="请输入"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
         <!-- <div class="block"> -->
-        <br>
-        <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="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
+        <span class="demonstration">注册时间</span>&nbsp;&nbsp;
+        <el-date-picker @change='setRegistTime'
+                        v-model="time"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"></el-date-picker>&nbsp;
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
-                     type="success"
+                     type="primary"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <!-- </div> -->
@@ -96,11 +81,12 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号" header-align="center" align="center" width="50px">
-            <template slot-scope="scope">
-                {{scope.$index+1}}
-            </template>
-        </el-table-column>
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column label="序号"
+                         width="70px" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="myGridName"
                          label="所属网格（街道-社区-网格）"
                          header-align="center"
@@ -109,13 +95,11 @@
         <el-table-column prop="nickname"
                          label="昵称"
                          header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                        ></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
                          align="center"></el-table-column>
+<!--        <el-table-column prop="mobile"-->
+<!--                         label="手机号"-->
+<!--                         header-align="center"-->
+<!--                         align="center"></el-table-column>-->
         <el-table-column prop="realName"
                          label="真实姓名"
                          header-align="center"
@@ -129,19 +113,17 @@
         <el-table-column prop="createdTime"
                          label="加入网格时间"
                          header-align="center"
-                         align="center"
-                         width="180"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="state"
                          label="注册状态"
                          :formatter="formatState"
                          header-align="center"
-                         align="center"
-                         width="120"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="150">
+                         width="100">
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
@@ -187,6 +169,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId:'',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -196,22 +179,6 @@ export default {
         state: '0',
         nickname: ''
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -235,7 +202,6 @@ export default {
         this.options = res.data.options
       })
       .catch(() => { })
-    this.initTime()
   },
   watch: {
     'deptIdList': function (val) {
@@ -243,53 +209,29 @@ export default {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = ''
+      }else
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[0]
+      }else
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[1]
+      }else
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
   methods: {
-    initTime () {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-      this.time = [start, end]
-      let year = start.getFullYear()
-      let month = start.getMonth() + 1
-      if (month < 10) {
-        month = '0' + month
-      }
-      let date = start.getDate()
-      if (date < 10) {
-        date = '0' + date
-      }
-      let startDate = year + '-' + month + '-' + date
-      let yearend = end.getFullYear()
-      let monthend = end.getMonth() + 1
-      if (monthend < 10) {
-        monthend = '0' + monthend
-      }
-      let dateend = end.getDate()
-      if (dateend < 10) {
-        dateend = '0' + dateend
-      }
-      let endDate = yearend + '-' + monthend + '-' + dateend
-      this.dataForm.startTime = startDate
-      this.dataForm.endTime = endDate
-    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -322,6 +264,10 @@ export default {
         }).catch(() => { })
       }
     },
+    setRegistTime () {
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {
@@ -374,15 +320,7 @@ export default {
         this.$refs.userDetail.dataForm.id = userId
         this.$refs.userDetail.init()
       })
-    },
-    btKeyUpnickname(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.nickname = e.target.value
-    },
-    btKeyUpmobile(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
+    }
   },
   components: {
     AddOrUpdate,

From d4390d7997338fbea5b7559283f582601a9b47b1 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 21 Sep 2020 11:17:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=B3=B8=E5=B7=9E?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actbanner.vue         | 45 +++-------
 src/views/modules/heart/actclockpic.vue       |  4 +-
 .../modules/heart/actinfo-add-or-update.vue   | 37 +-------
 .../modules/heart/actinfo-detail-view.vue     | 30 +++----
 src/views/modules/heart/actinfo-list.vue      | 69 ++++++---------
 .../modules/heart/actphrase-add-or-update.vue | 29 +++---
 src/views/modules/heart/actphrase.vue         | 40 ++++-----
 .../modules/heart/actuserclock-detail.vue     | 64 ++++----------
 src/views/modules/heart/actuserclocklog.vue   | 86 ++++++------------
 src/views/modules/heart/actuserlog.vue        |  4 +-
 src/views/modules/heart/actuserrelation.vue   | 88 +++++++------------
 src/views/modules/heart/map-select.vue        |  5 --
 src/views/modules/heart/volunteerrank.vue     |  4 +-
 13 files changed, 166 insertions(+), 339 deletions(-)

diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
index 34f6843..91f875e 100644
--- a/src/views/modules/heart/actbanner.vue
+++ b/src/views/modules/heart/actbanner.vue
@@ -1,22 +1,21 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actbanner}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="状态">
           <el-select v-model="dataForm.status" 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="时间"
+        <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="选择日期时间"
-                          @change="changeTime">
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -27,23 +26,21 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          @change="changeTime">
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="title" label="标题" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
-        <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center" width="100"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-
+        <el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="标题" min-width="400" show-overflow-tooltip header-align="center" align="left"></el-table-column>
+        <el-table-column prop="status" label="状态" width="70" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="statusTime" label="上下架时间" width="180" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数量" width="80" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" width="180" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="85">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
           </template>
@@ -82,23 +79,7 @@ export default {
         status: '',
         startTime: '',
         endTime: ''
-      },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime;
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-          }
-        },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime;
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-     },
+      }
     }
   },
   components: {
diff --git a/src/views/modules/heart/actclockpic.vue b/src/views/modules/heart/actclockpic.vue
index 7533f89..0ff9585 100644
--- a/src/views/modules/heart/actclockpic.vue
+++ b/src/views/modules/heart/actclockpic.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actclockpic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:actclockpic:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index d1ae343..89ac9f2 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -57,7 +57,6 @@
                         prop="signupEndTime">
             <el-date-picker v-model="dataForm.signupEndTime"
                             type="datetime"
-                            popper-class="date_picker"
                             value-format="yyyy-MM-dd HH:mm"
                             format="yyyy-MM-dd HH:mm"
                             :picker-options="isSignupEndTime"
@@ -196,16 +195,14 @@
                         prop="contacts">
             <el-input v-model="dataForm.contacts"
                       maxlength="5"
-                      placeholder="请输入联系人"
                       style="width:150px"></el-input>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item label="联系电话："
-                        prop="tel" >
+                        prop="tel">
             <el-input v-model="dataForm.tel"
                       maxlength="20"
-                      placeholder="请输入联系电话"
                       style="width:200px"></el-input>
           </el-form-item>
         </el-row>
@@ -249,7 +246,7 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <div style="width:700px">
+            <div style="width:1000px">
               <!-- 富文本编辑器, 容器 -->
               <div id="J_quillEditor" class="ql-editor"></div>
               <!-- 自定义上传图片功能 (使用element upload组件) -->
@@ -298,7 +295,7 @@
             </el-upload>
           </el-form-item>
         </el-row>
-        <el-row style="text-align:center">
+        <el-row>
           <el-form-item label-width="500px">
             <el-button type="primary"
                        :disabled="isAble"
@@ -359,8 +356,7 @@ export default {
       },
       isSignupEndTime: {
         disabledDate (time) {
-          // return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
-          return time < Date.now()
+          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
         }
       },
       isImgRequired: true,
@@ -413,26 +409,6 @@ export default {
     }
   },
   created () {
-    // 初始化报名截止时间
-    var signupEndTimeDate = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
-    var year = signupEndTimeDate.getFullYear().toString()
-    var month = (signupEndTimeDate.getMonth() + 1).toString()
-    if (month < 10) {
-      month = '0' + month
-    }
-    var day = signupEndTimeDate.getDate().toString()
-    if (day < 10) {
-      day = '0' + day
-    }
-    var hours = signupEndTimeDate.getHours().toString()
-    if (hours < 10) {
-      hours = '0' + hours
-    }
-    var minutes = signupEndTimeDate.getMinutes().toString()
-    if (minutes < 10) {
-      minutes = '0' + minutes
-    }
-    this.dataForm.signupEndTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
       .then(({ data: res }) => {
@@ -906,8 +882,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-  .date_picker .el-button--text span {
-    display: none;
-  }
-</style>
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 72bb24f..98b9917 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -131,12 +131,20 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <div style="border:1px solid  #EDEFF0">
-              <p v-html="dataForm.actContent" class="actContent"></p>
-            </div>
+            <p v-html="dataForm.actContent"></p>
           </el-form-item>
         </el-row>
-
+        <!--                <el-row>-->
+        <!--                    <el-form-item label="banner展示："-->
+        <!--                                  prop="isBanner">-->
+        <!--                        <template>-->
+        <!--                            <el-radio v-model="dataForm.isBanner"-->
+        <!--                                      label="1">是</el-radio>-->
+        <!--                            <el-radio v-model="dataForm.isBanner"-->
+        <!--                                      label="0">否</el-radio>-->
+        <!--                        </template>-->
+        <!--                    </el-form-item>-->
+        <!--                </el-row>-->
         <el-row>
           <el-form-item label=" "
                         v-loading="loading"
@@ -148,10 +156,9 @@
         </el-row>
 
         <el-row>
-          <el-form-item style="padding-left:40px;">
+          <el-form-item label-width="500px">
             <el-button size="small"
                        style="width: 95px"
-                       type="primary"
                        @click="back">返回</el-button>
 
           </el-form-item>
@@ -246,14 +253,3 @@ export default {
   }
 }
 </script>
-<style scoped>
-.actContent{
-  padding: 10px;
-}
-.actContent >>>  span{
-  word-break: break-all;
-}
-.actContent >>>  img{
-  width: 98%;
-}
-</style>
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index b112fed..0842a85 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -1,41 +1,36 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="发布状态" label-width="70px">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <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="标题" label-width="70px">
-          <el-input placeholder="活动标题" @keyup.native="btKeyUpTitle" v-model="dataForm.title" clearable></el-input>
-        </el-form-item>
-          <br>
-          <el-form-item label="发布时间" prop="startTime" label-width="70px">
+        <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="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" prop="endTime">
+        <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="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:actinfo:add')" type="primary" @click="addAction()">增加活动</el-button>
@@ -46,14 +41,14 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="title" label="标题" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="actStartTime" label="开始时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="actEndTime" label="结束时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="publishTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="actStatus" label="发布状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="180">
+        <el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="标题" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" width="180" align="center"></el-table-column>
+        <el-table-column prop="actStartTime" label="开始时间" header-align="center" width="180" align="center"></el-table-column>
+        <el-table-column prop="actEndTime" label="结束时间" header-align="center" width="180" align="center"></el-table-column>
+        <el-table-column prop="publishTime" label="发布时间" header-align="center" width="180" align="center"></el-table-column>
+        <el-table-column prop="actStatus" label="发布状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <div>
               <el-button v-if="$hasPermission('heart:actinfo:cancel')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="cancelHandle(scope.row)">取消活动</el-button>
@@ -106,31 +101,29 @@ export default {
       dataForm: {
         actStatus: '',
         startTime: '',
-        endTime: '',
-        title:'', //新增活动标题查询
+        endTime: ''
       },
+      addOrUpdateVisible: false,
+      actInfoDetailVisible: false,
+      actUserRelationVisible: false,
+      actInfoCancelVisible: false,
+      actUserClockLogVisible: false,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
+          let beginDateVal = this.dataForm.startTime
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+            return time.getTime() > new Date(beginDateVal).getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
+          let EndDateVal = this.dataForm.endTime
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+            return time.getTime() < new Date(EndDateVal).getTime()
           }
         }
-      },
-      time:[],
-      addOrUpdateVisible: false,
-      actInfoDetailVisible: false,
-      actUserRelationVisible: false,
-      actInfoCancelVisible: false,
-      actUserClockLogVisible: false
+      }
     }
   },
   components: {
@@ -148,10 +141,6 @@ export default {
       this.$parent.selectComponent = 'ActInfoDetailView'
       this.$router.push({ path: '/heart-actinfo', query: { id: id } })
     },
-    btKeyUpTitle (e) {
-        e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-        this.dataForm.title = e.target.value
-    },
     addAction () {
       this.$parent.selectComponent = 'ActInfoAdd'
       this.$router.push(
diff --git a/src/views/modules/heart/actphrase-add-or-update.vue b/src/views/modules/heart/actphrase-add-or-update.vue
index 31632c7..d08293f 100644
--- a/src/views/modules/heart/actphrase-add-or-update.vue
+++ b/src/views/modules/heart/actphrase-add-or-update.vue
@@ -2,34 +2,31 @@
   <el-dialog :visible.sync="visible"
              :title="!dataForm.id ? $t('add') : $t('update')"
              :close-on-click-modal="false"
-             :close-on-press-escape="false"
-             customClass="customWidth">
+             :close-on-press-escape="false">
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
-      <el-form-item label="常用语"
+      <el-form-item label="常用语 :"
                     prop="phrase">
         <el-input v-model="dataForm.phrase"
                   maxlength="500"
-                  placeholder="请输入常用语"
-                  style="width:95%;"></el-input>
+                  show-word-limit
+                  placeholder="常用语"></el-input>
       </el-form-item>
-      <el-form-item label="编码"
+      <el-form-item label="编码 :"
                     prop="code">
         <el-input type="text"
                   oninput="value=value.replace(/[^0-9.]/g,'')"
                   v-model="dataForm.code"
                   maxlength="20"
-                  placeholder="请输入数字编码"
-                  style="width:95%;"></el-input>
+                  placeholder="输入数字编码"></el-input>
       </el-form-item>
-      <el-form-item label="是否显示"
+      <el-form-item label="是否显示 :"
                     prop="showFlag">
         <el-select v-model="dataForm.showFlag"
-                   placeholder="是否显示"
-                   style="width:40%;">
+                   placeholder="是否显示">
           <el-option v-for="item in showFlagArr"
                      :key="item.dictValue"
                      :label="item.dictName"
@@ -38,12 +35,11 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="sort"
-                    label="显示顺序">
+                    label="显示顺序 :">
         <el-input-number v-model="dataForm.sort"
                          controls-position="right"
                          :min="1"
-                         label="显示顺序"
-                         style="width:40%;"></el-input-number>
+                         label="显示顺序"></el-input-number>
       </el-form-item>
       <!-- <el-form-item prop="usageNum" label="使用次数 :">
         <el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number>
@@ -173,8 +169,3 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-  .customWidth {
-  width:50%
-  }
-</style>
diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index d7a1e2d..9c0bec7 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -4,22 +4,20 @@
     <div class="mod-heart__actphrase}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <!--<el-form-item  label="ID" prop="id">
           <el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
         </el-form-item>-->
-        <el-form-item label="常用语"
+        <el-form-item label="常用语:"
                       prop="phrase">
           <el-input v-model="dataForm.phrase"
                     placeholder="常用语"
-                    @keyup.native="btKeyUpPhrase"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="编码"
                       prop="code">
           <el-input v-model="dataForm.code"
                     placeholder="编码"
-                    @keyup.native="btKeyUpCode"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="是否显示"
@@ -35,7 +33,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
@@ -55,33 +53,37 @@
                          header-align="center"
                          align="center"
                          width="50"></el-table-column>
-        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="phrase"
                          label="常用语"
+                         min-width="400" show-overflow-tooltip
                          header-align="center"
-                         align="center" show-overflow-tooltip title="phrase" min-width="400"></el-table-column>
+                         align="left"></el-table-column>
         <el-table-column prop="code"
                          label="编码"
+                         width="80"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="showFlag"
                          label="是否显示"
+                         width="80"
                          header-align="center"
                          align="center"
-                         :formatter="showFlagFormat" width="120"></el-table-column>
+                         :formatter="showFlagFormat"></el-table-column>
         <el-table-column prop="sort"
                          label="显示顺序"
+                         width="80"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <!-- <el-table-column prop="usageNum" label="使用次数" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="createdTime"
                          label="创建时间"
+                         width="180"
                          header-align="center"
-                         align="center" width="180"></el-table-column>
-        <!-- <el-table-column prop="updatedTime"
-                         label="更新时间"
-                         header-align="center"
-                         align="center" width="180"></el-table-column> -->
+                         align="center"></el-table-column>
+        <!--<el-table-column prop="updatedTime"-->
+                         <!--label="更新时间"-->
+                         <!--header-align="center"-->
+                         <!--align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -158,14 +160,6 @@ export default {
         return '是'
       }
     },
-    btKeyUpPhrase (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.phrase = e.target.value
-    },
-    btKeyUpCode (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.code = e.target.value
-    },
     phraseDetailHandle (pheaseId) {
       this.phraseDetailVisible = true
       this.$nextTick(() => {
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index 5beb316..fcead7e 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -2,28 +2,26 @@
   <div class="project-handle" style="background: #ffffff;">
     <div class="project-detail">
       <div v-if="dataForm.oldStatus=='1' || dataForm.oldStatus=='2'">
-        <div class="project-detail-tip">处理操作</div>
+        <div class="project-detail-tip">处理操作 :</div>
         <el-form
           ref="dataForm"
           :model="dataForm"
           :rules="dataRule"
-          style="width:100%"
           @keyup.enter.native="dataFormSubmitHandle()"
         >
-          <el-form-item label="是否加积分 :" prop="ratiod">
-            <el-radio v-model="dataForm.ratiod" label="5">确认加积分</el-radio>
-            <el-radio v-model="dataForm.ratiod" label="6">拒绝加积分</el-radio>
+          <el-form-item label="是否加积分 :" prop="status">
+            <el-radio v-model="dataForm.status" label="5">确认加积分</el-radio>
+            <el-radio v-model="dataForm.status" label="6">拒绝加积分</el-radio>
           </el-form-item>
           <el-form-item label="处理意见 :" prop="failureReason">
             <el-input
               :rows="4"
               v-model="dataForm.failureReason"
               type="textarea"
-              style="width: 95% !important"
               placeholder="请写明理由，100字以内"
             ></el-input>
           </el-form-item>
-          <el-form-item style="float: right;padding-right:5%">
+          <el-form-item style="float: right;">
             <el-button
               size="small"
               style="width: 95px"
@@ -65,7 +63,7 @@
         style="width: 100%;"
       >
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="realName" label="报名人" min-width=120 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="sex"
           label="性别"
@@ -74,9 +72,9 @@
           align="center"
         ></el-table-column>
         <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" width=120 header-align="center" align="center"></el-table-column>
-        <el-table-column prop="clockAddress" label="打卡地点" min-width=200 show-overflow-tooltip header-align="center" align="center"></el-table-column>
-        <el-table-column prop="clockDesc" label="打卡描述" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="clockDesc" label="打卡描述" header-align="center" align="center"></el-table-column>
         <el-table-column label="图片" fixed="right" header-align="center" align="center" width="400">
           <template slot-scope="scope">
             <el-image
@@ -140,18 +138,16 @@ export default {
       dataForm: {
         id: '',
         actId: '',
-        ratiod: '',
+        status: '',
         failureReason: '',
         address: '',
         latitude: '',
         longitude: '',
         radius: 200,
-        clockPic: [],
-        status:'',
+        clockPic: []
       },
       previewImgList: [],
-      isAble: false,
-      ifTime:false,
+      isAble: false
     }
   },
   mounted () {
@@ -162,11 +158,11 @@ export default {
   computed: {
     dataRule () {
       return {
-        ratiod: [
+        status: [
           {
             required: true,
             message: this.$t('validate.required'),
-            trigger: 'change'
+            trigger: 'blur'
           }
         ],
         failureReason: [
@@ -283,12 +279,7 @@ export default {
           }
           this.dataForm = {
             ...this.dataForm,
-            ...res.data,
-          }
-          let a = this.dataForm.status //获取积分状态
-          let b = res.data.oldStatus  //获取积分
-          if (a !="5"&& b!="5"){
-            this.dataForm.failureReason = '';
+            ...res.data
           }
           // if (res.data.status != '5' && res.data.status != '6') {
           //   this.dataForm.status = '5';
@@ -301,8 +292,6 @@ export default {
           this.getDataList()
         })
         .catch(() => {})
-      //判断该活动是否结束
-      this.activityEndNo();
     },
     capacity (data) {
       if (data.radius > 0 && data.radius <= 25) {
@@ -338,17 +327,9 @@ export default {
           if (!valid) {
             return false
           }
-          //进行下方打卡详情校验（至少要有一次记录） array == undefined || array.length <= 0
-          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字')
           }
-          this.dataForm.status = this.dataForm.ratiod
           // this.isAble = true
           this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm)
             .then(({ data: res }) => {
@@ -375,20 +356,7 @@ 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>
diff --git a/src/views/modules/heart/actuserclocklog.vue b/src/views/modules/heart/actuserclocklog.vue
index 5506970..f6da42a 100644
--- a/src/views/modules/heart/actuserclocklog.vue
+++ b/src/views/modules/heart/actuserclocklog.vue
@@ -4,13 +4,13 @@
     <div class="mod-heart__actuserclocklog}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-button type="primary"
                      @click="backToActList">返回</el-button>
         </el-form-item>
         <div>
-          <el-form-item label="状态" label-width="68px">
+          <el-form-item label="状态">
             <el-select v-model="dataForm.status"
                        placeholder="状态"
                        clearable>
@@ -27,41 +27,25 @@
           <el-form-item label="姓名">
             <el-input v-model="dataForm.realName"
                       placeholder="请输入"
-                      @keyup.native="btKeyUpUsername"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="手机号">
             <el-input v-model="dataForm.mobile"
                       placeholder="请输入"
-                      @keyup.native="btKeyUpMobile"
                       clearable></el-input>
           </el-form-item>
         </div>
         <div class="block">
-          <el-form-item label="注册时间" prop="startTime" label-width="70px">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
+          <span class="demonstration">注册时间</span>&nbsp;&nbsp;
+          <el-date-picker @change='setRegistTime'
+                          v-model="time"
                           value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>&nbsp;
           <el-form-item>
-            <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
           </el-form-item>
         </div>
       </el-form>
@@ -78,42 +62,42 @@
         <el-table-column prop="realName"
                          label="报名人"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="sex"
                          label="性别"
                          :formatter="formatSex"
                          header-align="center"
-                         align="center" width="50"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="age"
                          label="年龄"
                          header-align="center"
-                         align="center" width="50"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="mobile"
                          label="联系电话"
                          header-align="center"
-                         align="center" width="150"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="clockAddress"
                          label="打卡地点"
                          header-align="center"
-                         align="center" min-width="200" show-overflow-tooltip ></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="clockCount"
                          label="打卡次数"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="status"
                          label="打卡状态"
                          :formatter="formatState"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="checkPoint"
                          :formatter="isCheckPoint"
                          label="是否发放积分"
                          header-align="center"
-                         align="center" width="120"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="point"
                          label="积分"
                          header-align="center"
-                         align="center" width="100"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -162,22 +146,6 @@ export default {
         startTime: '',
         endTime: ''
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
       detailVisible: false,
       time: ''
     }
@@ -192,18 +160,18 @@ export default {
       this.$parent.selectComponent = 'ActInfoList'
       this.$router.push({ path: '/heart-actinfo' })
     },
-    btKeyUpUsername (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.username = e.target.value
-    },
-    btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
     detailHandle (id) {
       this.$parent.selectComponent = 'ActUserClockDetail'
       this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } })
     },
+    setRegistTime () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
     formatState: function (row, column) {
       let state = row.status
       if (state === '0') {
diff --git a/src/views/modules/heart/actuserlog.vue b/src/views/modules/heart/actuserlog.vue
index c1fdaa3..ccf0e21 100644
--- a/src/views/modules/heart/actuserlog.vue
+++ b/src/views/modules/heart/actuserlog.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actuserlog}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:actuserlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
index 6d16462..6606c24 100644
--- a/src/views/modules/heart/actuserrelation.vue
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actuserrelation}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-button type="primary" @click="backToActList">返回</el-button>
         </el-form-item>
         <div>
-          <el-form-item label="状态" label-width="68px">
+          <el-form-item label="状态">
             <el-select v-model="dataForm.status" placeholder="状态" clearable>
               <el-option label="报名" :value="0"></el-option>
               <el-option label="审核通过" :value="1"></el-option>
@@ -16,35 +16,25 @@
             </el-select>
           </el-form-item>
           <el-form-item label="姓名">
-            <el-input v-model="dataForm.realName" @keyup.native="btKeyUpUsername" placeholder="请输入" clearable></el-input>
+            <el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
           </el-form-item>
           <el-form-item label="手机号">
-            <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpMobile" placeholder="请输入" clearable></el-input>
+            <el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
           </el-form-item>
         </div>
         <div class="block">
-          <el-form-item label="注册时间" prop="startTime" label-width="90px">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px" @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px" @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
+          <span class="demonstration">注册时间</span>&nbsp;&nbsp;
+          <el-date-picker
+            @change="setRegistTime"
+            v-model="time"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>&nbsp;
           <el-form-item>
-            <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
           </el-form-item>
         </div>
       </el-form>
@@ -56,19 +46,18 @@
         style="width: 100%;"
       >
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="realName" label="报名人" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="sex"
           label="性别"
           :formatter="formatSex"
           header-align="center"
           align="center"
-          width='50'
         ></el-table-column>
-        <el-table-column prop="age" label="年龄" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center" width="200"></el-table-column>
-        <el-table-column prop="signupTime" label="报名时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="signupTime" label="报名时间" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="status"
           label="状态"
@@ -76,8 +65,8 @@
           header-align="center"
           align="center"
         ></el-table-column>
-        <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="failureReason" label="原因" header-align="center" align="center" min-width="200" show-overflow-tooltip ></el-table-column>
+        <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="failureReason" label="原因" header-align="center" align="center"></el-table-column>
         <el-table-column
           :label="$t('handle')"
           fixed="right"
@@ -133,6 +122,7 @@ export default {
         deleteURL: '/heart/actuserrelation',
         deleteIsBatch: true
       },
+
       dataForm: {
         id: '',
         actId: '',
@@ -141,22 +131,6 @@ export default {
         realName: '',
         mobile: ''
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
       time: '',
       addOrUpdateVisible: false,
       detailVisible: false
@@ -173,14 +147,6 @@ export default {
       this.$parent.selectComponent = 'ActInfoList'
       this.$router.push({ path: '/heart-actinfo' })
     },
-    btKeyUpUsername (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.username = e.target.value
-    },
-    btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
     detailHandle (id) {
       this.detailVisible = true
       this.$nextTick(() => {
@@ -188,6 +154,14 @@ export default {
         this.$refs.actuserrelationDetail.init()
       })
     },
+    setRegistTime () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
     formatState: function (row, column) {
       let state = row.status
 
diff --git a/src/views/modules/heart/map-select.vue b/src/views/modules/heart/map-select.vue
index 9723ece..6bddc6c 100644
--- a/src/views/modules/heart/map-select.vue
+++ b/src/views/modules/heart/map-select.vue
@@ -123,11 +123,6 @@ export default {
         map: map
       })
       markerList.push(marker)
-      // 初始化mark点击事件
-      that.getAddress(that.dataForm.latitude, that.dataForm.longitude)
-      qq.maps.event.addListener(marker, 'click', function (event) {
-        that.addressCheckHandle()
-      })
       // 添加监听事件   获取鼠标单击事件
       qq.maps.event.addListener(map, 'click', function (event) {
         that.cleanMarkRadius(markerList, radiusList)
diff --git a/src/views/modules/heart/volunteerrank.vue b/src/views/modules/heart/volunteerrank.vue
index 52f1e29..009827b 100644
--- a/src/views/modules/heart/volunteerrank.vue
+++ b/src/views/modules/heart/volunteerrank.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__volunteerrank}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:volunteerrank:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>