From 81fe09b6339c743856c7a2b89d07296d2021748b Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 17 Dec 2019 18:49:35 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.5=E7=89=88=E6=9C=AC=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=8A=9F=E8=83=BD,=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9EH5=E6=94=AF=E4=BB=98,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=85=B6=E4=BB=96bug,=E5=AF=BC=E5=87=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                            |   9 +-
 src/api/yxStoreSeckill.js            |  24 ++++
 src/icons/svg/seckill.svg            |   1 +
 src/views/activity/seckill/form.vue  | 206 +++++++++++++++++++++++++++
 src/views/activity/seckill/index.vue | 165 +++++++++++++++++++++
 src/views/shop/goods/index.vue       |  40 +++++-
 src/views/shop/order/detail.vue      |   2 +-
 src/views/shop/order/index.vue       |   2 +-
 src/views/shop/set/seckill.vue       | 118 +++++++++++++++
 src/views/shop/set/seckillform.vue   | 101 +++++++++++++
 src/views/shop/set/signform.vue      |   4 +-
 11 files changed, 663 insertions(+), 9 deletions(-)
 create mode 100644 src/api/yxStoreSeckill.js
 create mode 100644 src/icons/svg/seckill.svg
 create mode 100644 src/views/activity/seckill/form.vue
 create mode 100644 src/views/activity/seckill/index.vue
 create mode 100644 src/views/shop/set/seckill.vue
 create mode 100644 src/views/shop/set/seckillform.vue

diff --git a/README.md b/README.md
index 726a254..7f2c822 100644
--- a/README.md
+++ b/README.md
@@ -143,13 +143,14 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2
   - 1.8、修复新增配置数据有时候不成功问题等
 - 1.4.1个人中心新增账单流水
 - yshop1.4.2 发布更新如下：
-   -1.商品新增多图评价
-   -2.订单新增快递查询
--1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql
+   - 1.商品新增多图评价
+   - 2.订单新增快递查询
+- 1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql
+- 1.4.4版本，新增模板消息通知、H5端商家管理发货修改及其列表时间显示修复
 
 	
 #### 反馈交流
-- QQ交流群：907721261
+- QQ交流群：964166879
 - 喜欢这个商城后台的小伙伴留下你的小星星啦,star,star哦！
 
 ####  特别鸣谢
