diff --git a/src/views/modules/heart/actbanner-add-or-update.vue b/src/views/modules/heart/actbanner-add-or-update.vue
new file mode 100644
index 0000000..403a20e
--- /dev/null
+++ b/src/views/modules/heart/actbanner-add-or-update.vue
@@ -0,0 +1,187 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="活动ID" prop="actId">
+          <el-input v-model="dataForm.actId" placeholder="活动ID"></el-input>
+      </el-form-item>
+          <el-form-item label="标题" prop="title">
+          <el-input v-model="dataForm.title" placeholder="标题"></el-input>
+      </el-form-item>
+          <el-form-item label="banner图片" prop="bannerImg">
+          <el-input v-model="dataForm.bannerImg" placeholder="banner图片"></el-input>
+      </el-form-item>
+          <el-form-item label="banner类型 0-活动，1-连接" prop="bannerType">
+          <el-input v-model="dataForm.bannerType" placeholder="banner类型 0-活动，1-连接"></el-input>
+      </el-form-item>
+          <el-form-item label="连接地址" prop="url">
+          <el-input v-model="dataForm.url" placeholder="连接地址"></el-input>
+      </el-form-item>
+          <el-form-item label="上下架状态 0-下架，1-上架" prop="statue">
+          <el-input v-model="dataForm.statue" placeholder="上下架状态 0-下架，1-上架"></el-input>
+      </el-form-item>
+          <el-form-item label="上下架时间" prop="statueTime">
+          <el-input v-model="dataForm.statueTime" placeholder="上下架时间"></el-input>
+      </el-form-item>
+          <el-form-item label="banner位置 0-顶部" prop="bannerPosition">
+          <el-input v-model="dataForm.bannerPosition" placeholder="banner位置 0-顶部"></el-input>
+      </el-form-item>
+          <el-form-item label="浏览数量" prop="browseNum">
+          <el-input v-model="dataForm.browseNum" placeholder="浏览数量"></el-input>
+      </el-form-item>
+          <el-form-item label="创建部门ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="创建部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0-否，1-是" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0-否，1-是"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        actId: '',
+        title: '',
+        bannerImg: '',
+        bannerType: '',
+        url: '',
+        statue: '',
+        statueTime: '',
+        bannerPosition: '',
+        browseNum: '',
+        deptId: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        actId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bannerImg: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bannerType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        url: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        statue: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        statueTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bannerPosition: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        browseNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actbanner/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actbanner/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
new file mode 100644
index 0000000..408c2e6
--- /dev/null
+++ b/src/views/modules/heart/actbanner.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__actbanner}">
+      <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="时间"
+                      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>
+        <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>
+      </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"></el-table-column>
+        <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" 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">
+            <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actbanner-add-or-update'
+import {debounce} from 'lodash'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actbanner/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actbanner',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        status: '',
+        startTime: '',
+        endTime: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    changeGroundingText(status){
+      let state = status
+      if (state === '1') {
+        return '下架'
+      } else if (state === '0') {
+        return '上架'
+      }
+    },
+    formatState: function (row, column) {
+      let state = row.status
+      if (state === '1') {
+        return '上架'
+      } else if (state === '0') {
+        return '下架'
+      }
+    },
+
+    changeGroundingHandle: debounce(function (row) {
+
+      this.$confirm(this.$t('prompt.info', { 'handle': this.changeGroundingText(row.status) }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.get(`/heart/actbanner/grounding/${row.id}`).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.getDataList()
+            }
+          })
+        }).catch(() => {})
+      }).catch(() => {})
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actclockpic-add-or-update.vue b/src/views/modules/heart/actclockpic-add-or-update.vue
new file mode 100644
index 0000000..317b396
--- /dev/null
+++ b/src/views/modules/heart/actclockpic-add-or-update.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="打卡ID" prop="clockId">
+          <el-input v-model="dataForm.clockId" placeholder="打卡ID"></el-input>
+      </el-form-item>
+          <el-form-item label="图片地址" prop="clockPic">
+          <el-input v-model="dataForm.clockPic" placeholder="图片地址"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        clockId: '',
+        clockPic: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        clockId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockPic: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actclockpic/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actclockpic/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actclockpic.vue b/src/views/modules/heart/actclockpic.vue
new file mode 100644
index 0000000..0ff9585
--- /dev/null
+++ b/src/views/modules/heart/actclockpic.vue
@@ -0,0 +1,72 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__actclockpic}">
+      <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 @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>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:actclockpic:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="clockId" label="打卡ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="clockPic" label="图片地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" 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" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('heart:actclockpic:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('heart:actclockpic:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actclockpic-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actclockpic/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actclockpic',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
new file mode 100644
index 0000000..89ac9f2
--- /dev/null
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -0,0 +1,884 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__news}">
+      <el-form :inline="true"
+               :rules="dataRule"
+               :model="dataForm"
+               ref="dataForm"
+               :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+        <el-row>
+          <el-form-item label="活动头图："
+                        v-loading="loading"
+                        prop="headPic">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarActSuccess"
+                       :on-error="handelError"
+                       :before-upload="beforeAvatarUpload">
+              <img v-if="dataForm.headPic"
+                   :src="dataForm.headPic"
+                   class="avatar">
+              <i v-else
+                 class="el-icon-plus avatar-uploader-icon"></i>
+              <div slot="tip"
+                   class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动标题："
+                        prop="title">
+            <el-input v-model="dataForm.title"
+                      type="text"
+                      maxlength="40"
+                      show-word-limit
+                      placeholder="请输入标题，40字以内"
+                      clearable
+                      style="width:500px">
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="报名要求："
+                        prop="requirement">
+            <el-input v-model="dataForm.requirement"
+                      placeholder="请输入报名要求，200字以内"
+                      type="textarea"
+                      style="width:500px"
+                      maxlength="200"
+                      clearable>
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="报名截止时间："
+                        prop="signupEndTime">
+            <el-date-picker v-model="dataForm.signupEndTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm"
+                            format="yyyy-MM-dd HH:mm"
+                            :picker-options="isSignupEndTime"
+                            placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动名额："
+                        prop="actQuota">
+            <template>
+              <el-radio v-model="dataForm.actQuotaCategory"
+                        label="1">固定名额</el-radio>&emsp;&emsp;
+              <el-input-number v-enter-number
+                               type="number"
+                               :min="1"
+                               v-model="dataForm.actQuota"
+                               placeholder="固定名额"
+                               style="width:150px"></el-input-number>&emsp; 人&emsp;&emsp;
+              <el-radio v-model="dataForm.actQuotaCategory"
+                        label="0">不限名额</el-radio>
+            </template>
+            <div>
+              <font color="gray">报名未审核人员：</font>
+              <font color="gray">活动已开始，未审核报名人员，可设置默认状态是否通过</font>
+            </div>
+            <div>
+              <el-radio v-model="dataForm.actUserDefaultState"
+                        label="1">通过</el-radio>
+              <el-radio v-model="dataForm.actUserDefaultState"
+                        label="4">不通过</el-radio>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动时间："
+                        prop="actStartTime">
+            <el-date-picker v-model="dataForm.actStartTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm"
+                            format="yyyy-MM-dd HH:mm"
+                            @change="dateChangeTime"
+                            placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="至"
+                        label-width="40px"
+                        prop="actEndTime">
+            <el-date-picker v-model="dataForm.actEndTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm"
+                            format="yyyy-MM-dd HH:mm"
+                            placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <div>
+            <el-form-item label="打卡范围时间："
+                          prop="signinStartTime">
+              <el-date-picker v-model="dataForm.signinStartTime"
+                              :disabled="signInIsAble"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="选择日期时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="至"
+                          label-width="40px"
+                          prop="signinEndTime">
+              <el-date-picker v-model="dataForm.signinEndTime"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="选择日期时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label=" ">
+              <div>
+                <font color="gray">默认活动开始（不可编辑时间）至活动结束一小时后，可修改时间范围，必须早于开始时间，晚于结束时间</font>
+              </div>
+            </el-form-item>
+          </div>
+        </el-row>
+
+        <el-row>
+          <el-form-item label="活动地点："
+                        prop="actAddress">
+            <el-input v-model="dataForm.actAddress"
+                      :disabled="signInIsAble"
+                      type="text"
+                      clearable
+                      style="width:400px">
+            </el-input>&emsp;
+            <el-button type="primary"
+                       @click="mapSelectHandle(1)">地图选择</el-button>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="打卡地点："
+                        prop="signinAddress">
+            <el-input v-model="dataForm.signinAddress"
+                      :disabled="signInIsAble"
+                      type="text"
+                      clearable
+                      style="width:400px">
+            </el-input>&emsp;
+            <el-button type="primary"
+                       @click="mapSelectHandle(2)">地图选择</el-button>
+            <div>
+              <font color="gray">打卡地点，默认活动地点，可以修改打卡地点（如集合地点，集体出发等）</font>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="打卡范围："
+                        prop="clockRadius">
+            <div>
+              <el-input-number v-enter-number
+                               type="number"
+                               :min="0"
+                               :max="5000"
+                               v-model="dataForm.clockRadius"
+                               clearable
+                               style="width:150px">
+              </el-input-number>&emsp;米以内
+            </div>
+            <div>
+              <font color="gray">默认已打卡地点200米以内，可修改范围，在范围内打卡签到有效</font>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="联系人："
+                        prop="contacts">
+            <el-input v-model="dataForm.contacts"
+                      maxlength="5"
+                      style="width:150px"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="联系电话："
+                        prop="tel">
+            <el-input v-model="dataForm.tel"
+                      maxlength="20"
+                      style="width:200px"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动主办方："
+                        prop="sponsor">
+            <el-input v-model="dataForm.sponsor"
+                      type="text"
+                      maxlength="30"
+                      show-word-limit
+                      placeholder="请输入主办方，30字以内"
+                      clearable
+                      style="width:500px">
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="奖励积分："
+                        prop="reward">
+            <el-input-number v-enter-number
+                             type="number"
+                             :min="0"
+                             v-model="dataForm.reward"
+                             clearable
+                             style="width:150px">
+            </el-input-number>&emsp;积分
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="惩罚积分："
+                        prop="punishmentPoints">
+            <el-input-number v-enter-number
+                             type="number"
+                             :min="0"
+                             v-model="dataForm.punishmentPoints"
+                             clearable
+                             style="width:150px">
+            </el-input-number>&emsp;积分
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item prop="actContent"
+                        label="活动内容：">
+            <div style="width:1000px">
+              <!-- 富文本编辑器, 容器 -->
+              <div id="J_quillEditor" class="ql-editor"></div>
+              <!-- 自定义上传图片功能 (使用element upload组件) -->
+              <el-upload :action="uploadUrl"
+                         :show-file-list="false"
+                         :before-upload="uploadBeforeUploadHandle"
+                         :on-success="uploadSuccessHandle"
+                         style="display: none;">
+                <el-button ref="uploadBtn"
+                           type="primary"
+                           size="small">{{ $t('upload.button') }}</el-button>
+              </el-upload>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="banner展示："
+                        prop="isBanner">
+            <template>
+              <el-radio v-model="dataForm.isBanner"
+                        label="1"
+                        @change="changeHandler">是</el-radio>
+              <el-radio v-model="dataForm.isBanner"
+                        label="0"
+                        @change="changeHandler">否</el-radio>
+            </template>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label=" "
+                        v-loading="loading"
+                        prop="bannerUrl">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarBannerSuccess"
+                       :on-error="handelError"
+                       :before-upload="beforeAvatarUpload">
+              <img v-if="dataForm.bannerUrl"
+                   :src="dataForm.bannerUrl"
+                   class="avatar">
+              <i v-else
+                 class="el-icon-plus avatar-uploader-icon"></i>
+              <div slot="tip"
+                   class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label-width="500px">
+            <el-button type="primary"
+                       :disabled="isAble"
+                       @click="dataFormSubmitHandle()">{{$t("confirm")}}</el-button>
+            <el-button @click="backToActList">返回</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <map-select v-if="mapSelectVisible"
+                  ref="mapSelect"
+                  v-on:position="position"></map-select>
+    </div>
+  </el-card>
+</template>
+<script>
+import Cookies from 'js-cookie'
+import MapSelect from './map-select'
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+export default {
+  name: 'ActInfoAdd',
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        title: '',
+        headPic: '',
+        signupStartTime: '',
+        signupEndTime: '',
+        actQuotaCategory: '1',
+        actStartTime: '',
+        actEndTime: '',
+        actAddress: '',
+        actLongitude: '',
+        actLatitude: '',
+        signinStartTime: '',
+        signinEndTime: '',
+        signinAddress: '',
+        signinLongitude: '',
+        signinLatitude: '',
+        clockRadius: 200,
+        actQuota: '',
+        contacts: '',
+        tel: '',
+        requirement: '',
+        actContent: '',
+        actStatus: '',
+        publishTime: '',
+        sponsor: '',
+        deptId: '',
+        punishmentPoints: '',
+        reward: '',
+        isBanner: '1',
+        actUserDefaultState: '1',
+        bannerUrl: ''
+      },
+      isSignupEndTime: {
+        disabledDate (time) {
+          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
+        }
+      },
+      isImgRequired: true,
+      mapSelectVisible: false,
+      signInIsAble: true,
+      isAble: false,
+      loading: false,
+      // 富文本
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ 'header': 1 }, { 'header': 2 }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+        [{ 'script': 'sub' }, { 'script': 'super' }],
+        [{ 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'direction': 'rtl' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }],
+        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+        [{ 'color': [] }, { 'background': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.actStartTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginSignInDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.signinEndTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.actEndTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.visible = true
+    this.$nextTick(() => {
+      // 富文本
+      this.hideUpload = false
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+      if (this.quillEditor) {
+        this.quillEditor.deleteText(0, this.quillEditor.getLength())
+      } else {
+        this.quillEditorHandle()
+      }
+      // 富文本end
+    })
+  },
+  computed: {
+    dataRule () {
+      return {
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        headPic: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signupStartTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signupEndTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signinStartTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signinEndTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actStartTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actEndTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actLongitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actLatitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signinAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signinLongitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signinLatitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockRadius: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actQuota: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signupNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actShareNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actBrowseNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        contacts: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        requirement: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        actStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        publishTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sponsor: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        punishmentPoints: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reward: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bannerUrl: [
+          { required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    dateChangeTime () {
+      this.dataForm.signinStartTime = this.dataForm.actStartTime
+    },
+    changeHandler (value) {
+      if (value === 1) {
+        this.isImgRequired = true
+      } else {
+        this.isImgRequired = false
+      }
+    },
+    backToActList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'ActInfoList'
+      this.$router.push({ path: '/heart-actinfo' })
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    position (position) {
+      if (position.type === 1) {
+        this.dataForm.actAddress = position.address
+        this.dataForm.actLatitude = position.latitude
+        this.dataForm.actLongitude = position.longitude
+        this.dataForm.signinAddress = position.address
+        this.dataForm.signinLatitude = position.latitude
+        this.dataForm.signinLongitude = position.longitude
+      } else {
+        this.dataForm.signinAddress = position.address
+        this.dataForm.signinLatitude = position.latitude
+        this.dataForm.signinLongitude = position.longitude
+      }
+    },
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      this.quillEditor.container.style.height = `${300}px`
+      // // 自定义上传图片功能 (使用element upload组件)
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.actContent = this.quillEditor.root.innerHTML
+        if ((this.dataForm.actContent).length > 10000) {
+          return this.$message.error('您输入的的内容已超过字数')
+        }
+      })
+    },
+    // 上传图片之前 (富文本)
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功 (富文本)
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
+    },
+    setRegistTime () {
+      this.dataForm.newsReleaseStartTime = this.time[0]
+      this.dataForm.newsReleaseEndTime = this.time[1]
+    },
+    // 上传图片ends
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      if (new Date() >= new Date(this.dataForm.signupEndTime)) {
+        return this.$message.error('报名截止时间必须大于当前时间')
+      }
+      if (this.dataForm.actStartTime >= this.dataForm.actEndTime) {
+        return this.$message.error('活动结束时间必须大于活动开始时间')
+      }
+      if (this.dataForm.actStartTime <= this.dataForm.signupEndTime) {
+        return this.$message.error('活动开始时间必须大于报名截止时间')
+      }
+      if (this.dataForm.actEndTime > this.dataForm.signinEndTime) {
+        return this.$message.error('打卡结束时间必须大于或等于活动结束时间')
+      }
+      if ((this.dataForm.actContent).length > 10000) {
+        return this.$message.error('您输入的的内容已超过字数')
+      }
+      if (this.dataForm.isActQuota === 0) {
+        this.dataForm.actQuota = 0
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        var signUpEndTime = new Date(Date.parse(this.dataForm.signupEndTime))
+        var actStarTime = new Date(Date.parse(this.dataForm.actStartTime))
+        var actEndTime = new Date(Date.parse(this.dataForm.actEndTime))
+        var signinEndTime = new Date(Date.parse(this.dataForm.signinEndTime))
+        if (signUpEndTime > actStarTime) {
+          return this.$message.error('活动开始时间必须大于报名截止时间.')
+        }
+        if (actEndTime < actStarTime) {
+          return this.$message.error('活动结束时间必须大于活动开始时间.')
+        }
+        if (signinEndTime < actEndTime) {
+          return this.$message.error('签到结束时间必须大于活动结束时间.')
+        }
+        this.isAble = true
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actinfo/', this.dataForm).then(({ data: res }) => {
+          this.isAble = false
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+          this.$parent.selectComponent = 'ActInfoList'
+          this.$router.push({
+            path: '/heart-actinfo'
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.headPic = res.data.url
+    },
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.bannerUrl = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
+    mapSelectHandle (type) {
+      this.mapSelectVisible = true
+      this.$nextTick(() => {
+        this.$refs.mapSelect.init(type, this.dataForm.clockRadius)
+      })
+    }
+  },
+  components: {
+    MapSelect
+  }
+}
+</script>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+<style lang="scss">
+.project-handle {
+  .el-timeline {
+    padding-left: 9px;
+    font-size: 13px;
+  }
+  .el-textarea {
+    width: 600px !important;
+  }
+  .el-input {
+    width: 600px !important;
+  }
+}
+.el-form-item__label {
+  font-weight: bold;
+}
+</style>
+
+<style lang="scss" scoped>
+.project-handle {
+  width: 100%;
+  height: calc(100vh - 120px);
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 10px;
+  .project-detail {
+    width: 100%;
+    height: 49%;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    padding: 10px;
+    padding-top: 20px;
+    float: left;
+    margin-bottom: 1%;
+    position: relative;
+    .project-detail-tip {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      color: #ffffff;
+      background: #4ac38b;
+      text-align: center;
+    }
+    .el-form {
+      width: 58%;
+      height: 100%;
+      float: left;
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        width: 5px;
+        height: 1px;
+      }
+      &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: #ccc;
+      }
+      &::-webkit-scrollbar-track {
+        border-radius: 10px;
+        background: #fff;
+      }
+    }
+    .container {
+      width: 40%;
+      height: 100%;
+      float: right;
+      .location {
+        height: 30px;
+        line-height: 30px;
+      }
+      #map {
+        width: 100%;
+        height: calc(100% - 30px);
+      }
+    }
+  }
+  .project-progress {
+    width: 20%;
+    height: 100%;
+    float: right;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    margin-left: 1%;
+    padding-top: 20px;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+  }
+  .handle-operation {
+    padding-top: 30px;
+    box-sizing: border-box;
+    width: 100%;
+    height: 49%;
+    box-sizing: border-box;
+    border: 2px solid #ccc;
+    float: left;
+    position: relative;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+    .handle-operation-tip {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      color: #ffffff;
+      background: #ff7600;
+      text-align: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/heart/actinfo-cancel.vue b/src/views/modules/heart/actinfo-cancel.vue
new file mode 100644
index 0000000..98f2215
--- /dev/null
+++ b/src/views/modules/heart/actinfo-cancel.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="取消原因 :" prop="cancelReason">
+        <el-input v-model="dataForm.cancelReason" placeholder="请输入原因，50字以内"
+                  type="textarea"
+                  style="width:500px"
+                  maxlength="50"
+                  clearable>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        cancelReason: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        cancelReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        let postData = {
+          id: this.dataForm.id,
+          cancelReason: this.dataForm.cancelReason
+        }
+        this.$http['post']('/heart/actinfo/cancel', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
new file mode 100644
index 0000000..98b9917
--- /dev/null
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -0,0 +1,255 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__news}">
+      <el-form :inline="true"
+               :model="dataForm"
+               :rules="dataRule"
+               ref="dataForm"
+               :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+        <el-row>
+          <el-form-item label="活动头图："
+                        v-loading="loading"
+                        prop="headPic">
+            <img v-if="dataForm.headPic"
+                 :src="dataForm.headPic"
+                 class="avatar">
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动标题："
+                        prop="title">
+            {{dataForm.title}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="报名要求："
+                        prop="requirement">
+            {{dataForm.requirement}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="报名截止时间："
+                        prop="signupEndTime">
+            {{dataForm.signupEndTime}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动名额："
+                        prop="actQuota">
+            <template>
+              {{dataForm.actQuotaCategory != '0' ? dataForm.actQuota+'人':'不限名额'}}
+            </template>
+            <div>
+              <font color="gray">报名未审核人员：</font>
+              <font color="gray">活动已开始，未审核报名人员，可设置默认状态是否通过</font>
+            </div>
+            <div>
+              <el-radio v-model="dataForm.actUserDefaultState"
+                        disabled="true"
+                        label="1">通过</el-radio>
+              <el-radio v-model="dataForm.actUserDefaultState"
+                        disabled="true"
+                        label="4">不通过</el-radio>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动时间："
+                        prop="actStartTime">
+            {{dataForm.actStartTime}}
+          </el-form-item>
+          <el-form-item label="至"
+                        label-width="40px"
+                        prop="actEndTime">
+            {{dataForm.actEndTime}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+
+          <div>
+            <el-form-item label="打卡范围时间："
+                          prop="signinStartTime">
+              {{dataForm.signinStartTime}}
+            </el-form-item>
+            <el-form-item label="至"
+                          label-width="40px"
+                          prop="signinEndTime">
+              {{dataForm.signinEndTime}}
+            </el-form-item>
+          </div>
+        </el-row>
+
+        <el-row>
+          <el-form-item label="活动地点："
+                        prop="actAddress">
+            {{dataForm.actAddress}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="打卡地点："
+                        prop="signinAddress">
+            {{dataForm.signinAddress}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="打卡范围："
+                        prop="clockRadius">
+            {{dataForm.clockRadius}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="联系人："
+                        prop="contacts">
+            {{dataForm.contacts}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="联系电话："
+                        prop="tel">
+            {{dataForm.tel}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="活动主办方："
+                        prop="sponsor">
+            {{dataForm.sponsor}}
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="奖励积分："
+                        prop="reward">
+            {{dataForm.reward}}&emsp;积分
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="惩罚积分："
+                        prop="punishmentPoints">
+            {{dataForm.punishmentPoints}}&emsp;积分
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item prop="actContent"
+                        label="活动内容：">
+            <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"
+                        prop="bannerUrl">
+            <img v-if="dataForm.bannerUrl"
+                 :src="dataForm.bannerUrl"
+                 class="avatar">
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-form-item label-width="500px">
+            <el-button size="small"
+                       style="width: 95px"
+                       @click="back">返回</el-button>
+
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </div>
+  </el-card>
+</template>
+
+<script>
+// import debounce from 'lodash/debounce'
+// import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import 'element-ui/lib/theme-chalk/image.css'
+export default {
+  name: 'ActInfoDetailView',
+  data () {
+    return {
+      dataForm: {
+        id: '',
+        title: '',
+        headPic: '',
+        signupStartTime: '',
+        signupEndTime: '',
+        actQuotaCategory: '',
+        actStartTime: '',
+        actEndTime: '',
+        actAddress: '',
+        actLongitude: '',
+        actLatitude: '',
+        signinAddress: '',
+        signinLongitude: '',
+        signinLatitude: '',
+        clockRadius: '',
+        actQuota: '',
+        signupNum: '',
+        clockNum: '',
+        actShareNum: '',
+        actBrowseNum: '',
+        contacts: '',
+        tel: '',
+        requirement: '',
+        actContent: '',
+        actStatus: '',
+        publishTime: '',
+        sponsor: '',
+        deptId: '',
+        punishmentPoints: '',
+        actUserDefaultState: '1',
+        reward: ''
+      }
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+      }
+    }
+  },
+  methods: {
+    back () {
+      this.$parent.selectComponent = 'ActInfoList'
+      this.$router.push({ path: '/heart-actinfo' })
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
new file mode 100644
index 0000000..378aca3
--- /dev/null
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -0,0 +1,178 @@
+<template>
+  <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-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>
+        <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>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:actinfo:add')" type="primary" @click="addAction()">增加活动</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"></el-table-column>
+        <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actStartTime" label="活动开始时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actEndTime" label="活动结束时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actStatus" label="活动发布状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="publishTime" label="活动发布时间" 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>
+              <el-button v-if="$hasPermission('heart:actinfo:look')" type="text" size="small" @click="detailAction(scope.row.id)">查看详情</el-button>
+            </div>
+            <div>
+              <el-button v-if="$hasPermission('heart:actinfo:join')" type="text" size="small" @click="joinManage(scope.row.id)">报名管理</el-button>
+              <el-button v-if="$hasPermission('heart:actinfo:clock')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="clockManage(scope.row.id)">打卡积分</el-button>
+            </div>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <actinfo-detail-view v-if="actInfoDetailVisible" ref="actinfoDetail" @refreshDataList="getDataList"></actinfo-detail-view>
+      <actuserrelation v-if="actUserRelationVisible" ref="actUserRelation" @refreshDataList="getDataList"></actuserrelation>
+      <actinfo-cancel v-if="actInfoCancelVisible" ref="actinfoCancel" @refreshDataList="getDataList"></actinfo-cancel>
+      <actuserclocklog v-if="actUserClockLogVisible" ref="actUserClockLog" @refreshDataList="getDataList"></actuserclocklog>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actinfo-add-or-update'
+import ActinfoDetailView from './actinfo-detail-view'
+import ActUserRelation from './actuserrelation'
+import ActinfoCancel from './actinfo-cancel'
+import ActUserClockLog from './actuserclocklog'
+export default {
+  mixins: [mixinViewModule],
+  name: 'ActInfoList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actinfo/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        actStatus: '',
+        startTime: '',
+        endTime: ''
+      },
+      addOrUpdateVisible: false,
+      actInfoDetailVisible: false,
+      actUserRelationVisible: false,
+      actInfoCancelVisible: false,
+      actUserClockLogVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate,
+    ActinfoDetailView,
+    ActUserRelation,
+    ActinfoCancel,
+    ActUserClockLog
+  },
+  created: function () {
+    this.getDataList()
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'ActInfoDetailView'
+      this.$router.push({ path: '/heart-actinfo', query: { id: id } })
+    },
+    addAction () {
+      this.$parent.selectComponent = 'ActInfoAdd'
+      this.$router.push(
+        { path: '/heart-actinfo'}
+      )
+    },
+    joinManage (id) {
+      this.$parent.selectComponent = 'ActUserRelation'
+      this.$router.push({ path: '/heart-actinfo', query: { id: id } })
+    },
+    clockManage (id) {
+      this.$parent.selectComponent = 'ActUserClockLog'
+      this.$router.push({ path: '/heart-actinfo', query: { id: id } })
+    },
+    formatState: function (row, column) {
+      let state = row.actStatus
+      if (state === '1') {
+        return '上架'
+      } else if (state === '0') {
+        return '下架'
+      }
+    },
+    cancelHandle (row) {
+      let state = row.actStatus
+      if (state === '1') {
+        this.actInfoCancelVisible = true
+        this.$nextTick(() => {
+          this.$refs.actinfoCancel.dataForm.id = row.id
+          this.$refs.actinfoCancel.init()
+        })
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actinfo.vue b/src/views/modules/heart/actinfo.vue
new file mode 100644
index 0000000..7c4c003
--- /dev/null
+++ b/src/views/modules/heart/actinfo.vue
@@ -0,0 +1,36 @@
+<template>
+  <keep-alive include="actInfoList">
+    <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+<script>
+import ActInfoList from './actinfo-list'
+import ActInfoDetailView from './actinfo-detail-view'
+import ActInfoAdd from './actinfo-add-or-update'
+import ActUserRelation from './actuserrelation'
+import ActUserClockLog from './actuserclocklog'
+import ActUserClockDetail from './actuserclock-detail'
+export default {
+  data () {
+    return {
+      selectComponent: ActInfoList
+    }
+  },
+  components: {
+    ActInfoList,
+    ActInfoDetailView,
+    ActInfoAdd,
+    ActUserRelation,
+    ActUserClockLog,
+    ActUserClockDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = ActInfoList
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/modules/heart/actphrase-add-or-update.vue b/src/views/modules/heart/actphrase-add-or-update.vue
new file mode 100644
index 0000000..d08293f
--- /dev/null
+++ b/src/views/modules/heart/actphrase-add-or-update.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :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="常用语 :"
+                    prop="phrase">
+        <el-input v-model="dataForm.phrase"
+                  maxlength="500"
+                  show-word-limit
+                  placeholder="常用语"></el-input>
+      </el-form-item>
+      <el-form-item label="编码 :"
+                    prop="code">
+        <el-input type="text"
+                  oninput="value=value.replace(/[^0-9.]/g,'')"
+                  v-model="dataForm.code"
+                  maxlength="20"
+                  placeholder="输入数字编码"></el-input>
+      </el-form-item>
+      <el-form-item label="是否显示 :"
+                    prop="showFlag">
+        <el-select v-model="dataForm.showFlag"
+                   placeholder="是否显示">
+          <el-option v-for="item in showFlagArr"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="sort"
+                    label="显示顺序 :">
+        <el-input-number v-model="dataForm.sort"
+                         controls-position="right"
+                         :min="1"
+                         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>
+      </el-form-item> -->
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        phrase: '',
+        code: '',
+        sort: '',
+        showFlag: '',
+        usageNum: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      showFlagArr: [
+        { dictValue: '1', dictName: '是' },
+        { dictValue: '0', dictName: '否' }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        phrase: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        showFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        usageNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.dataForm.code = ''
+          this.dataForm.phrase = ''
+        }
+      })
+      this.showFlagInit()
+    },
+    // 是否显示下拉框初始化赋值
+    showFlagInit () {
+      this.dataForm.showFlag = '1'
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actphrase/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actphrase/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actphrase-detail.vue b/src/views/modules/heart/actphrase-detail.vue
new file mode 100644
index 0000000..07e278b
--- /dev/null
+++ b/src/views/modules/heart/actphrase-detail.vue
@@ -0,0 +1,142 @@
+<template>
+  <el-dialog :visible.sync="visible" title="查看" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" disabled="true">
+      <el-form-item label="常用语" prop="phrase">
+        <el-input v-model="dataForm.phrase" maxlength="500" show-word-limit placeholder="常用语"></el-input>
+      </el-form-item>
+      <el-form-item label="编码" prop="code">
+        <el-input v-model="dataForm.code" maxlength="20" placeholder="编码"></el-input>
+      </el-form-item>
+      <el-form-item label="是否显示" prop="showFlag">
+        <el-select v-model="dataForm.showFlag" placeholder="是否显示">
+          <el-option v-for="item in showFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="sort" label="显示顺序">
+        <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></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>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button v-if=false @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button v-if=false type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        phrase: '',
+        code: '',
+        sort: '',
+        showFlag: '',
+        usageNum: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      showFlagArr: [
+        { dictValue: '1', dictName: '是' },
+        { dictValue: '0', dictName: '否' }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        phrase: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        showFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        usageNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+      this.showFlagInit()
+    },
+    // 是否显示下拉框初始化赋值
+    showFlagInit () {
+      this.dataForm.showFlag = '1'
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actphrase/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actphrase/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
new file mode 100644
index 0000000..3ccefae
--- /dev/null
+++ b/src/views/modules/heart/actphrase.vue
@@ -0,0 +1,167 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-heart__actphrase}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @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="常用语:"
+                      prop="phrase">
+          <el-input v-model="dataForm.phrase"
+                    placeholder="常用语"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="编码"
+                      prop="code">
+          <el-input v-model="dataForm.code"
+                    placeholder="编码"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="是否显示"
+                      prop="showFlag">
+          <el-select v-model="dataForm.showFlag"
+                     placeholder="是否显示"
+                     clearable=true>
+            <el-option v-for="item in showFlagArr"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="phrase"
+                         label="常用语"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="code"
+                         label="编码"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="showFlag"
+                         label="是否显示"
+                         header-align="center"
+                         align="center"
+                         :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="sort"
+                         label="显示顺序"
+                         header-align="center"
+                         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="创建时间"
+                         header-align="center"
+                         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"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <!-- <el-button type="text" size="small" @click="phraseDetailHandle(scope.row.id)">查看</el-button> -->
+            <el-button type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('heart:actphrase:delete')"
+                       type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+      <!--查看-->
+      <actphrase-detail v-if="phraseDetailVisible"
+                        ref="actphraseDetail"
+                        @refreshDataList="getDataList"></actphrase-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actphrase-add-or-update'
+import actphraseDetail from './actphrase-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actphrase/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actphrase',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        phrase: '',
+        code: '',
+        showFlag: ''
+      },
+      showFlagArr: [
+        { dictValue: '1', dictName: '是' },
+        { dictValue: '0', dictName: '否' }
+      ],
+      phraseDetailVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate,
+    actphraseDetail
+  },
+  methods: {
+    showFlagFormat (row, column) {
+      if (row.showFlag === '0') {
+        return '否'
+      } else {
+        return '是'
+      }
+    },
+    phraseDetailHandle (pheaseId) {
+      this.phraseDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.actphraseDetail.dataForm.id = pheaseId
+        this.$refs.actphraseDetail.init()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
new file mode 100644
index 0000000..fcead7e
--- /dev/null
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -0,0 +1,537 @@
+<template>
+  <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>
+        <el-form
+          ref="dataForm"
+          :model="dataForm"
+          :rules="dataRule"
+          @keyup.enter.native="dataFormSubmitHandle()"
+        >
+          <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"
+              placeholder="请写明理由，100字以内"
+            ></el-input>
+          </el-form-item>
+          <el-form-item style="float: right;">
+            <el-button
+              size="small"
+              style="width: 95px"
+              type="primary"
+              @click="dataFormSubmitHandle()"
+            >{{ $t('confirm') }}</el-button>
+            <el-button size="small" style="width: 95px" @click="backToActClockList">{{ '返回' }}</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="info" v-if="dataForm.oldStatus=='5'">
+        <div class="project-detail-tip">处理操作 :</div>
+        <div class="info-title">本次活动已确认加积分</div>
+        <div class="info-content">如有积分调整，请在“志愿者管理-积分调整”里对该用户进行增或减积分操作</div>
+        <el-button class="info-but" size="small" style="width: 95px" @click="backToActClockList">{{ '返回' }}</el-button>
+      </div>
+      <div class="info" v-if="dataForm.oldStatus=='6'">
+        <div class="project-detail-tip">处理操作 :</div>
+        <div class="info-title">本次活动已拒绝加积分</div>
+        <div  class="info-content">如有积分调整，请在“志愿者管理-积分调整”里对该用户进行增或减积分操作</div>
+        <el-button class="info-but" size="small" style="width: 95px" @click="backToActClockList">{{ '返回' }}</el-button>
+      </div>
+    </div>
+    <div class="container">
+      <div class="location">
+        <span style="font-weight: bold;color: #606266">打卡位置 :</span>
+        {{dataForm.address}}
+      </div>
+      <div id="mapContainer" style="width:450px;height:220px;"></div>
+    </div>
+
+    <div class="handle-operation">
+      <div class="handle-operation-tip">打卡详情</div>
+      <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="realName" label="报名人" header-align="center" align="center"></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          :formatter="formatSex"
+          header-align="center"
+          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="联系电话" 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
+              class="avatar1"
+              v-if="scope.row.clockPic[0]"
+              :src="scope.row.clockPic[0]"
+              :key="scope.row.clockPic[0]"
+              :preview-src-list="previewImgList"
+              @click="clickImg(scope.row.clockPic[0])"
+            ></el-image>
+            <el-image
+              class="avatar1"
+              v-if="scope.row.clockPic[1]"
+              :src="scope.row.clockPic[1]"
+              :key="scope.row.clockPic[1]"
+              :preview-src-list="previewImgList"
+              @click="clickImg(scope.row.clockPic[1])"
+            ></el-image>
+            <el-image
+              class="avatar1"
+              v-if="scope.row.clockPic[2]"
+              :src="scope.row.clockPic[2]"
+              :key="scope.row.clockPic[2]"
+              :preview-src-list="previewImgList"
+              @click="clickImg(scope.row.clockPic[2])"
+            ></el-image>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import debounce from 'lodash/debounce'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import 'element-ui/lib/theme-chalk/image.css'
+var map
+var markerList = []
+var radiusList = []
+// var clockList = []
+export default {
+  mixins: [mixinViewModule],
+  name: 'ActUserClockDetail',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actuserclocklog/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        actId: '',
+        status: '',
+        failureReason: '',
+        address: '',
+        latitude: '',
+        longitude: '',
+        radius: 200,
+        clockPic: []
+      },
+      previewImgList: [],
+      isAble: false
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.dataForm.actId = this.$route.query.actId
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+        status: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        failureReason: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  methods: {
+    backToActClockList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'ActUserClockLog'
+      this.$router.push({
+        path: '/heart-actinfo',
+        query: { id: this.dataForm.actId }
+      })
+    },
+    setMap (data) {
+      // 步骤：定义map变量 调用 qq.maps.Map() 构造函数   获取地图显示容器
+      // 设置地图中心点
+      var myLatlng = new qq.maps.LatLng(data.latitude, data.longitude)
+      // 定义工厂模式函数
+      var zoom = this.capacity(data)
+      var myOptions = {
+        zoom: zoom, // 设置地图缩放级别
+        center: myLatlng, // 设置中心点样式
+        mapTypeId: qq.maps.MapTypeId.ROADMAP // 设置地图样式详情参见MapType
+      }
+      // //获取dom元素添加地图信息
+      map = new qq.maps.Map(document.getElementById('mapContainer'), myOptions)
+      // 设置圆形
+      var radius = new qq.maps.Circle({
+        center: new qq.maps.LatLng(data.latitude, data.longitude),
+        radius: this.dataForm.radius,
+        map: map
+      })
+
+      radiusList.push(radius)
+      var marker = new qq.maps.Marker({
+        position: myLatlng,
+        map: map
+      })
+      markerList.push(marker)
+    },
+    init () {
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 点击查看大图
+    clickImg (url) {
+      this.previewImgList = []
+      this.previewImgList.push(url)
+    },
+    getDataList () {
+      this.dataListLoading = true
+      this.$http
+        .get(this.mixinViewModuleOptions.getDataListURL, {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage
+              ? this.page
+              : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage
+              ? this.limit
+              : null,
+            ...this.dataForm
+          }
+        })
+        .then(({ data: res }) => {
+          this.dataListLoading = false
+          if (res.code !== 0) {
+            this.dataList = []
+            this.total = 0
+            return this.$message.error(res.msg)
+          }
+          this.dataList = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.list
+            : res.data
+          this.total = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.total
+            : 0
+          this.dataList.forEach(item => {
+            var LogLatlng = new qq.maps.LatLng(
+              item.clockLatitude,
+              item.clockLongitude
+            )
+            var LogMarker = new qq.maps.Marker({
+              position: LogLatlng,
+              map: map
+            })
+            markerList.push(LogMarker)
+          })
+          console.log(markerList)
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http
+        .get(`/heart/actuserclocklog/clockDetail/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data
+          }
+          // if (res.data.status != '5' && res.data.status != '6') {
+          //   this.dataForm.status = '5';
+          //   this.dataForm.failureReason = '';
+          // } else {
+          //   this.isAble = true;
+          // }
+          this.setMap(res.data)
+
+          this.getDataList()
+        })
+        .catch(() => {})
+    },
+    capacity (data) {
+      if (data.radius > 0 && data.radius <= 25) {
+        return 18
+      } else if (data.radius > 25 && data.radius <= 50) {
+        return 17
+      } else if (data.radius > 50 && data.radius <= 100) {
+        return 16
+      } else if (data.radius > 100 && data.radius <= 200) {
+        return 15
+      } else if (data.radius > 200 && data.radius <= 500) {
+        return 14
+      } else if (data.radius > 500 && data.radius <= 1000) {
+        return 13
+      } else if (data.radius > 1000 && data.radius <= 2000) {
+        return 12
+      } else if (data.radius > 2000 && data.radius <= 5000) {
+        return 11
+      }
+    },
+    formatSex: function (row, column) {
+      let state = row.sex
+      if (state === '0') {
+        return '女'
+      } else if (state === '1') {
+        return '男'
+      }
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs['dataForm'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+          if (this.dataForm.failureReason.length > 100) {
+            return this.$message.error('处理意见不超过100字')
+          }
+          // this.isAble = true
+          this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm)
+            .then(({ data: res }) => {
+              // this.isAble = false
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.$emit('refreshDataList')
+                  this.$parent.selectComponent = 'ActUserClockLog'
+                  this.$router.push({
+                    path: '/heart-actinfo',
+                    query: { id: this.dataForm.actId }
+                  })
+                }
+              })
+            })
+            .catch(() => {})
+        })
+      },
+      1000,
+      { leading: true, trailing: false }
+    )
+  }
+}
+</script>
+<style lang="scss">
+.aui-wrapper .el-pagination {
+  margin-top: 10px;
+  margin-bottom: 10px !important;
+}
+.project-handle .el-input {
+  width: 100px !important;
+}
+.project-handle .handle-operation {
+  background: #fff;
+}
+.el-pagination__editor.el-input {
+  width: 50px !important;
+}
+.project-handle {
+  padding: 0 !important;
+}
+.project-handle .project-detail {
+  width: 59% !important;
+  padding-left: 50px;
+  padding-top: 40px !important;
+  min-height: 245px !important;
+}
+.info-title {
+  text-align: center;
+  font-weight: 500;
+  text-align: center;
+  font-size: 20px;
+}
+.info-content {
+  text-align: center;
+  margin-top: 18px;
+  font-size: 17px;
+  color: #6e6e6e;
+}
+.info-but{
+  margin: 60px 70px 20px 0;
+  float: right;
+}
+.avatar1 {
+  width: 120px;
+  height: 120px;
+}
+.el-image-viewer__close {
+  top: 16%;
+}
+.el-table__fixed-right::before,
+.el-table__fixed::before {
+  background: transparent !important;
+}
+</style>
+
+<style lang="scss" scoped>
+.project-handle {
+  width: 100%;
+  height: 49%;
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 10px;
+  .project-detail {
+    background: #ffffff;
+    width: 60%;
+    height: 49%;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    padding-top: 20px;
+    float: left;
+    margin-bottom: 1%;
+    position: relative;
+    .project-detail-tip {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      color: #ffffff;
+      background: #4ac38b;
+      text-align: center;
+    }
+    .el-form {
+      height: 100%;
+      float: left;
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        width: 5px;
+        height: 1px;
+      }
+      &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: #ccc;
+      }
+      &::-webkit-scrollbar-track {
+        border-radius: 10px;
+        background: #fff;
+      }
+    }
+  }
+  .container {
+    background: #ffffff;
+    width: 40%;
+    height: 49%;
+    float: right;
+    .location {
+      height: 30px;
+      line-height: 30px;
+    }
+    #map {
+      width: 100%;
+      height: calc(100% - 30px);
+    }
+  }
+  .project-progress {
+    width: 20%;
+    height: 100%;
+    float: right;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    margin-left: 1%;
+    padding-top: 20px;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+  }
+  .handle-operation {
+    padding-top: 30px;
+    box-sizing: border-box;
+    width: 100%;
+    height: 49%;
+    box-sizing: border-box;
+    border: 2px solid #ccc;
+    float: left;
+    position: relative;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+    .handle-operation-tip {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      color: #ffffff;
+      background: #ff7600;
+      text-align: center;
+    }
+  }
+  .info {
+    height: 100%;
+    background: #fff;
+    margin-bottom: 0px;
+  }
+}
+</style>
diff --git a/src/views/modules/heart/actuserclocklog-add-or-update.vue b/src/views/modules/heart/actuserclocklog-add-or-update.vue
new file mode 100644
index 0000000..baa5984
--- /dev/null
+++ b/src/views/modules/heart/actuserclocklog-add-or-update.vue
@@ -0,0 +1,166 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="用户活动关系表ID" prop="actUserId">
+          <el-input v-model="dataForm.actUserId" placeholder="用户活动关系表ID"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡类型（0-打卡，1-更新打卡）" prop="clockType">
+          <el-input v-model="dataForm.clockType" placeholder="打卡类型（0-打卡，1-更新打卡）"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡时间" prop="clockTime">
+          <el-input v-model="dataForm.clockTime" placeholder="打卡时间"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡位置经度" prop="clockLongitude">
+          <el-input v-model="dataForm.clockLongitude" placeholder="打卡位置经度"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡位置纬度" prop="clockLatitude">
+          <el-input v-model="dataForm.clockLatitude" placeholder="打卡位置纬度"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡地址" prop="clockAddress">
+          <el-input v-model="dataForm.clockAddress" placeholder="打卡地址"></el-input>
+      </el-form-item>
+          <el-form-item label="打卡描述" prop="clockDesc">
+          <el-input v-model="dataForm.clockDesc" placeholder="打卡描述"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        actUserId: '',
+        clockType: '',
+        clockTime: '',
+        clockLongitude: '',
+        clockLatitude: '',
+        clockAddress: '',
+        clockDesc: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        actUserId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockLongitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockLatitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        clockDesc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actuserclocklog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actuserclocklog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserclocklog.vue b/src/views/modules/heart/actuserclocklog.vue
new file mode 100644
index 0000000..f6da42a
--- /dev/null
+++ b/src/views/modules/heart/actuserclocklog.vue
@@ -0,0 +1,224 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-heart__actuserclocklog}">
+      <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="状态">
+            <el-select v-model="dataForm.status"
+                       placeholder="状态"
+                       clearable>
+              <el-option label="审核通过"
+                         :value="1"></el-option>
+              <el-option label="打卡"
+                         :value="2"></el-option>
+              <el-option label="确认加积分"
+                         :value="5"></el-option>
+              <el-option label="拒绝加积分"
+                         :value="6"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input v-model="dataForm.realName"
+                      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>
+        <div class="block">
+          <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="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+        </div>
+      </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="realName"
+                         label="报名人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="sex"
+                         label="性别"
+                         :formatter="formatSex"
+                         header-align="center"
+                         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="联系电话"
+                         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="clockCount"
+                         label="打卡次数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="status"
+                         label="打卡状态"
+                         :formatter="formatState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="checkPoint"
+                         :formatter="isCheckPoint"
+                         label="是否发放积分"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="point"
+                         label="积分"
+                         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">
+            <!--            <el-button  type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>-->
+            <el-button v-if="$hasPermission('heart:actinfo:look')"
+                       type="text"
+                       size="small"
+                       @click="detailHandle(scope.row.id)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <actuserclock-detai v-if="detailVisible"
+                          ref="actuserrelationDetail"
+                          @refreshDataList="getDataList"></actuserclock-detai>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import ActUserClockDetail from './actuserclock-detail'
+export default {
+  name: 'ActUserClockLog',
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actuserclocklog/clockPage',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        actId: '',
+        startTime: '',
+        endTime: ''
+      },
+      detailVisible: false,
+      time: ''
+    }
+  },
+  mounted () {
+    this.dataForm.actId = this.$route.query.id
+    this.getDataList()
+  },
+  methods: {
+    backToActList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'ActInfoList'
+      this.$router.push({ path: '/heart-actinfo' })
+    },
+    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') {
+        return '报名'
+      } else if (state === '1') {
+        return '审核通过'
+      } else if (state === '2') {
+        return '打卡'
+      } else if (state === '3') {
+        return '取消报名'
+      } else if (state === '4') {
+        return '审核不通过'
+      } else if (state === '5') {
+        return '确认加积分'
+      } else if (state === '6') {
+        return '拒绝加积分'
+      }
+    },
+    formatSex: function (row, column) {
+      let state = row.sex
+      if (state === '0') {
+        return '女'
+      } else if (state === '1') {
+        return '男'
+      }
+    },
+    // 是否发放积分转义
+    isCheckPoint: function (row, column) {
+      let state = row.checkPoint
+      if (state === '0') {
+        return '否'
+      } else if (state === '1') {
+        return '是'
+      }
+    }
+  },
+  components: {
+    ActUserClockDetail
+  }
+}
+</script>
+<style scoped>
+.project-handle .el-input {
+  width: 100px !important;
+}
+.el-pagination .el-select .el-input {
+  width: 100px;
+  margin: 0 5px;
+}
+</style>
diff --git a/src/views/modules/heart/actuserlog-add-or-update.vue b/src/views/modules/heart/actuserlog-add-or-update.vue
new file mode 100644
index 0000000..00175cf
--- /dev/null
+++ b/src/views/modules/heart/actuserlog-add-or-update.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="活动ID" prop="actId">
+          <el-input v-model="dataForm.actId" placeholder="活动ID"></el-input>
+      </el-form-item>
+          <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" prop="operationType">
+          <el-input v-model="dataForm.operationType" placeholder="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）"></el-input>
+      </el-form-item>
+          <el-form-item label="审核不通过的原因" prop="failureReason">
+          <el-input v-model="dataForm.failureReason" placeholder="审核不通过的原因"></el-input>
+      </el-form-item>
+          <el-form-item label="操作时间" prop="operationTime">
+          <el-input v-model="dataForm.operationTime" placeholder="操作时间"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        actId: '',
+        userId: '',
+        operationType: '',
+        failureReason: '',
+        operationTime: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        actId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        failureReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actuserlog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actuserlog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserlog.vue b/src/views/modules/heart/actuserlog.vue
new file mode 100644
index 0000000..ccf0e21
--- /dev/null
+++ b/src/views/modules/heart/actuserlog.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__actuserlog}">
+      <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 @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>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:actuserlog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actId" label="活动ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="operationType" label="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" 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 prop="operationTime" label="操作时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" 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" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('heart:actuserlog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('heart:actuserlog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actuserlog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actuserlog/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actuserlog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserrelation-add-or-update.vue b/src/views/modules/heart/actuserrelation-add-or-update.vue
new file mode 100644
index 0000000..a352ef6
--- /dev/null
+++ b/src/views/modules/heart/actuserrelation-add-or-update.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="审核"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="审核 :"
+                    prop="auditState">
+        <template>
+          <el-radio v-model="dataForm.status"
+                    label="1">通过</el-radio>
+          <el-radio v-model="dataForm.status"
+                    label="4">不通过</el-radio>
+        </template>
+      </el-form-item>
+      <el-form-item label="请填写原因 :"
+                    prop="failureReason">
+        <el-input v-model="dataForm.failureReason"
+                  placeholder="请输入原因，50字以内"
+                  type="textarea"
+                  style="width:500px"
+                  maxlength="50"
+                  clearable>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        status: '1',
+        failureReason: ''
+
+      }
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  computed: {
+    dataRule () {
+      return {
+        status: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        failureReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        // if (this.dataForm.id) {
+        //   this.getInfo()
+        // }
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http['post']('/heart/actuserrelation/audit', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserrelation-detail.vue b/src/views/modules/heart/actuserrelation-detail.vue
new file mode 100644
index 0000000..a22d042
--- /dev/null
+++ b/src/views/modules/heart/actuserrelation-detail.vue
@@ -0,0 +1,120 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+          <el-form-item label="用户昵称 :" prop="nickname">
+          {{dataForm.nickname}}
+      </el-form-item>
+          <el-form-item label="真实姓名 :" prop="realName">
+          {{dataForm.realName}}
+      </el-form-item>
+          <el-form-item label="性别 :" prop="sex">
+             {{formatSex(dataForm.sex)}}
+      </el-form-item>
+          <el-form-item label="年龄 :" prop="age">
+              {{dataForm.age}}
+      </el-form-item>
+          <el-form-item label="联系电话 :" prop="mobile">
+              {{dataForm.mobile}}
+      </el-form-item>
+          <el-form-item label="身份证号 :" prop="identityNo">
+              {{dataForm.identityNo}}
+      </el-form-item>
+          <el-form-item label="当前状态 :" prop="status">
+              {{formatState(dataForm.status)}}
+<!--          <el-input v-model="dataForm.status" placeholder="当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）"></el-input>-->
+      </el-form-item>
+          <el-form-item label="原因 :" prop="failureReason">
+              {{dataForm.failureReason}}
+      </el-form-item>
+          <el-form-item label="审核时间 :" prop="auditTime">
+              {{dataForm.auditTime}}
+      </el-form-item>
+          <el-form-item label="报名时间 :" prop="signupTime">
+              {{dataForm.signupTime}}
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">返回</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        actId: '',
+        userId: '',
+        nickname: '',
+        faceImg: '',
+        partyFlag: '',
+        realName: '',
+        sex: '',
+        age: '',
+        mobile: '',
+        identityNo: '',
+        status: '',
+        failureReason: '',
+        auditTime: '',
+        signupTime: ''
+
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/actuserrelation/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+      formatState: function (status) {
+          let state = status
+          if (state === '0') {
+              return '报名'
+          } else if (state === '1') {
+              return '审核通过'
+          } else if (state === '2') {
+              return '打卡'
+          } else if (state === '3') {
+              return '取消报名'
+          } else if (state === '4') {
+              return '审核不通过'
+          } else if (state === '5') {
+              return '确认加积分'
+          } else if (state === '6') {
+              return '拒绝加积分'
+          }
+      },
+      formatSex: function (sex) {
+          let state = sex
+          if (state === '0') {
+              return '女'
+          } else if (state === '1') {
+              return '男'
+          }
+      }
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
new file mode 100644
index 0000000..6606c24
--- /dev/null
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -0,0 +1,198 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__actuserrelation}">
+      <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="状态">
+            <el-select v-model="dataForm.status" placeholder="状态" clearable>
+              <el-option label="报名" :value="0"></el-option>
+              <el-option label="审核通过" :value="1"></el-option>
+              <el-option label="打卡" :value="2"></el-option>
+              <el-option label="取消报名" :value="3"></el-option>
+              <el-option label="审核不通过" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input v-model="dataForm.realName" 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>
+        <div class="block">
+          <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="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+        </div>
+      </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="realName" label="报名人" header-align="center" align="center"></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          :formatter="formatSex"
+          header-align="center"
+          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="联系电话" 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="状态"
+          :formatter="formatState"
+          header-align="center"
+          align="center"
+        ></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"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 0"
+              @click="addOrUpdateHandle(scope.row.id)"
+            >审核</el-button>
+            <!-- <el-button  type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button> -->
+            <el-button type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      ></el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <actuserrelation-detail
+        v-if="detailVisible"
+        ref="actuserrelationDetail"
+        @refreshDataList="getDataList"
+      ></actuserrelation-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './actuserrelation-add-or-update'
+import ActuserrelationDetail from './actuserrelation-detail'
+export default {
+  mixins: [mixinViewModule],
+  name: 'ActUserRelation',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        activatedIsNeed: true,
+        getDataListURL: '/heart/actuserrelation/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actuserrelation',
+        deleteIsBatch: true
+      },
+
+      dataForm: {
+        id: '',
+        actId: '',
+        startTime: '',
+        endTime: '',
+        realName: '',
+        mobile: ''
+      },
+      time: '',
+      addOrUpdateVisible: false,
+      detailVisible: false
+    }
+  },
+  mounted () {
+    this.dataForm.actId = this.$route.query.id
+    this.getDataList()
+    this.dataListLoading = false
+  },
+  methods: {
+    backToActList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'ActInfoList'
+      this.$router.push({ path: '/heart-actinfo' })
+    },
+    detailHandle (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.actuserrelationDetail.dataForm.id = id
+        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
+
+      if (state === '0') {
+        return '报名'
+      } else if (state === '1') {
+        return '审核通过'
+      } else if (state === '2') {
+        return '打卡'
+      } else if (state === '3') {
+        return '取消报名'
+      } else if (state === '4') {
+        return '审核不通过'
+      } else if (state === '5') {
+        return '确认加积分'
+      } else if (state === '6') {
+        return '拒绝加积分'
+      }
+    },
+    formatSex: function (row, column) {
+      let state = row.sex
+      if (state === '0') {
+        return '女'
+      } else if (state === '1') {
+        return '男'
+      }
+    }
+  },
+  components: {
+    AddOrUpdate,
+    ActuserrelationDetail
+  }
+}
+</script>
diff --git a/src/views/modules/heart/address-check.vue b/src/views/modules/heart/address-check.vue
new file mode 100644
index 0000000..15f31d2
--- /dev/null
+++ b/src/views/modules/heart/address-check.vue
@@ -0,0 +1,52 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    title="地址确认"
+    :append-to-body="true"
+    :modal-append-to-body="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form :model="dataForm" :label-width="$i18n.locale === 'en-US' ? '180px' : '140px'">
+      <el-form-item label="地址:">
+        <div>{{dataForm.address}}</div>
+      </el-form-item>
+      <el-form-item label="经度:">
+        <div>{{dataForm.longitude}}</div>
+      </el-form-item>
+      <el-form-item label="纬度:">
+        <div>{{dataForm.latitude}}</div>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="checkOk()" type="primary">{{$t("confirm")}}</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        address: '',
+        longitude: 0,//经度
+        latitude: 0,//纬度
+        city: ''
+      }
+    }
+  },
+  methods: {
+    init (dataForm) {
+      this.visible = true
+      this.$nextTick(() => {
+        this.dataForm = dataForm
+      })
+    },
+    checkOk () {
+      this.$emit('checkOk', true)
+      this.visible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/heart/map-select.vue b/src/views/modules/heart/map-select.vue
new file mode 100644
index 0000000..6bddc6c
--- /dev/null
+++ b/src/views/modules/heart/map-select.vue
@@ -0,0 +1,249 @@
+
+<template>
+  <el-dialog :visible.sync="visible" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"
+    >
+      <el-row>
+        <el-form-item label="活动地点：" prop="address">
+          <el-input v-model="dataForm.address" type="text" clearable style="width:400px"></el-input>&emsp;
+          <el-button type="primary" @click="searchKeyword()">搜索</el-button>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label=" " prop="map">
+          <div>
+            <div id="container" style="width:500px;height:400px;"></div>
+          </div>
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <address-check v-if="addressCheckVisible" ref="addressCheck" v-on:checkOk="checkOk"></address-check>
+  </el-dialog>
+</template>
+<script>
+import jsonp from 'jsonp'
+import AddressCheck from './address-check'
+var searchService
+export default {
+  name: 'maps',
+  data () {
+    return {
+      dataForm: {
+        address: '',
+        longitude: 0, // 经度
+        latitude: 0, // 纬度
+        city: '',
+        type: 1,
+        radius: 200
+      },
+      visible: false,
+      addressCheckVisible: false
+    }
+  },
+  methods: {
+    init (type, radius) {
+      this.visible = true
+      this.dataForm.address = ''
+      this.dataForm.type = type
+      this.dataForm.radius = radius
+      this.getMyLocation()
+    },
+    getAddress (lat, lng) {
+      this.dataForm.longitude = lng
+      this.dataForm.latitude = lat
+      var url3 =
+        'https://apis.map.qq.com/ws/geocoder/v1/?location=' +
+        lat +
+        ',' +
+        lng +
+        '&key=MQFBZ-LTWW6-R7XSK-MFXUQ-DVSIE-BGB4M&output=jsonp'
+      jsonp(url3, null, (err, data) => {
+        if (err) {
+          console.log(err)
+        }
+        console.log(data)
+        this.dataForm.address = data.result.address
+      })
+    },
+    getMyLocation () {
+      var geolocation = new qq.maps.Geolocation(
+        'MQFBZ-LTWW6-R7XSK-MFXUQ-DVSIE-BGB4M',
+        'e家党群-管理端'
+      )
+      geolocation.getIpLocation(this.showPosition, this.showErr)
+    },
+    showPosition (position) {
+      console.log(position)
+      this.dataForm.latitude = position.lat
+      this.dataForm.longitude = position.lng
+      this.dataForm.city = position.city
+      this.setMap()
+    },
+    showErr () {
+      console.log('定位失败')
+      this.getMyLocation() // 定位失败再请求定位，测试使用
+    },
+    setMap () {
+      const that = this
+      var markerList = []
+      var radiusList = []
+      // 步骤：定义map变量 调用 qq.maps.Map() 构造函数   获取地图显示容器
+      // 设置地图中心点
+      var myLatlng = new qq.maps.LatLng(
+        this.dataForm.latitude,
+        this.dataForm.longitude
+      )
+      // 定义工厂模式函数
+      var zoom = this.capacity()
+      var myOptions = {
+        zoom: zoom, // 设置地图缩放级别
+        center: myLatlng, // 设置中心点样式
+        mapTypeId: qq.maps.MapTypeId.ROADMAP // 设置地图样式详情参见MapType
+      }
+      // 获取dom元素添加地图信息
+      var map = new qq.maps.Map(
+        document.getElementById('container'),
+        myOptions
+      )
+      // 设置圆形
+      var radius = new qq.maps.Circle({
+        center: new qq.maps.LatLng(
+          this.dataForm.latitude,
+          this.dataForm.longitude
+        ),
+        radius: this.dataForm.radius,
+        map: map
+      })
+      radiusList.push(radius)
+      var marker = new qq.maps.Marker({
+        position: myLatlng,
+        map: map
+      })
+      markerList.push(marker)
+      // 添加监听事件   获取鼠标单击事件
+      qq.maps.event.addListener(map, 'click', function (event) {
+        that.cleanMarkRadius(markerList, radiusList)
+        that.getAddress(event.latLng.lat, event.latLng.lng)
+        var myLatlng = new qq.maps.LatLng(event.latLng.lat, event.latLng.lng)
+        map.setCenter(myLatlng)
+        var marker = new qq.maps.Marker({
+          position: event.latLng,
+          map: map
+        })
+        // 设置圆形
+        var radius = new qq.maps.Circle({
+          center: new qq.maps.LatLng(event.latLng.lat, event.latLng.lng),
+          radius: that.dataForm.radius,
+          map: map
+        })
+        radiusList.push(radius)
+        markerList.push(marker)
+        qq.maps.event.addListener(map, 'click', function (event) {
+          that.cleanMarkRadius(markerList, radiusList)
+        })
+        qq.maps.event.addListener(marker, 'click', function (event) {
+          that.addressCheckHandle()
+        })
+      })
+      // 调用地址解析类
+      searchService = new qq.maps.SearchService({
+        complete: function (result) {
+          var pois = result.detail.pois
+          if (pois == null || pois.length <= 0) {
+            alert('未找到地址!')
+            that.getAddress(that.dataForm.latitude, that.dataForm.longitude)
+            return
+          }
+          map.setCenter(pois[0].latLng)
+          that.getAddress(pois[0].latLng.lat, pois[0].latLng.lng)
+          var marker = new qq.maps.Marker({
+            map: map,
+            position: pois[0].latLng
+          })
+          // 设置圆形
+          var radius = new qq.maps.Circle({
+            center: new qq.maps.LatLng(pois[0].latLng.lat, pois[0].latLng.lng),
+            radius: that.dataForm.radius,
+            map: map
+          })
+          radiusList.push(radius)
+          markerList.push(marker)
+          that.cleanMarkRadius(markerList, radiusList)
+          qq.maps.event.addListener(marker, 'click', function (event) {
+            that.addressCheckHandle()
+          })
+        }
+      })
+    },
+    searchKeyword () {
+      searchService.setLocation(this.dataForm.city)
+      searchService.search(this.dataForm.address)
+    },
+    addressCheckHandle () {
+      if (this.dataForm.address === '' || !(this.dataForm.latitude > 0)) {
+        alert('请选择地址!')
+        return
+      }
+      this.addressCheckVisible = true
+      this.$nextTick(() => {
+        this.$refs.addressCheck.init(this.dataForm)
+      })
+    },
+    checkOk (checkOk) {
+      if (checkOk) {
+        this.$emit('position', this.dataForm)
+        this.visible = false
+      }
+    },
+    cleanMarkRadius (markerList, radiusList) {
+      if (markerList) {
+        if (markerList.length > 1) {
+          for (var i4 = 0; i4 < markerList.length - 1; i4++) {
+            markerList[i4].setMap(null)
+          }
+        } else {
+          for (var i3 = 0; i3 < markerList.length; i3++) {
+            markerList[i3].setMap(null)
+          }
+        }
+      }
+      if (radiusList) {
+        if (radiusList.length > 1) {
+          for (var i2 = 0; i2 < radiusList.length - 1; i2++) {
+            radiusList[i2].setMap(null)
+          }
+        } else {
+          for (var i1 = 0; i1 < markerList.length; i1++) {
+            radiusList[i1].setMap(null)
+          }
+        }
+      }
+    },
+    capacity () {
+      if (this.dataForm.radius > 0 && this.dataForm.radius <= 25) {
+        return 18
+      } else if (this.dataForm.radius > 25 && this.dataForm.radius <= 50) {
+        return 17
+      } else if (this.dataForm.radius > 50 && this.dataForm.radius <= 100) {
+        return 16
+      } else if (this.dataForm.radius > 100 && this.dataForm.radius <= 200) {
+        return 15
+      } else if (this.dataForm.radius > 200 && this.dataForm.radius <= 500) {
+        return 14
+      } else if (this.dataForm.radius > 500 && this.dataForm.radius <= 1000) {
+        return 13
+      } else if (this.dataForm.radius > 1000 && this.dataForm.radius <= 2000) {
+        return 12
+      } else if (this.dataForm.radius > 2000 && this.dataForm.radius <= 5000) {
+        return 11
+      }
+    }
+  },
+  components: {
+    AddressCheck
+  }
+}
+</script>
diff --git a/src/views/modules/heart/volunteerrank-add-or-update.vue b/src/views/modules/heart/volunteerrank-add-or-update.vue
new file mode 100644
index 0000000..596a6b3
--- /dev/null
+++ b/src/views/modules/heart/volunteerrank-add-or-update.vue
@@ -0,0 +1,187 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="排名" prop="sort">
+          <el-input v-model="dataForm.sort" placeholder="排名"></el-input>
+      </el-form-item>
+          <el-form-item label="志愿者ID" prop="volunteerId">
+          <el-input v-model="dataForm.volunteerId" placeholder="志愿者ID"></el-input>
+      </el-form-item>
+          <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="头像" prop="faceImg">
+          <el-input v-model="dataForm.faceImg" placeholder="头像"></el-input>
+      </el-form-item>
+          <el-form-item label="用户名" prop="nickname">
+          <el-input v-model="dataForm.nickname" placeholder="用户名"></el-input>
+      </el-form-item>
+          <el-form-item label="是否党员(0-否，1-是)" prop="partyFlag">
+          <el-input v-model="dataForm.partyFlag" placeholder="是否党员(0-否，1-是)"></el-input>
+      </el-form-item>
+          <el-form-item label="爱心时长(单位：小时)" prop="kindnessTime">
+          <el-input v-model="dataForm.kindnessTime" placeholder="爱心时长(单位：小时)"></el-input>
+      </el-form-item>
+          <el-form-item label="参加次数" prop="participationNum">
+          <el-input v-model="dataForm.participationNum" placeholder="参加次数"></el-input>
+      </el-form-item>
+          <el-form-item label="排行生成日期" prop="generateDate">
+          <el-input v-model="dataForm.generateDate" placeholder="排行生成日期"></el-input>
+      </el-form-item>
+          <el-form-item label="是否显示(0-不显示，1-显示)" prop="showFlag">
+          <el-input v-model="dataForm.showFlag" placeholder="是否显示(0-不显示，1-显示)"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标志" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标志"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        sort: '',
+        volunteerId: '',
+        userId: '',
+        faceImg: '',
+        nickname: '',
+        partyFlag: '',
+        kindnessTime: '',
+        participationNum: '',
+        generateDate: '',
+        showFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        volunteerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        faceImg: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nickname: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        kindnessTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        participationNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        generateDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        showFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/heart/volunteerrank/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/volunteerrank/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/heart/volunteerrank.vue b/src/views/modules/heart/volunteerrank.vue
new file mode 100644
index 0000000..009827b
--- /dev/null
+++ b/src/views/modules/heart/volunteerrank.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__volunteerrank}">
+      <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 @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>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:volunteerrank:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="volunteerId" label="志愿者ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="faceImg" label="头像" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickname" label="用户名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="partyFlag" label="是否党员(0-否，1-是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="kindnessTime" label="爱心时长(单位：小时)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="participationNum" label="参加次数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="generateDate" label="排行生成日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="showFlag" label="是否显示(0-不显示，1-显示)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标志" 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">
+            <el-button v-if="$hasPermission('heart:volunteerrank:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('heart:volunteerrank:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './volunteerrank-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/volunteerrank/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/volunteerrank',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/points/volunteer-points-log.vue b/src/views/modules/points/volunteer-points-log.vue
new file mode 100644
index 0000000..5687e09
--- /dev/null
+++ b/src/views/modules/points/volunteer-points-log.vue
@@ -0,0 +1,122 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    title="积分记录"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
+      <el-form-item label="积分行为">
+        <el-select v-model="dataForm.behaviorCode" placeholder="全部" clearable @change="queryByBehaviorCode">
+            <el-option
+              v-for="item in behaviorTypeList"
+              :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue">
+            </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-table  v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
+      <el-table-column type="index" width="50" label="序号"></el-table-column>
+      <el-table-column prop="operationDesc" label="操作描述" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="behaviorCode" label="积分行为" header-align="center" align="center" :formatter="showBehaviorCodeFormatter"></el-table-column>
+      <el-table-column prop="operationTime" label="操作时间" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="points" label="积分变化" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="operationType" label="操作类型" header-align="center" align="center" :formatter="showOperationTypeFormatter"></el-table-column>
+      <el-table-column prop="lavePoints" label="剩余积分" header-align="center" align="center"></el-table-column>
+    </el-table>
+    <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/points/pointslogs/page',
+        getDataListIsPage: true
+      },
+      visible: false,
+      dataForm: {
+        volunteerId: '',
+        behaviorCode: ''
+      },
+      behaviorTypeList: [],
+      operationTypeList: []
+    }
+  },
+  created () {
+    this.getOperationTypeList()
+    this.getBehaviorTypeList()
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.volunteerId) {
+          this.getDataList()
+        }
+      })
+      this.dataForm.behaviorCode = ''
+    },
+    // 获取下拉框值
+    getOperationTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/pointsrule_operation_type`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.operationTypeList = res.data
+        })
+        .catch(() => {})
+    },
+    showOperationTypeFormatter: function (row, column) {
+      if (row.operationType) {
+        let dict = this.operationTypeList.filter(item => item.dictValue === row.operationType)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    getBehaviorTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/pointsrule_behavior`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.behaviorTypeList = res.data
+        })
+        .catch(() => {})
+    },
+    showBehaviorCodeFormatter: function (row, column) {
+      if (row.behaviorCode) {
+        let dict = this.behaviorTypeList.filter(item => item.dictValue === row.behaviorCode)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    queryByBehaviorCode () {
+      this.getDataList()
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/points/volunteerinfo-points-adjust.vue b/src/views/modules/points/volunteerinfo-points-adjust.vue
new file mode 100644
index 0000000..31959c2
--- /dev/null
+++ b/src/views/modules/points/volunteerinfo-points-adjust.vue
@@ -0,0 +1,200 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="积分调整"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :label-width="$i18n.locale === 'en-US' ? '100px' : '100px'"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm">
+      <el-form-item label="主键 :"
+                    v-if="false">
+        <div>{{dataForm.id}}</div>
+      </el-form-item>
+      <el-form-item label="userId :"
+                    v-if="false">
+        <div>{{dataForm.userId}}</div>
+      </el-form-item>
+      <el-form-item label="姓名 :">
+        <div>{{dataForm.realName}}</div>
+      </el-form-item>
+      <el-form-item label="性别 :">
+        <div v-if="dataForm.sex === '1'">男</div>
+        <div v-if="dataForm.sex === '0'">女</div>
+        <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
+      </el-form-item>
+      <el-form-item label="出生日期 :">
+        <el-date-picker v-model="dataForm.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd"
+                        readonly>
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="手机号 :">
+        <div>{{dataForm.mobile}}</div>
+      </el-form-item>
+      <el-form-item label="积分 :">
+        <div>{{dataForm.points}}</div>
+      </el-form-item>
+      <el-form-item label="积分行为 :"
+                    prop="behaviorCode">
+        <el-select v-model="dataForm.behaviorCode">
+          <el-option v-for="item in behaviorTypeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调整原因 :"
+                    prop="adjustReason">
+        <el-input v-model="dataForm.adjustReason"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  placeholder="不超过500字"></el-input>
+      </el-form-item>
+      <el-form-item label="操作类型 :"
+                    prop="operationType">
+        <el-radio-group v-model="dataForm.operationType">
+          <el-radio :label="1">加积分</el-radio>
+          <el-radio :label="0">减积分</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="积分调整 :"
+                    prop="operatePoints">
+        <el-input-number v-model="dataForm.operatePoints"
+                         :min="0"></el-input-number>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        realName: '',
+        nickname: '',
+        faceImg: '',
+        sex: '',
+        birthday: '',
+        mobile: '',
+        points: '',
+        adjustReason: '',
+        operationType: '',
+        operatePoints: '',
+        behaviorCode: ''
+      },
+      behaviorTypeList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        behaviorCode: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        adjustReason: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        operationType: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        operatePoints: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getBehaviorTypeList()
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.dataForm.adjustReason = ''
+          this.dataForm.operationType = ''
+          this.dataForm.operatePoints = ''
+          this.dataForm.behaviorCode = ''
+        }
+      })
+    },
+    getInfo () {
+      this.$http.get(`/app-user/volunteerinfo/queryById/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate(valid => {
+        if (!valid) {
+          return false
+        }
+        this.$http['post'](
+          '/points/pointslogs/confirmAdjustPoint', this.dataForm).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+          }).catch(() => { })
+      }, 1000, { 'leading': true, 'trailing': false })
+    }),
+    getBehaviorTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/pointsrule_behavior`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.behaviorTypeList = res.data
+        })
+        .catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/volunteerinfo-add-or-update.vue b/src/views/modules/user/volunteerinfo-add-or-update.vue
new file mode 100644
index 0000000..19e14e6
--- /dev/null
+++ b/src/views/modules/user/volunteerinfo-add-or-update.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="realName">
+          <el-input v-model="dataForm.realName" placeholder="姓名"></el-input>
+      </el-form-item>
+       <el-form-item label="性别" prop="sex">
+          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
+      </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证" prop="identityNo">
+          <el-input v-model="dataForm.identityNo" placeholder="身份证"></el-input>
+      </el-form-item>
+          <el-form-item label="出生日期" prop="birthday">
+          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
+      </el-form-item>
+          <el-form-item label="爱心时长" prop="kindnessTime">
+          <el-input v-model="dataForm.kindnessTime" placeholder="爱心时长"></el-input>
+      </el-form-item>
+          <el-form-item label="参加活动次数" prop="participationNum">
+          <el-input v-model="dataForm.participationNum" placeholder="参加活动次数"></el-input>
+      </el-form-item>
+          <el-form-item label="积分" prop="points">
+          <el-input v-model="dataForm.points" placeholder="积分"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="审批状态" prop="auditStatus">
+          <el-input v-model="dataForm.auditStatus" placeholder="审批状态"></el-input>
+      </el-form-item>
+          <el-form-item label="居住地址" prop="address">
+          <el-input v-model="dataForm.address" placeholder="居住地址"></el-input>
+      </el-form-item>
+          <el-form-item label="自我介绍" prop="introduce">
+          <el-input v-model="dataForm.introduce" placeholder="自我介绍"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        realName: '',
+        sex: '',
+        birthday: '',
+        mobile: '',
+        identityNo: '',
+        kindnessTime: '',
+        participationNum: '',
+        points: '',
+        gridId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        road: '',
+        villageName: '',
+        dwellingPlace: '',
+        address: '',
+        introduce: '',
+        registTime: '',
+        auditStatus: '',
+        failureReason: '',
+        auditTime: '',
+        auditor: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        realName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/volunteerinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/volunteerinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/user/volunteerinfo-check.vue b/src/views/modules/user/volunteerinfo-check.vue
new file mode 100644
index 0000000..fea42c7
--- /dev/null
+++ b/src/views/modules/user/volunteerinfo-check.vue
@@ -0,0 +1,183 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="志愿者审核"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             v-if="clickStatus === 1"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="审核 :"
+                    prop="auditStatus">
+        <template>
+          <el-radio v-model="dataForm.auditStatus"
+                    label="1">通过</el-radio>
+          <el-radio v-model="dataForm.auditStatus"
+                    label="2">不通过</el-radio>
+        </template>
+      </el-form-item>
+      <el-form-item label="填写原因 :"
+                    prop="failureReason">
+        <el-input v-model="dataForm.failureReason"
+                  maxlength="50"
+                  show-word-limit
+                  placeholder="请您填写取消原因，50字以内"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             v-if="clickStatus === 2"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="填写原因"
+                    prop="failureReason">
+        <el-input v-model="dataForm.failureReason"
+                  maxlength="50"
+                  show-word-limit
+                  placeholder="请您填写拉入黑名单原因，50字以内"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer"
+              v-if="clickStatus === 1">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+    <template slot="footer"
+              v-if="clickStatus === 2">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="blackListSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '', // 志愿者表id
+        auditStatus: '',
+        failureReason: '',
+        tagIds: []
+      },
+      clickStatus: '',
+      tagOptions: [],
+      userGridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        auditStatus: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        failureReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          // data.dataForm.id = this.dataForm.id
+          // this.getInfo()
+        }
+      })
+    },
+    // 审核
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs['dataForm'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+          let postData = {
+            id: this.dataForm.id,
+            auditStatus: this.dataForm.auditStatus,
+            failureReason: this.dataForm.failureReason
+          }
+          this.$http['post'](
+            '/app-user/volunteerinfo/volunteerInfoCheck',
+            postData
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            })
+            .catch(() => { })
+        })
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    // 拉黑
+    blackListSubmitHandle: debounce(
+      function () {
+        this.$refs['dataForm'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+          let postData = {
+            id: this.dataForm.id,
+            auditStatus: '3',
+            failureReason: this.dataForm.failureReason
+          }
+          this.$http['post'](
+            '/app-user/volunteerinfo/volunteerInfoCheck',
+            postData
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            })
+            .catch(() => { })
+        })
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/volunteerinfo-detail.vue b/src/views/modules/user/volunteerinfo-detail.vue
new file mode 100644
index 0000000..f1dd08e
--- /dev/null
+++ b/src/views/modules/user/volunteerinfo-detail.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    title="用户详情"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '130px'"
+    >
+      <el-form-item label="姓名 :" prop="realName" v-if="dataForm.realName">
+        <span>{{dataForm.realName}}</span>
+      </el-form-item>
+      <el-form-item label="性别 :" prop="sex">
+        <div v-if="dataForm.sex === '1'">男</div>
+        <div v-if="dataForm.sex === '0'">女</div>
+        <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
+      </el-form-item>
+      <el-form-item label="出生日期 :" prop="birthdayString">
+        <span>{{dataForm.birthdayString}}</span>
+      </el-form-item>
+      <el-form-item label="手机号 :" prop="mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="身份证号 :" prop="identityNo">
+        <span>{{dataForm.identityNo}}</span>
+      </el-form-item>
+      <el-form-item label="地址 :" prop="address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <el-form-item label="自我介绍 :" prop="introduce">
+        <span>{{dataForm.introduce}}</span>
+      </el-form-item>
+      <el-form-item label="积分 :" prop="points">
+        <span>{{dataForm.points}}</span>
+      </el-form-item>
+      <el-form-item label="成为志愿者时间 :" prop="registTimeString">
+        <span>{{dataForm.registTimeString}}</span>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        realName: '',
+        sex: '',
+        birthday: '',
+        mobile: '',
+        identityNo: '',
+        address: '',
+        introduce: '',
+        points: '',
+        registTime: '',
+        tagIds: []
+      },
+      tagOptions: [],
+      userGridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {}
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo: debounce(
+      function () {
+        this.$http
+          .get(`/app-user/volunteerinfo/getVolunteerDetail/${this.dataForm.id}`)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.dataForm = {
+              ...this.dataForm,
+              ...res.data
+            }
+            this.dataForm.tagIds = []
+          })
+          .catch(() => {})
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
new file mode 100644
index 0000000..4fc95d5
--- /dev/null
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -0,0 +1,286 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-epdc__user}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.realName"
+                    placeholder="姓名"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="手机号"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <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 type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <!-- <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
+        <!-- <el-table-column prop="userId" label="用户ID" 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"
+                         width="140"
+                         label="性别"
+                         :formatter="sexState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="birthdayString"
+                         width="140"
+                         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="registTimeString"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="auditStatus"
+                         label="状态"
+                         :formatter="auditStatusState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="kindnessTime"
+                         label="爱心时长"
+                         :formatter="kindnessTimeState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="points"
+                         label="积分"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="200">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       size="small"
+                       @click="userDetailHandle(scope.row.id)">查看</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="checkHandle(scope.row.id,1)">审批</el-button>
+            <!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->
+            <el-button type="text"
+                       size="small"
+                       @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="pointsLogs(scope.row.id)">积分记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle"></el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+      <!-- 弹窗, 查看 -->
+      <volunteerinfo-detail v-if="volunteerinfoDetailVisible"
+                            ref="volunteerinfoDetail"
+                            @refreshDataList="getDataList"></volunteerinfo-detail>
+      <!-- 弹窗, 审批 -->
+      <volunteerinfo-check v-if="volunteerinfoCheckVisible"
+                           ref="volunteerinfoCheck"
+                           @refreshDataList="getDataList"></volunteerinfo-check>
+      <!-- 弹窗, 积分调整 -->
+      <volunteerinfo-points-adjust v-if="volunteerinfoPointsAdjustVisible"
+                                   ref="volunteerinfoPointsAdjust"
+                                   @refreshDataList="getDataList"></volunteerinfo-points-adjust>
+      <!-- 积分记录 -->
+      <volunteer-points-log v-if="volunteerPointsLogVisible"
+                            ref="volunteerPointsLog"
+                            @refreshDataList="getDataList"></volunteer-points-log>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './volunteerinfo-add-or-update'
+import volunteerinfoDetail from './volunteerinfo-detail'
+import volunteerinfoPointsAdjust from '../points/volunteerinfo-points-adjust'
+import volunteerPointsLog from '../points/volunteer-points-log'
+import volunteerinfoCheck from './volunteerinfo-check'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/volunteerinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/volunteerinfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        userId: '',
+        realName: '',
+        sex: '',
+        birthday: '',
+        mobile: '',
+        identityNo: '',
+        registTime: '',
+        auditStatus: '',
+        kindnessTime: '',
+        points: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        streetId: null,
+        communityId: null,
+        gridId: null,
+        leaderFlag: '0'
+      },
+      auditStatusType: 0,
+      deptIdList: [],
+      options: [],
+      volunteerinfoDetailVisible: false,
+      volunteerinfoPointsAdjustVisible: false,
+      volunteerPointsLogVisible: false,
+      volunteerinfoCheckVisible: false
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+  },
+  watch: {
+    deptIdList: function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  methods: {
+    // 查看
+    userDetailHandle (userId) {
+      this.volunteerinfoDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerinfoDetail.dataForm.id = userId
+        this.$refs.volunteerinfoDetail.init()
+      })
+    },
+    // 审批
+    checkHandle (userId, clickStatus) {
+      this.volunteerinfoCheckVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerinfoCheck.dataForm.id = userId
+        this.$refs.volunteerinfoCheck.clickStatus = clickStatus
+        this.$refs.volunteerinfoCheck.init()
+      })
+    },
+    // 积分调整
+    pointsAdjustHandle (id) {
+      this.volunteerinfoPointsAdjustVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerinfoPointsAdjust.dataForm.id = id
+        this.$refs.volunteerinfoPointsAdjust.init()
+      })
+    },
+    // 积分记录
+    pointsLogs (id) {
+      this.volunteerPointsLogVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerPointsLog.dataForm.volunteerId = id
+        this.$refs.volunteerPointsLog.init()
+      })
+    },
+    // 性别状态转换
+    sexState: function (row, column) {
+      let state = row.sex
+      if (state === '0') {
+        return '女'
+      } else if (state === '1') {
+        return '男'
+      }
+    },
+    // 爱心时长分钟转小时
+    kindnessTimeState: function (row, column) {
+      var state = row.kindnessTime
+      if (state === 0) {
+        return '0小时'
+      } else {
+        return state + '小时'
+      }
+    },
+    // 审批状态转换
+    auditStatusState: function (row, column) {
+      let state = row.auditStatus
+      if (state === '0') {
+        return '自动通过'
+      } else if (state === '1') {
+        return '手动审核通过'
+      } else if (state === '2') {
+        return '手动审核不通过'
+      } else if (state === '3') {
+        return '已拉入黑名单'
+      }
+    }
+  },
+  components: {
+    AddOrUpdate,
+    volunteerinfoDetail,
+    volunteerinfoPointsAdjust,
+    volunteerinfoCheck,
+    volunteerPointsLog
+  }
+}
+</script>