From 00e4826e147fde0ee281a07406d4620889ef9836 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 23 Sep 2021 16:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90-=E7=8E=8B=E5=85=AC=E5=B3=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acitveproductdept-add-or-update.vue       | 131 +++++++++++
 .../modules/points/acitveproductdept.vue      |  73 ++++++
 .../acitveproductexchange-add-or-update.vue   | 187 +++++++++++++++
 .../modules/points/acitveproductexchange.vue  |  81 +++++++
 .../acitveproductinfo-add-or-update.vue       | 215 ++++++++++++++++++
 .../modules/points/acitveproductinfo.vue      |  85 +++++++
 .../points/activepointlog-add-or-update.vue   | 166 ++++++++++++++
 src/views/modules/points/activepointlog.vue   |  78 +++++++
 8 files changed, 1016 insertions(+)
 create mode 100644 src/views/modules/points/acitveproductdept-add-or-update.vue
 create mode 100644 src/views/modules/points/acitveproductdept.vue
 create mode 100644 src/views/modules/points/acitveproductexchange-add-or-update.vue
 create mode 100644 src/views/modules/points/acitveproductexchange.vue
 create mode 100644 src/views/modules/points/acitveproductinfo-add-or-update.vue
 create mode 100644 src/views/modules/points/acitveproductinfo.vue
 create mode 100644 src/views/modules/points/activepointlog-add-or-update.vue
 create mode 100644 src/views/modules/points/activepointlog.vue