diff --git a/src/api/yxStoreSeckill.js b/src/api/yxStoreSeckill.js
new file mode 100644
index 0000000..28fd6dc
--- /dev/null
+++ b/src/api/yxStoreSeckill.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreSeckill',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreSeckill/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreSeckill',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/icons/svg/seckill.svg b/src/icons/svg/seckill.svg
new file mode 100644
index 0000000..dcd59e9
--- /dev/null
+++ b/src/icons/svg/seckill.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576470801832" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1496" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M383.607808 191.804416c0-105.993216-85.8624-191.804416-191.803392-191.804416-105.94304 0-191.804416 85.8112-191.804416 191.804416 0 105.889792 47.500288 191.803392 153.443328 191.803392C178.866176 281.212928 278.463488 204.440576 383.607808 191.804416zM779.575296 799.916032c55.960576-63.178752 89.934848-146.275328 89.934848-237.290496 0-197.799936-160.284672-358.034432-358.033408-358.034432-197.748736 0-358.034432 160.234496-358.034432 358.034432 0 82.710528 28.060672 158.877696 75.177984 219.50464L105.991168 983.79264c-7.59296 12.485632-3.0976 28.521472 10.089472 35.765248 13.136896 7.191552 30.01856 2.893824 37.61152-9.58976L266.78784 823.981056c64.012288 59.957248 150.060032 96.676864 244.68992 96.676864 86.647808 0 166.102016-30.785536 228.032512-82.008064l104.177664 171.318272c7.589888 12.483584 24.474624 16.782336 37.610496 9.58976 13.187072-7.243776 17.68448-23.278592 10.090496-35.765248L779.575296 799.916032zM668.115968 585.001984 511.476736 585.001984c-12.338176 0-22.377472-10.04032-22.377472-22.377472L489.099264 361.230336c0-12.388352 10.039296-22.376448 22.377472-22.376448 12.337152 0 22.377472 9.988096 22.377472 22.376448l0 179.016704 134.26176 0c12.338176 0 22.378496 9.988096 22.378496 22.378496C690.49344 574.961664 680.454144 585.001984 668.115968 585.001984zM831.15008 0c-105.942016 0-191.804416 85.8112-191.804416 191.804416 105.142272 12.63616 204.73856 89.408512 230.16448 191.803392 105.942016 0 153.443328-85.9136 153.443328-191.803392C1022.952448 85.8112 937.091072 0 831.15008 0z" p-id="1497"></path></svg>
\ No newline at end of file
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
new file mode 100644
index 0000000..e5cbf2f
--- /dev/null
+++ b/src/views/activity/seckill/form.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '开启秒杀'" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="秒杀名称" >
+        <el-input v-model="form.title" style="width: 500px;"/>
+      </el-form-item>
+      <el-form-item label="秒杀简介" >
+        <el-input v-model="form.info" style="width: 500px;"/>
+      </el-form-item>
+      <el-form-item label="单位" >
+        <el-input v-model="form.unitName" style="width: 500px;"/>
+      </el-form-item>
+      <el-form-item label="秒杀开始时间" >
+        <template>
+          <el-date-picker
+            v-model="form.startTimeDate"
+            type="datetime"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </template>
+      </el-form-item>
+      <el-form-item label="秒杀结束时间" >
+        <template>
+          <el-date-picker
+            v-model="form.endTimeDate"
+            type="datetime"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </template>
+      </el-form-item>
+      <el-form-item label="产品主图片" >
+        <pic-upload v-model="form.image" style="width: 500px;"/>
+      </el-form-item>
+      <el-form-item label="产品轮播图" >
+        <mulpic-upload v-model="form.images" style="width: 500px;"/>
+      </el-form-item>
+      <el-form-item label="秒杀价" >
+        <el-input-number v-model="form.price"/>
+      </el-form-item>
+      <el-form-item label="成本" >
+        <el-input-number v-model="form.cost" />
+      </el-form-item>
+      <el-form-item label="原价" >
+        <el-input-number v-model="form.otPrice"/>
+      </el-form-item>
+      <el-form-item label="库存" >
+        <el-input-number v-model="form.stock" />
+      </el-form-item>
+      <el-form-item label="虚拟销量" >
+        <el-input-number v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="排序" >
+        <el-input-number v-model="form.sort"/>
+      </el-form-item>
+      <el-form-item label="限购" >
+        <el-input-number v-model="form.num" />
+      </el-form-item>
+      <el-form-item label="邮费" >
+        <el-input-number v-model="form.postage"/>
+      </el-form-item>
+      <el-form-item label="是否包邮" >
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item>
+      <el-form-item label="活动状态" >
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <el-form-item label="详情" >
+        <editor v-model="form.description" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreSeckill'
+import editor from '../../components/Editor'
+import picUpload from '@/components/pic-upload'
+import mulpicUpload from '@/components/mul-pic-upload'
+export default {
+  components: { editor, picUpload, mulpicUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: 1,
+        isPostage: 1,
+        isHot: '',
+        isDel: 0,
+        num: '',
+        isShow: '',
+        startTimeDate: '',
+        endTimeDate: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: '',
+        isPostage: '',
+        isHot: '',
+        isDel: '',
+        num: '',
+        isShow: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/seckill/index.vue b/src/views/activity/seckill/index.vue
new file mode 100644
index 0000000..d4d9946
--- /dev/null
+++ b/src/views/activity/seckill/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="id"/>
+      <el-table-column prop="image" label="产品主图">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="产品标题"/>
+      <el-table-column prop="price" label="秒杀价"/>
+      <el-table-column prop="otPrice" label="原价"/>
+      <el-table-column prop="stock" label="库存"/>
+      <el-table-column prop="sales" label="销量"/>
+      <el-table-column prop="num" label="限购"/>
+      <el-table-column prop="statusStr" label="秒杀状态"/>
+      <el-table-column prop="stopTime" label="开始时间">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT','YXSTORESECKILL_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-popover
+            v-permission="['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180">
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/yxStoreSeckill'
+import eForm from './form'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'title', display_name: '产品标题' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreSeckill'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        image: data.image,
+        images: data.images,
+        title: data.title,
+        info: data.info,
+        price: data.price,
+        cost: data.cost,
+        otPrice: data.otPrice,
+        giveIntegral: data.giveIntegral,
+        sort: data.sort,
+        stock: data.stock,
+        sales: data.sales,
+        unitName: data.unitName,
+        postage: data.postage,
+        description: data.description,
+        startTimeDate: new Date(data.startTimeDate),
+        endTimeDate: new Date(data.endTimeDate),
+        addTime: data.addTime,
+        status: data.status,
+        isPostage: data.isPostage,
+        isHot: data.isHot,
+        isDel: data.isDel,
+        num: data.num,
+        isShow: data.isShow
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index a8bcf10..52f846d 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -23,6 +23,7 @@
     <eForm ref="form" :is-add="isAdd"/>
     <eAttr ref="form2" :is-attr="isAttr"/>
     <comForm ref="form3" :is-add="isAdd"/>
+    <killForm ref="form4" :is-add="isAdd"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="商品id"/>
@@ -72,6 +73,10 @@
                 <el-button v-permission="['ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini"
                            type="primary" @click="editC(scope.row)">开启拼团</el-button>
               </el-dropdown-item>
+              <el-dropdown-item>
+              <el-button v-permission="['ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini"
+                         type="primary" @click="editD(scope.row)">开启秒杀</el-button>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -95,8 +100,9 @@ import { del, onsale } from '@/api/yxStoreProduct'
 import eForm from './form'
 import eAttr from './attr'
 import comForm from '@/views/activity/combination/form'
+import killForm from '@/views/activity/seckill/form'
 export default {
-  components: { eForm, eAttr, comForm },
+  components: { eForm, eAttr, comForm, killForm },
   mixins: [initData],
   data() {
     return {
@@ -241,6 +247,38 @@ export default {
       }
       _this.dialog = true
     },
+    editD(data) {
+      this.isAdd = false
+      const _this = this.$refs.form4
+      _this.form = {
+        productId: data.id,
+        merId: data.merId,
+        image: data.image,
+        images: data.sliderImage,
+        title: data.storeName,
+        info: data.storeInfo,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: data.sales,
+        stock: data.stock,
+        isShow: data.isShow,
+        status: 1,
+        isHot: data.isHot,
+        description: data.description,
+        isPostage: data.isPostage,
+        people: 0,
+        price: 0.01,
+        effectiveTime: 24,
+        otPrice: data.otPrice,
+        cost: data.cost,
+        num: 1,
+        giveIntegral: 0,
+        isDel: 0,
+        browse: 0
+      }
+      _this.dialog = true
+    },
     attr(data) {
       console.log(3333)
       this.isAttr = false
diff --git a/src/views/shop/order/detail.vue b/src/views/shop/order/detail.vue
index d654579..97a5b2c 100644
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@@ -5,7 +5,7 @@
         <span>收货信息</span>
         <!--<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
       </div>
-      <div>用户昵称: {{ form.nickname }}</div>
+      <div>用户昵称:{{ form.nickname }}</div>
       <div>收货人: {{ form.realName }}</div>
       <div>联系电话: {{ form.userPhone }}</div>
       <div>收货地址: {{ form.userAddress }}</div>
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index a484a74..80f9394 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -80,7 +80,7 @@
                            @click="refund(scope.row)">
                   立刻退款</el-button>
               </el-dropdown-item>
-              <el-dropdown-item>
+              <el-dropdown-item v-if="scope.row._status == 1 || scope.row._status == 6 || scope.row._status == 7">
                 <el-popover
                   v-permission="['ADMIN','YXSTOREORDER_ALL','YXSTOREORDER_DELETE']"
                   :ref="scope.row.id"
diff --git a/src/views/shop/set/seckill.vue b/src/views/shop/set/seckill.vue
new file mode 100644
index 0000000..0da7428
--- /dev/null
+++ b/src/views/shop/set/seckill.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="ID"/>
+      <el-table-column prop="map.time" label="开启时间(整数小时)"/>
+      <el-table-column prop="map.continued" label="持续时间(整数小时)"/>
+      <el-table-column v-if="checkPermission(['ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-popover
+            v-permission="['ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180">
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './seckillform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'routine_seckill_time' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        time: data.map.time,
+        continued: data.map.continued
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/shop/set/seckillform.vue b/src/views/shop/set/seckillform.vue
new file mode 100644
index 0000000..741f45d
--- /dev/null
+++ b/src/views/shop/set/seckillform.vue
@@ -0,0 +1,101 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
+      <el-form-item label="开启时间(整数小时)" >
+        <el-input v-model="form.time" style="width: 270px;"/>
+      </el-form-item>
+      <el-form-item label="持续时间(整数小时)" >
+        <el-input v-model="form.continued" style="width: 270px;"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'routine_seckill_time',
+        time: 5,
+        continued: 2
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'routine_seckill_time',
+        value: '',
+        addTime: '',
+        sort: '',
+        status: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/shop/set/signform.vue b/src/views/shop/set/signform.vue
index ac60a19..33f43fd 100644
--- a/src/views/shop/set/signform.vue
+++ b/src/views/shop/set/signform.vue
@@ -2,10 +2,10 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
       <el-form-item label="第几天" >
-        <el-input v-model="form.day" style="width: 370px;"/>
+        <el-input v-model="form.day" style="width: 300px;"/>
       </el-form-item>
       <el-form-item label="获取积分" >
-        <el-input v-model="form.sign_num" style="width: 370px;"/>
+        <el-input v-model="form.sign_num" style="width: 300px;"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">