diff --git a/src/views/modules/points/acitveproductdept-add-or-update.vue b/src/views/modules/points/acitveproductdept-add-or-update.vue
new file mode 100644
index 00000000..07f1d260
--- /dev/null
+++ b/src/views/modules/points/acitveproductdept-add-or-update.vue
@@ -0,0 +1,131 @@
+<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="productId">
+          <el-input v-model="dataForm.productId" placeholder="商品ID"></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="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" 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>
+    <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: '',
+        productId: '',
+        deptId: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        productId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/points/acitveproductdept/${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']('/points/acitveproductdept/', 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/points/acitveproductdept.vue b/src/views/modules/points/acitveproductdept.vue
new file mode 100644
index 00000000..0a65c27f
--- /dev/null
+++ b/src/views/modules/points/acitveproductdept.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-points__acitveproductdept}">
+      <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('points:acitveproductdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('points:acitveproductdept: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="id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productId" label="商品ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('points:acitveproductdept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('points:acitveproductdept: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 './acitveproductdept-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/points/acitveproductdept/page',
+        getDataListIsPage: true,
+        deleteURL: '/points/acitveproductdept',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/points/acitveproductexchange-add-or-update.vue b/src/views/modules/points/acitveproductexchange-add-or-update.vue
new file mode 100644
index 00000000..b657169e
--- /dev/null
+++ b/src/views/modules/points/acitveproductexchange-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="userId">
+          <el-input v-model="dataForm.userId" placeholder="兑换人id"></el-input>
+      </el-form-item>
+          <el-form-item label="兑换人姓名" prop="userName">
+          <el-input v-model="dataForm.userName" placeholder="兑换人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="商品id" prop="productId">
+          <el-input v-model="dataForm.productId" placeholder="商品id"></el-input>
+      </el-form-item>
+          <el-form-item label="商品名称" prop="productName">
+          <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
+      </el-form-item>
+          <el-form-item label="兑换时间" prop="exchangeTime">
+          <el-input v-model="dataForm.exchangeTime" placeholder="兑换时间"></el-input>
+      </el-form-item>
+          <el-form-item label="兑换状态0：未核销，1：已核销" prop="exchangeState">
+          <el-input v-model="dataForm.exchangeState" placeholder="兑换状态0：未核销，1：已核销"></el-input>
+      </el-form-item>
+          <el-form-item label="核销人(工作人员)" prop="checkSysUserId">
+          <el-input v-model="dataForm.checkSysUserId" placeholder="核销人(工作人员)"></el-input>
+      </el-form-item>
+          <el-form-item label="核销二维码地址" prop="qrCodeUrl">
+          <el-input v-model="dataForm.qrCodeUrl" placeholder="核销二维码地址"></el-input>
+      </el-form-item>
+          <el-form-item label="核销人姓名(工作人员)" prop="checkSysUserName">
+          <el-input v-model="dataForm.checkSysUserName" placeholder="核销人姓名(工作人员)"></el-input>
+      </el-form-item>
+          <el-form-item label="核销时间" prop="checkTime">
+          <el-input v-model="dataForm.checkTime" 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="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: '',
+        userId: '',
+        userName: '',
+        productId: '',
+        productName: '',
+        exchangeTime: '',
+        exchangeState: '',
+        checkSysUserId: '',
+        qrCodeUrl: '',
+        checkSysUserName: '',
+        checkTime: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        productId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        productName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        exchangeTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        exchangeState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        checkSysUserId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        qrCodeUrl: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        checkSysUserName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        checkTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/points/acitveproductexchange/${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']('/points/acitveproductexchange/', 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/points/acitveproductexchange.vue b/src/views/modules/points/acitveproductexchange.vue
new file mode 100644
index 00000000..fd0443a5
--- /dev/null
+++ b/src/views/modules/points/acitveproductexchange.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-points__acitveproductexchange}">
+      <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('points:acitveproductexchange:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('points:acitveproductexchange: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="兑换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="userName" label="兑换人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productId" label="商品id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productName" label="商品名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="exchangeTime" label="兑换时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="exchangeState" label="兑换状态0：未核销，1：已核销" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkSysUserId" label="核销人(工作人员)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="qrCodeUrl" label="核销二维码地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkSysUserName" label="核销人姓名(工作人员)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkTime" label="核销时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('points:acitveproductexchange:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('points:acitveproductexchange: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 './acitveproductexchange-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/points/acitveproductexchange/page',
+        getDataListIsPage: true,
+        deleteURL: '/points/acitveproductexchange',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/points/acitveproductinfo-add-or-update.vue b/src/views/modules/points/acitveproductinfo-add-or-update.vue
new file mode 100644
index 00000000..6f98a25f
--- /dev/null
+++ b/src/views/modules/points/acitveproductinfo-add-or-update.vue
@@ -0,0 +1,215 @@
+<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="name">
+          <el-input v-model="dataForm.name" placeholder="商品名称"></el-input>
+      </el-form-item>
+          <el-form-item label="描述" prop="content">
+          <el-input v-model="dataForm.content" 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="显示图片" prop="headPic">
+          <el-input v-model="dataForm.headPic" placeholder="显示图片"></el-input>
+      </el-form-item>
+          <el-form-item label="兑换开始时间" prop="startTime">
+          <el-input v-model="dataForm.startTime" placeholder="兑换开始时间"></el-input>
+      </el-form-item>
+          <el-form-item label="兑换结束时间" prop="endTime">
+          <el-input v-model="dataForm.endTime" placeholder="兑换结束时间"></el-input>
+      </el-form-item>
+          <el-form-item label="上架状态1:上架，0：下架" prop="state">
+          <el-input v-model="dataForm.state" placeholder="上架状态1:上架，0：下架"></el-input>
+      </el-form-item>
+          <el-form-item label="库存数量" prop="amount">
+          <el-input v-model="dataForm.amount" placeholder="库存数量"></el-input>
+      </el-form-item>
+          <el-form-item label="部门名称" prop="deptName">
+          <el-input v-model="dataForm.deptName" 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="parentDeptIds">
+          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
+      </el-form-item>
+          <el-form-item label="父所有部门名称" prop="parentDeptNames">
+          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门ID" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" 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="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: '',
+        name: '',
+        content: '',
+        points: '',
+        headPic: '',
+        startTime: '',
+        endTime: '',
+        state: '',
+        amount: '',
+        deptName: '',
+        deptId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        points: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        headPic: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        startTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        amount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/points/acitveproductinfo/${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']('/points/acitveproductinfo/', 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/points/acitveproductinfo.vue b/src/views/modules/points/acitveproductinfo.vue
new file mode 100644
index 00000000..f5cfedf4
--- /dev/null
+++ b/src/views/modules/points/acitveproductinfo.vue
@@ -0,0 +1,85 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-points__acitveproductinfo}">
+      <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('points:acitveproductinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('points:acitveproductinfo: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="商品id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="name" label="商品名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="content" 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="headPic" label="显示图片" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startTime" label="兑换开始时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endTime" label="兑换结束时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="state" label="上架状态1:上架，0：下架" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="amount" label="库存数量" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="父所有部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('points:acitveproductinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('points:acitveproductinfo: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 './acitveproductinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/points/acitveproductinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/points/acitveproductinfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/points/activepointlog-add-or-update.vue b/src/views/modules/points/activepointlog-add-or-update.vue
new file mode 100644
index 00000000..950b2f0e
--- /dev/null
+++ b/src/views/modules/points/activepointlog-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="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户id"></el-input>
+      </el-form-item>
+          <el-form-item label="积分操作类型（0-减积分，1-加积分）" prop="operationType">
+          <el-input v-model="dataForm.operationType" placeholder="积分操作类型（0-减积分，1-加积分）"></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="操作编码" prop="operationCode">
+          <el-input v-model="dataForm.operationCode" placeholder="操作编码"></el-input>
+      </el-form-item>
+          <el-form-item label="操作描述" prop="operationDesc">
+          <el-input v-model="dataForm.operationDesc" 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="lavePoints">
+          <el-input v-model="dataForm.lavePoints" 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="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: '',
+        userId: '',
+        operationType: '',
+        points: '',
+        operationCode: '',
+        operationDesc: '',
+        operationTime: '',
+        lavePoints: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        points: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationDesc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lavePoints: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/points/activepointlog/${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']('/points/activepointlog/', 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/points/activepointlog.vue b/src/views/modules/points/activepointlog.vue
new file mode 100644
index 00000000..54037b0f
--- /dev/null
+++ b/src/views/modules/points/activepointlog.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-points__activepointlog}">
+      <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('points:activepointlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('points:activepointlog: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="行为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-加积分）" 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="operationCode" label="操作编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="operationDesc" 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="lavePoints" label="剩余积分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('points:activepointlog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('points:activepointlog: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 './activepointlog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/points/activepointlog/page',
+        getDataListIsPage: true,
+        deleteURL: '/points/activepointlog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>