修改一些发现的问题，新增秒杀活动设置，优惠券动态时间以及精准发圈用户和小程序直播页面

2025-12-17 16:35:53 +08:00 · 2021-06-04 17:35:59 +08:00
parent 3eee6b35e8
commit 40bf9781b1
41 changed files with 598 additions and 3815 deletions
--- a/manager/package.json
+++ b/manager/package.json
@@ -27,7 +27,6 @@
    "print-js": "^1.0.63",
    "qrcodejs2": "0.0.2",
    "quill": "^1.3.7",
-    "vue-qr": "^2.3.0",
    "sass-loader": "^8.0.2",
    "sockjs-client": "^1.4.0",
    "stompjs": "^2.3.3",
@@ -40,8 +39,10 @@
    "vue-clipboard2": "^0.3.0",
    "vue-cropper": "^0.4.9",
    "vue-i18n": "^8.15.1",
+    "vue-json-excel": "^0.3.0",
    "vue-json-pretty": "^1.4.1",
    "vue-lazyload": "^1.3.3",
+    "vue-qr": "^2.3.0",
    "vue-router": "^3.1.3",
    "vuedraggable": "^2.23.2",
    "vuex": "^3.4.0",
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -17,6 +17,12 @@ export const whetherStar = params => {
  return getRequest(`/broadcast/studio/id/${params.id}&recommend=${params.recommend}`);
 };

+// 添加优惠券活动
+export const addCouponActivity = params => {
+  return postRequest(`/promotion/couponActivity/addCouponActivity`,params);
+};
+
+
 // 获取店铺直播间列表
 export const getLiveList = params => {
  return getRequest("/broadcast/studio", params);
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,10 +17,14 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
+    // common: "https://common-api.pickmall.cn",
+    // buyer: "https://buyer-api.pickmall.cn",
+    // seller: "https://store-api.pickmall.cn",
+    // manager: "https://admin-api.pickmall.cn"
+    common: 'http://192.168.0.109:8890',
+    buyer: 'http://192.168.0.109:8888',
+    seller: 'http://192.168.0.109:8889',
+    manager: 'http://192.168.0.109:8887'
  },
  api_prod: {
    common: "https://common-api.pickmall.cn",
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -224,6 +224,12 @@ export const otherRouter = {
      name: "add-platform-coupon",
      component: () => import("@/views/promotion/coupon/couponPublish.vue")
    },
+    {
+      path: "promotion/add-coupon-specify",
+      title: "精准发劵",
+      name: "add-coupon-specify",
+      component: () => import("@/views/promotion/coupon/couponSpecify.vue")
+    },
    {
      path: "promotion/edit-platform-coupon",
      title: "编辑平台优惠券",
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -211,10 +211,8 @@
 import { homeStatistics, hotGoods, hotShops, getNoticePage } from "@/api/index";
 import show from "./show.vue";
 import * as API_Goods from "@/api/goods";
-
 import { Chart } from "@antv/g2";
 import * as API_Member from "@/api/member";
-import Cookies from "js-cookie";
 export default {
  name: "home",
  components: {
@@ -502,11 +500,13 @@ export default {
      let data = this.chartList;

      data.forEach((item) => {
+
        item.title = "历史在线人数";
+        item.date = item.date.substring(5)
+
      });
      this.historyMemberChart.data(data);

-      console.error(data)
      this.historyMemberChart.tooltip({
        showCrosshairs: true,
        shared: true,
--- a/manager/src/views/lili-floor-renovation/floorList
+++ b/manager/src/views/lili-floor-renovation/floorList
@@ -1,254 +0,0 @@
-<template>
-  <div class="floor-list">
-    <div class="list">
-      <div class="template-saved" v-for="item in templateList" :key="item.id">
-        <div class="template-title">
-          <span>{{ item.name }}</span>
-          <span :class="{ 'theme-color': item.pageShow == 'OPEN' }">{{
-            item.pageShow == "OPEN" ? "已发布" : "未发布"
-          }}</span>
-        </div>
-        <div class="template-content">
-          <!-- <img :src="item.img || require(`@/assets/img-error.png`)" alt=""> -->
-          <div class="cover">
-            <Button icon="md-color-palette" @click="decorate(item.id)"
-              >装修</Button
-            >
-            <Button icon="md-pricetags" @click="Template(item)">编辑</Button>
-            <Button
-              icon="md-send"
-              v-if="item.pageShow == 'CLOSE'"
-              @click="releaseTemplate(item.id)"
-              >发布</Button
-            >
-            <Button
-              icon="md-trash"
-              v-if="item.pageShow == 'CLOSE'"
-              @click="delTemplate(item.id)"
-              >删除</Button
-            >
-          </div>
-        </div>
-      </div>
-      <div class="new-template" @click="createTemp">
-        <Icon type="md-add" />
-        <div>新建模板</div>
-      </div>
-    </div>
-    <Modal
-      v-model="showModal"
-      title="模板设置"
-      draggable
-      width="600"
-      :z-index="100"
-      :loading="loading"
-      mask-closable="false"
-      @on-ok="newTemplate"
-      @on-cancel="showModal = false"
-    >
-      <Form ref="form" :model="formData" :rules="rules" :label-width="80">
-        <FormItem label="模板名称" prop="name">
-          <Input v-model="formData.name" placeholder="请输入模板名称" />
-        </FormItem>
-      </Form>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import * as API_floor from "@/api/other.js";
-export default {
-  name: "floorList",
-  data() {
-    return {
-      showModal: false,
-      templateList: [],
-      formData: {
-        status: false,
-        name: "",
-      },
-      rules: {
-        name: [{ required: true, message: "请输入模板名称", trigger: "blur" }],
-      },
-      loading: true,
-    };
-  },
-  mounted() {
-    let height = window.innerHeight - 150;
-    document.querySelector(".floor-list").style.height = height + "px";
-    this.getTemplateList();
-  },
-  methods: {
-    newTemplate() {
-      // 添加，编辑模板
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          const data = this.formData;
-          data.status ? (data.pageShow = "OPEN") : (data.pageShow = "CLOSE");
-          delete data.status;
-          (data.pageType = "INDEX"), (data.pageClientType = "PC");
-          if (data.id) {
-            API_floor.updateHome(data.id, data).then((res) => {
-              this.$Message.success("编辑模板成功");
-              this.showModal = false;
-              this.getTemplateList();
-            });
-          } else {
-            API_floor.setHomeSetup(data).then((res) => {
-              this.$Message.success("新建模板成功");
-              this.showModal = false;
-              this.getTemplateList();
-            });
-          }
-        } else {
-          this.loading = false;
-        }
-      });
-    },
-
-    createTemp() {
-      // 新建表单
-      this.$refs.form.resetFields();
-      this.showModal = true;
-    },
-
-    Template(item) {
-      // 编辑表单
-      item.pageShow == "OPEN" ? (item.status = true) : (item.status = false);
-      this.formData = item;
-      this.showModal = true;
-    },
-
-    decorate(id) {
-      // 装修
-      this.$router.push({ name: "renovation", query: { id: id } });
-    },
-
-    getTemplateList() {
-      //模板列表
-      let params = {
-        pageNumber: 1,
-        pageSize: 999,
-        pageType: "INDEX",
-        pageClientType: "PC",
-      };
-      API_floor.getHomeList(params).then((res) => {
-        if (res.success) {
-          this.templateList = res.result.records;
-        }
-      });
-    },
-
-    releaseTemplate(id) {
-      //发布模板
-      API_floor.releasePageHome(id).then((res) => {
-        if (res.success) {
-          this.$Message.success("发布模板成功");
-          this.getTemplateList();
-        }
-      });
-    },
-
-    delTemplate(id) {
-      this.$Modal.confirm({
-        title: "提示",
-        content: "<p>确定删除该模板吗？</p>",
-        onOk: () => {
-          API_floor.removePageHome(id).then((res) => {
-            if (res.success) {
-              this.$Message.success("删除模板成功");
-              this.getTemplateList();
-            }
-          });
-        },
-        onCancel: () => {},
-      });
-    },
-  },
-  computed: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.floor-list {
-  background-color: #fff;
-  width: 100%;
-}
-.list {
-  width: 100%;
-  height: 100%;
-  padding: 10px;
-  display: flex;
-  flex-wrap: wrap;
-  > div {
-    width: 260px;
-    height: 450px;
-    margin: 10px 15px;
-    border: 1px solid #eee;
-    border-radius: 5px;
-  }
-  .new-template {
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    border: 2px dashed $theme_color;
-    color: $theme_color;
-    background: #f88c7138;
-    .ivu-icon {
-      font-size: 30px;
-      margin-bottom: 10px;
-    }
-  }
-  .template-saved {
-    overflow: hidden;
-    .template-title {
-      padding: 10px;
-      background: #eee;
-      display: flex;
-      justify-content: space-between;
-      .theme-color {
-        color: $theme_color;
-      }
-    }
-  }
-  .template-content {
-    height: 407px;
-    width: 100%;
-    position: relative;
-    background: #ddd;
-    &:hover {
-      .cover {
-        visibility: visible;
-      }
-    }
-    img {
-      width: 100%;
-      height: 100%;
-    }
-    .cover {
-      visibility: hidden;
-      width: 100%;
-      height: 407px;
-      background: rgba(0, 0, 0, 0.3);
-      position: absolute;
-      top: 0;
-      left: 0;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      .ivu-btn {
-        margin-bottom: 10px;
-        background: transparent;
-        color: #fff;
-        border-color: #fff;
-        &:hover {
-          background-color: $theme_color;
-        }
-      }
-    }
-  }
-}
-</style>
--- a/manager/src/views/lili-floor-renovation/wap/advertising.vue
+++ b/manager/src/views/lili-floor-renovation/wap/advertising.vue
@@ -8,7 +8,7 @@
          <div class="full-shadow" v-if="type == 'full'">
            <img :src="advertising[0].img" alt="" />
          </div>
-         
+
        </div>
      </div>
    </div>
@@ -16,7 +16,7 @@
      <div class="decorate">
        <div class="decorate-title">全屏广告</div>

-       
+

        <div class="decorate-list">
          <div
@@ -79,11 +79,11 @@
  </div>
 </template>
 <script>
-import { btnWay } from "./btn.js";
+
 export default {
  data() {
    return {
-      btnWay, // 按钮类型
+
      type: "full", // 是否全屏

      //全屏广告
@@ -100,21 +100,16 @@ export default {
  },
  methods: {},
  mounted() {
-    console.log(this.btnWay);
+
  },
  methods: {
-  
+
    // 点击链接
    clickLink(item) {
      this.$refs.liliDialog.open('link')
    },

-    // 关闭
-    closeDecorate(index) {
-      this.$nextTick(() => {
-        this.btnWay.splice(index, 1);
-      });
-    },
+
    //点击图片解析成base64
    changeFile(item, index) {
      const file = document.getElementById("files" + index).files[0];
@@ -177,4 +172,4 @@ export default {
    height: 30px;
  }
 }
-</style>
+</style>
--- a/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
+++ b/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
@@ -76,7 +76,7 @@
  </div>
 </template>
 <script>
-import { btnWay } from "./btn.js";
+
 export default {
  data() {
    return {
@@ -95,7 +95,7 @@ export default {
  },
  methods: {},
  mounted() {
-    console.log(this.btnWay);
+
  },
  methods: {
    // 点击链接
@@ -103,12 +103,7 @@ export default {
      this.$refs.liliDialog.open('link')
    },

-    // 关闭
-    closeDecorate(index) {
-      this.$nextTick(() => {
-        this.btnWay.splice(index, 1);
-      });
-    },
+
    //点击图片解析成base64
    changeFile(item, index) {
      const file = document.getElementById("files" + index).files[0];
@@ -171,4 +166,4 @@ export default {
    height: 30px;
  }
 }
-</style>
+</style>
--- a/manager/src/views/lili-floor-renovation/wap/btn.js
+++ b/manager/src/views/lili-floor-renovation/wap/btn.js
@@ -1,21 +0,0 @@
-/**
- * btnWay 设置悬浮按钮功能
- */
-
-export const btnWay = [
-  {
-    img: require('@/assets/icon.png'),
-    title: "",
-    size:"80*80"
-  },
-  {
-    img: require('@/assets/icon.png'),
-    title: "",
-    size:"80*80"
-  },
-  {
-    img: require('@/assets/icon.png'),
-    title: "",
-    size:"80*80"
-  },
-];
--- a/manager/src/views/lili-floor-renovation/wap/btn.vue
+++ b/manager/src/views/lili-floor-renovation/wap/btn.vue
@@ -1,147 +0,0 @@
-<template>
-  <div class="model-view">
-    <div class="model-view-content">
-      <div class="content">
-        <div class="wap-title">首页</div>
-        <div class="draggable">
-          <div class="position">
-            <div class="btn-item">
-              <img
-                src="https://shopro-1253949872.file.myqcloud.com/uploads/20200704/f6b9c9d20d21df541ac52e9548486e1a.png"
-                alt=""
-              />
-            </div>
-            <div class="btn-item" v-for="(item, index) in btnWay" :key="index">
-              <img :src="item.img" alt="" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="model-config">
-      <div class="decorate">
-        <div class="decorate-title">悬浮按钮</div>
-
-        <div class="decorate-list">
-          <div
-            class="decorate-item"
-            v-for="(item, index) in btnWay"
-            :key="index"
-          >
-            <div class="decorate-item-title">
-              <div>图标{{ index + 1 }}</div>
-              <Icon
-                @click="closeDecorate(index)"
-                size="20"
-                color="#e1251b"
-                type="md-close-circle"
-              />
-            </div>
-            <div class="decorate-item-box">
-              <!-- 选择照片 -->
-              <div class="decorate-view">
-                <div class="decorate-view-title">选择图标</div>
-                <div>
-                  <img class="show-image" :src="item.img" alt />
-                  <input
-                    type="file"
-                    class="hidden-input"
-                    @change="changeFile(item, index)"
-                    ref="files"
-                    :id="'files' + index"
-                  />
-                  <div class="tips">
-                    建议尺寸
-                    <span>{{ item.size }}</span>
-                  </div>
-                </div>
-                <div class="selectBtn">
-                  <Button
-                    size="small"
-                    @click="handleClickFile(item, index)"
-                    ghost
-                    type="primary"
-                    >选择照片</Button
-                  >
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <Button type="primary" @click="addDecorate()" ghost>添加</Button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { btnWay } from "./btn.js";
-export default {
-  data() {
-    return {
-      btnWay, // 按钮类型
-    };
-  },
-  methods: {},
-  mounted() {
-    console.log(this.btnWay);
-  },
-  methods: {
-    //添加设置
-    addDecorate() {
-      let way = {
-        img: "https://picsum.photos/id/264/200/200",
-        title: "标题",
-        size: this.btnWay[0].size,
-      };
-      this.btnWay.push(way);
-    },
-
-    // 关闭
-    closeDecorate(index) {
-      this.$nextTick(() => {
-        this.btnWay.splice(index, 1);
-      });
-    },
-    //点击图片解析成base64
-    changeFile(item, index) {
-      const file = document.getElementById("files" + index).files[0];
-      if (file == void 0) return false;
-      const reader = new FileReader();
-      reader.readAsDataURL(file);
-      this.$nextTick((res) => {
-        reader.onload = (e) => {
-          item.img = e.target.result;
-        };
-      });
-    },
-    // 点击选择照片
-    handleClickFile(item, index) {
-      document.getElementById("files" + index).click();
-      // console.log(let files = files)
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-@import "./style.scss";
-@import "./decorate.scss";
-.draggable {
-  position: relative;
-}
-.position {
-  position: absolute;
-  right: 30px;
-  bottom: 50px;
-  display: flex;
-  flex-direction: column-reverse;
-}
-.btn-item {
-  > img {
-    margin: 4px 0;
-    border-radius: 50%;
-    width: 30px;
-    height: 30px;
-  }
-}
-</style>
--- a/manager/src/views/lili-floor-renovation/wap/index.js
+++ b/manager/src/views/lili-floor-renovation/wap/index.js
@@ -1,5 +1,5 @@
 import index from './index.vue' //首页
-import btn from './btn.vue' //按钮
+
 import advertising from './advertising.vue' //全屏活动
 import alertAdvertising from './alertAdvertising.vue' //弹窗活动

@@ -7,7 +7,7 @@ import alertAdvertising from './alertAdvertising.vue' //弹窗活动

 const templates = {
 	index,
-	btn,
+
 	advertising,
 	alertAdvertising
 }
--- a/manager/src/views/lili-floor-renovation/wap/navbar.vue
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -67,11 +67,7 @@ export default {
          name: "index",
          selected: true,
        },
-        {
-          title: "悬浮按钮",
-          name: "btn",
-          selected: false,
-        },
+
        {
          title: "全屏广告",
          name: "advertising",
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -21,11 +21,11 @@
        <Button @click="addMember" type="primary">添加会员</Button>
      </Row>

-        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-        </Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      </Table>
      <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-          size="small" show-total show-elevator show-sizer></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
      </Row>
    </Card>

@@ -137,12 +137,14 @@ export default {
      loading: true, // 表单加载状态
      addFlag: false, // modal显隐控制
      updateRegion: false, // 地区
-      addMemberForm: { // 添加用户表单
+      addMemberForm: {
+        // 添加用户表单
        mobile: "",
        username: "",
        password: "",
      },
-      searchForm: { // 请求参数
+      searchForm: {
+        // 请求参数
        pageNumber: 1,
        pageSize: 10,
        order: "desc",
@@ -152,7 +154,8 @@ export default {
      },
      picModelFlag: false, // 选择图片
      formValidate: {}, // 表单数据
-      addRule: { // 验证规则
+      addRule: {
+        // 验证规则
        mobile: [
          { required: true, message: "请输入手机号码" },
          {
@@ -229,6 +232,7 @@ export default {
                  {
                    props: {
                      size: "small",
+                      type: params.row.___selected ? "primary" : "",
                    },
                    style: {
                      marginRight: "5px",
@@ -236,11 +240,11 @@ export default {
                    },
                    on: {
                      click: () => {
-                        this.callback(params.row);
+                        this.callback(params.row, params.index);
                      },
                    },
                  },
-                  "选择"
+                  params.row.___selected ? "已选择" : "选择"
                ),

                h(
@@ -251,7 +255,8 @@ export default {
                      size: "small",
                    },
                    style: {
-                      marginRight: "5px", display: this.selectedMember ? "none" : "block",
+                      marginRight: "5px",
+                      display: this.selectedMember ? "none" : "block",
                    },
                    on: {
                      click: () => {
@@ -270,7 +275,8 @@ export default {
                      ghost: true,
                    },
                    style: {
-                      marginRight: "5px", display: this.selectedMember ? "none" : "block",
+                      marginRight: "5px",
+                      display: this.selectedMember ? "none" : "block",
                    },
                    on: {
                      click: () => {
@@ -308,9 +314,17 @@ export default {
      total: 0, // 表单数据总数
    };
  },
+  props: {
+    // 是否为选中模式
+    selectedMember: {
+      type: Boolean,
+      default: false,
+    },
+  },
  methods: {
    // 回调给父级
-    callback(val) {
+    callback(val, index) {
+      val.___selected = !val.___selected;
      this.$emit("callback", val);
    },
    init() {
@@ -378,6 +392,9 @@ export default {
      API_Member.getMemberListData(this.searchForm).then((res) => {
        if (res.result.records) {
          this.loading = false;
+          res.result.records.forEach((item) => {
+            item.___selected = false;
+          });
          this.data = res.result.records;
          this.total = res.result.total;
        }
@@ -476,7 +493,7 @@ export default {
 /deep/ .ivu-table-wrapper {
  width: 100%;
 }
-/deep/ .ivu-card{
+/deep/ .ivu-card {
  width: 100%;
 }
 .face {
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -4,21 +4,10 @@
      <Row>
        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
          <Form-item label="活动名称" prop="couponName">
-            <Input
-              type="text"
-              v-model="searchForm.couponName"
-              placeholder="请输入活动名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.couponName" placeholder="请输入活动名称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="活动状态" prop="promotionStatus">
-            <Select
-              v-model="searchForm.promotionStatus"
-              placeholder="请选择"
-              clearable
-              style="width: 200px"
-            >
+            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
              <Option value="NEW">未开始</Option>
              <Option value="START">已开始/上架</Option>
              <Option value="END">已结束/下架</Option>
@@ -26,66 +15,30 @@
            </Select>
          </Form-item>
          <Form-item label="活动时间">
-            <DatePicker
-              v-model="selectDate"
-              type="daterange"
-              clearable
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
+            <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
          </Form-item>
          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
        </Form>
      </Row>
      <Row class="operation padding-row">
-        <Button @click="add" type="primary">添加</Button>
+        <Button @click="add" type="primary">添加优惠券</Button>
+        <Button @click="()=>{$router.push({path:'/promotion/add-coupon-specify'})}">精准发劵</Button>
        <Button @click="delAll">批量下架</Button>
        <!-- <Button @click="upAll" >批量上架</Button> -->
      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
-        <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-            type="primary"
-            size="small"
-            style="margin-right: 10px"
-            @click="edit(row)"
-          >编辑
-          </Button
-          >
-          <Button
-            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
-            type="error"
-            size="small"
-            style="margin-right: 10px"
-            @click="remove(row)"
-          >下架
-          </Button
-          >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <template slot-scope="{ row,index }" slot="action">
+          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="primary" size="small" style="margin-right: 10px" @click="edit(row)">编辑
+          </Button>
+          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" style="margin-right: 10px" @click="remove(row)">下架
+          </Button>
+          <Button v-if="checked" :type="row.___selected ?'primary': '' "   @click="check(row,index)">{{row.___selected ?'已':''}}选中
+          </Button>
        </template>
      </Table>
      <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber + 1"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
      </Row>
    </Card>
  </div>
@@ -94,7 +47,6 @@
 <script>
 import {
  getPlatformCouponList,
-  deletePlatformCoupon,
  updatePlatformCouponStatus,
 } from "@/api/promotion";

@@ -121,7 +73,7 @@ export default {
      // 表单验证规则
      formValidate: {
        promotionName: [
-          {required: true, message: "不能为空", trigger: "blur"},
+          { required: true, message: "不能为空", trigger: "blur" },
        ],
      },
      submitLoading: false, // 添加或编辑提交状态
@@ -138,15 +90,16 @@ export default {
        {
          title: "活动名称",
          key: "promotionName",
-          minWidth: 120,
+
          fixed: "left",
        },
        {
          title: "优惠券名称",
          key: "couponName",
-          minWidth: 120,
-          tooltip: true
-        }, {
+
+          tooltip: true,
+        },
+        {
          title: "面额/折扣",
          key: "price",
          width: 120,
@@ -165,10 +118,13 @@ export default {
        {
          title: "领取数量/总数量",
          key: "publishNum",
+          width: 150,
          render: (h, params) => {
            return h(
-              "div", params.row.receivedNum + "/" + params.row.publishNum)
-          }
+              "div",
+              params.row.receivedNum + "/" + params.row.publishNum
+            );
+          },
        },
        {
          title: "优惠券类型",
@@ -204,20 +160,23 @@ export default {
        },
        {
          title: "活动时间",
+          width: 120,
          render: (h, params) => {
            return h("div", {
-              domProps:
-                {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
+              domProps: {
+                innerHTML: params.row.startTime + "<br/>" + params.row.endTime,
+              },
            });
          },
        },
        {
          title: "状态",
+          width: 100,
          key: "promotionStatus",
          fixed: "right",
          render: (h, params) => {
            let text = "未知",
-              color = "";
+              color = "red";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
              color = "default";
@@ -249,13 +208,20 @@ export default {
          slot: "action",
          align: "center",
          fixed: "right",
-          width: 80
+          width: 100,
        },
      ],
      data: [], // 表单数据
      total: 0, // 表单数据总数
    };
  },
+  props: {
+    // 是否为选中模式
+    checked: {
+      type: Boolean,
+      default: false,
+    },
+  },
  watch: {
    $route(to, from) {
      if (to.fullPath == "/promotion/manager-coupon") {
@@ -264,18 +230,25 @@ export default {
    },
  },
  methods: {
+    // 选中优惠券 父级传值
+    check(val,index) {
+
+      this.data[index].___selected = !this.data[index].___selected
+
+      this.$emit("selected", val);
+    },
    init() {
      this.getDataList();
    },
    add() {
-      this.$router.push({name: "add-platform-coupon"});
+      this.$router.push({ name: "add-platform-coupon" });
    },
    /** 跳转至领取详情页面 */
    receiveInfo(v) {
-      this.$router.push({name: "member-receive-coupon", query: {id: v.id}});
+      this.$router.push({ name: "member-receive-coupon", query: { id: v.id } });
    },
    info(v) {
-      this.$router.push({name: "platform-coupon-info", query: {id: v.id}});
+      this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
    },
    changePage(v) {
      this.searchForm.pageNumber = v - 1;
@@ -319,6 +292,9 @@ export default {
      getPlatformCouponList(this.searchForm).then((res) => {
        this.loading = false;
        if (res.success) {
+          res.result.records.forEach(item=>{
+            item.___selected = false
+          })
          this.data = res.result.records;
          this.total = res.result.total;
        }
@@ -360,7 +336,7 @@ export default {
      });
    },
    edit(v) {
-      this.$router.push({name: "edit-platform-coupon", query: {id: v.id}});
+      this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } });
    },
    remove(v) {
      this.$Modal.confirm({
@@ -370,7 +346,10 @@ export default {
        loading: true,
        onOk: () => {
          // 删除
-          updatePlatformCouponStatus({couponIds: v.id, promotionStatus: "CLOSE"})
+          updatePlatformCouponStatus({
+            couponIds: v.id,
+            promotionStatus: "CLOSE",
+          })
            .then((res) => {
              this.$Modal.remove();
              if (res.success) {
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -50,16 +50,27 @@
              <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
            </FormItem>
            <FormItem label="有效期" prop="rangeTime">
-              <DatePicker
-                type="datetimerange"
-                v-model="form.rangeTime"
-                format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择"
-                :options="options"
-                style="width: 260px"
-              >
-              </DatePicker>
+              <div v-if="form.getType == 'ACTIVITY'">
+                <RadioGroup v-model="rangeTimeType">
+
+                  <Radio :label="1">
+                    起止时间
+                  </Radio>
+                  <Radio :label="0">固定时间</Radio>
+
+                </RadioGroup>
+              </div>
+              <div v-if="rangeTimeType == 1">
+                <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
+                </DatePicker>
+              </div>
+              <div class="effectiveDays" v-if="rangeTimeType == 0">
+                领取当天开始
+                <InputNumber v-model="form.effectiveDays" :min="1" style="width:100px;" :max="365" />
+                天内有效(1-365间的整数)
+              </div>
            </FormItem>
+
            <FormItem label="使用范围" prop="scopeType">
              <RadioGroup type="button" button-style="solid" v-model="form.scopeType">
                <Radio label="ALL">全品类</Radio>
@@ -116,6 +127,16 @@ export default {
  components: {
    skuSelect,
  },
+  watch: {
+    "form.getType": {
+      handler(val) {
+        if (val == "FREE") {
+          this.rangeTimeType = 1;
+        }
+      },
+      deep: true,
+    },
+  },
  data() {
    const checkPrice = (rule, value, callback) => {
      if (!value && value !== 0) {
@@ -140,6 +161,7 @@ export default {
      }
    };
    return {
+      rangeTimeType: 1,
      modalType: 0, // 是否编辑
      form: {
        /** 店铺承担比例 */
@@ -154,9 +176,11 @@ export default {
        couponType: "PRICE",
        /** 优惠券名称 */
        couponName: "",
+        promotionName: "",
        getType: "FREE",
        promotionGoodsList: [],
        scopeIdGoods: [],
+        rangeDayType: "",
      },
      id: this.$route.query.id, // 优惠券id
      submitLoading: false, // 添加或编辑提交状态
@@ -314,13 +338,24 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          const params = JSON.parse(JSON.stringify(this.form));
-          params.startTime = this.$options.filters.unixToDate(
-            this.form.rangeTime[0] / 1000
-          );
-          params.endTime = this.$options.filters.unixToDate(
-            this.form.rangeTime[1] / 1000
-          );
-          delete params.rangeTime
+           // 判断当前活动类型
+          params.getType != "ACTIVITY" ? delete params.effectiveDays : "";
+
+          //判断当前时间类型
+          if (this.rangeTimeType == 1) {
+            params.rangeDayType = "FIXEDTIME";
+            params.startTime = this.$options.filters.unixToDate(
+              this.form.rangeTime[0] / 1000
+            );
+            params.endTime = this.$options.filters.unixToDate(
+              this.form.rangeTime[1] / 1000
+            );
+            delete params.effectiveDays;
+          } else {
+            params.rangeDayType = "DYNAMICTIME";
+            delete params.rangeTime;
+          }
+
          let scopeId = [];

          if (
@@ -392,12 +427,13 @@ export default {
      );
      this.$router.go(-1);
    },
-    openSkuList() { // 显示商品选择器
+    openSkuList() {
+      // 显示商品选择器
      this.$refs.skuSelect.open("goods");
-      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
-      data.forEach(e => {
-        e.id = e.skuId
-      })
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+      data.forEach((e) => {
+        e.id = e.skuId;
+      });
      this.$refs.skuSelect.goodsData = data;
    },
    changeSelect(e) {
@@ -434,15 +470,15 @@ export default {
      // 回显已选商品
      let list = [];
      item.forEach((e) => {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-          });
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+        });
      });
      this.form.promotionGoodsList = list;
    },
@@ -527,5 +563,12 @@ h4 {
  margin-left: 10px;
  color: #999;
 }
+.effectiveDays {
+  font-size: 12px;
+  color: #999;
+  > * {
+    margin: 0 4px;
+  }
+}
 </style>

--- a/manager/src/views/promotion/coupon/couponSpecify.vue
+++ b/manager/src/views/promotion/coupon/couponSpecify.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120">
+        <div class="base-info-item">
+          <h4>优惠券将在指定发放时间发放到用户账号中</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="目标客户" prop="vipType">
+              <RadioGroup v-model="vipType">
+                <Radio :label="0">全平台客户</Radio>
+                <Radio :label="1">指定客户</Radio>
+              </RadioGroup>
+              <Button type="primary" v-if="vipType==1" icon="ios-add" @click="addVip" ghost>添加客户</Button>
+            </FormItem>
+            <FormItem label="发放时间" prop="couponDiscount">
+              <DatePicker type="datetime" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
+              </DatePicker>
+            </FormItem>
+            <FormItem label="选择优惠券" prop="couponType">
+              <Button type="primary" icon="ios-add" @click="checkCoupon=!checkCoupon" ghost>选择优惠券</Button>
+              <Table class="table" :columns="couponColumns" :data="couponData"></Table>
+            </FormItem>
+          </div>
+
+          <div style="margin-left:100px">
+            <Button type="text" @click="closeCurrentPage">返回</Button>
+            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+          </div>
+
+        </div>
+      </Form>
+      <Modal width="1200" v-model="checkCoupon">
+        <couponList checked @selected="callbackSelectCoupon" />
+      </Modal>
+      <Modal width="1200" v-model="checkUserList">
+        <userList @selected="callbackSelectUser" ref="memberLayout" />
+      </Modal>
+    </Card>
+
+  </div>
+</template>
+
+<script>
+import { addCouponActivity } from "@/api/promotion";
+
+import couponList from "./coupon";
+import userList from "@/views/member/list/index";
+// import userList from ''
+export default {
+  components: {
+    couponList,
+    userList,
+  },
+
+  data() {
+    return {
+      // 选择优惠券
+      checkCoupon: false,
+      // 选择用户
+      checkUserList: false,
+      // 优惠券表格title
+      couponColumns: [
+        {
+          title: "优惠券名称",
+          key: "name",
+        },
+        {
+          title: "有效期",
+          key: "age",
+        },
+        {
+          title: "优惠券数量",
+          key: "address",
+        },
+        {
+          title: "操作",
+          key: "action",
+        },
+      ],
+      // datpicker时间设置
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+
+      //
+      vipType: 0, //客户会员类型  0全平台客户 1指定客户
+      form: {},
+      formRule: {},
+      id: this.$route.query.id, // 优惠券id
+
+      callbackCoupon: [],
+    };
+  },
+  mounted() {},
+  methods: {
+
+    // 添加指定用户
+    addVip() {
+      this.checkUserList = true;
+      this.$nextTick(() => {
+        this.$refs.memberLayout.selectedMember = true;
+      });
+    },
+    // 返回已选择的用户
+    callbackSelectUser(val){
+      console.log(val)
+    },
+
+    // 返回已选择的优惠券
+    callbackSelectCoupon(val) {
+      if (val.___selected) {
+        this.callbackCoupon.forEach((item, index) => {
+          if (item.id == val.id) this.callbackCoupon.splice(index, 1);
+        });
+      } else {
+        this.callbackCoupon.push(val);
+      }
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add-coupon-specify");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+
+    async handleSubmit() {
+      let res = await addCouponActivity();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scpoed>
+.table {
+  width: 800px;
+  margin: 20px 0;
+}
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.form-item-view {
+  margin: 20px 0;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+.effectiveDays {
+  font-size: 12px;
+  color: #999;
+  > * {
+    margin: 0 4px;
+  }
+}
+</style>
+
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -2,29 +2,12 @@
  <div class="seckill">
    <Card>
      <Row>
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
          <Form-item label="活动名称" prop="promotionName">
-            <Input
-              type="text"
-              v-model="searchForm.promotionName"
-              placeholder="请输入活动名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.promotionName" placeholder="请输入活动名称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="活动状态" prop="promotionStatus">
-            <Select
-              v-model="searchForm.promotionStatus"
-              placeholder="请选择"
-              clearable
-              style="width: 200px"
-            >
+            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
              <Option value="NEW">未开始</Option>
              <Option value="START">已开始/上架</Option>
              <Option value="END">已结束/下架</Option>
@@ -32,120 +15,69 @@
            </Select>
          </Form-item>
          <Form-item label="活动时间">
-            <DatePicker
-              v-model="selectDate"
-              type="daterange"
-              clearable
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
+            <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
          </Form-item>

-          <Button
-            @click="handleSearch"
-            type="primary"
-            icon="ios-search"
-            class="search-btn"
-            >搜索</Button
-          >
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
        </Form>
      </Row>
      <Row class="operation padding-row">
        <Button type="primary" @click="add">添加活动</Button>
      </Row>
+      <Tabs value="list"  @on-click="clickTabPane">
+        <TabPane label="秒杀活动列表" name="list">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="page">
+            <template slot-scope="{ row }" slot="action">
+              <Button type="info" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="edit(row)">编辑</Button>

-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          class="page"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              type="info"
-              size="small"
-              class="mr_5"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="edit(row)"
-              >编辑</Button
-            >
+              <Button type="info" size="small" class="mr_5" v-else @click="manage(row)">查看</Button>

-            <Button
-              type="info"
-              size="small"
-              class="mr_5"
-              v-else
-              @click="manage(row)"
-              >查看</Button
-            >
+              <Button type="primary" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="manage(row)">管理</Button>

-            <Button
-              type="primary"
-              size="small"
-              class="mr_5"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="manage(row)"
-              >管理</Button
-            >
-
-            <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
-            <Button
-              type="error"
-              size="small"
-              v-if="
+              <Button type="error" size="small" v-if="
                row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
-              "
-              class="mr_5"
-              @click="off(row)"
-              >下架</Button
-            >
-            &nbsp;
-            <Button
-              type="error"
-              size="small"
-              v-if="row.promotionStatus == 'CLOSE'"
-              ghost
-              @click="expire(row)"
-              >删除</Button
-            >
-          </template>
-        </Table>
+              " class="mr_5" @click="off(row)">下架</Button>
+              &nbsp;
+              <Button type="error" size="small" v-if="row.promotionStatus == 'CLOSE'" ghost @click="expire(row)">删除</Button>
+            </template>
+          </Table>
+
+          <Row type="flex" justify="end" class="page">
+            <Page style="margin: 20px 0;" :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="秒杀活动设置" name="setup">
+
+          <setupSeckill v-if="setupFlag"></setupSeckill>
+        </TabPane>
+      </Tabs>

-      <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber + 1"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
    </Card>
  </div>
 </template>

 <script>
 import { getSeckillList, delSeckill, closeSeckill } from "@/api/promotion";
+import setupSeckill from "@/views/promotion/seckill/setupSeckill";
 export default {
  name: "seckill",
+  components: {
+    setupSeckill,
+  },
  data() {
    return {
      loading: true, // 表单加载状态
      searchForm: {
        // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
        pageSize: 10, // 页面大小
        sort: "startTime",
        order: "desc", // 默认排序方式
      },
-      columns: [ // 表单
+      setupFlag: false, //默认不请求设置
+      columns: [
+        // 表单
        {
          title: "活动名称",
          key: "promotionName",
@@ -227,14 +159,27 @@ export default {
    };
  },
  methods: {
+    clickTabPane(name) {
+
+      if (name == "setup") {
+
+        this.setupFlag = true;
+      } else {
+        this.setupFlag = false;
+      }
+    },
+
+    // 初始化信息
    init() {
      this.getDataList();
    },
+    // 点击分页
    changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
      this.getDataList();
      this.clearSelectAll();
    },
+    // 设置每页大小
    changePageSize(v) {
      this.searchForm.pageSize = v;
      this.getDataList();
@@ -287,6 +232,7 @@ export default {
        },
      });
    },
+    // 获取数据集合
    getDataList() {
      this.loading = true;
      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@@ -313,7 +259,7 @@ export default {
 </script>
 <style lang="scss">
@import "@/styles/table-common.scss";
-.mr_5{
+.mr_5 {
  margin: 0 5px;
 }
 </style>
--- a/manager/src/views/promotion/seckill/setupSeckill.vue
+++ b/manager/src/views/promotion/seckill/setupSeckill.vue
@@ -0,0 +1,151 @@
+<template>
+  <div>
+    <Form :model="form" :label-width="120">
+      <FormItem label="每日场次设置">
+        <Row :gutter="16" class="row">
+          <Col class="time-item" @click.native="handleClickTime(item,index)" v-for="(item,index) in this.times" :key="index" span="3">
+          <div class="time" :class="{'active':item.check}">{{item.time}}:00</div>
+          </Col>
+        </Row>
+      </FormItem>
+      <FormItem label="秒杀规则">
+        <Input type="textarea" :autosize="{minRows: 4,}" v-model="form.seckillRule" placeholder="申请规则" clearable style="width: 360px; margin-left:10px" />
+      </FormItem>
+      <FormItem>
+        <div class="foot-btn">
+          <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
+          <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+        </div>
+      </FormItem>
+    </Form>
+    <!-- 选择时间 -->
+  </div>
+</template>
+
+<script>
+import { getSetting, setSetting } from "@/api/index";
+export default {
+  data() {
+    return {
+      submitLoading: false,
+      selectedTime: [],
+      times: [], //时间集合 1-24点
+      form: {
+        seckillRule: "",
+      },
+    };
+  },
+  mounted() {
+    /**
+     * 初始化
+     */
+    this.init();
+  },
+  methods: {
+    /**
+     * 关闭当前页面
+     */
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "manager-seckill-add");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+    /**
+     * 提交秒杀信息
+     */
+    async handleSubmit() {
+      let hours = this.times
+        .filter((item) => {
+          return item.check;
+        })
+        .map((item) => {
+          return item.time;
+        })
+        .join(",");
+
+      let result = await setSetting("SECKILL_SETTING", {
+        seckillRule: this.form.seckillRule,
+        hours,
+      });
+      if (result.success) {
+        this.$Message.success("设置成功!");
+        this.init();
+      }
+    },
+
+    /**
+     * 初始化当前信息
+     */
+    async init() {
+      let result = await getSetting("SECKILL_SETTING");
+      if (result.success) {
+        this.form.seckillRule = result.result.seckillRule;
+        this.times=[]
+        for (let i = 0; i < 24; i++) {
+          // 将数据拆出
+          if (result.result.hours) {
+            let way = result.result.hours.split(",");
+            way.forEach((hours) => {
+              if (hours == i) {
+                this.times.push({
+                  time: i,
+                  check: true,
+                });
+              }
+            });
+            if (!this.times[i]) {
+              this.times.push({
+                time: i,
+                check: false,
+              });
+            }
+          }
+        }
+      }
+    },
+
+    /**
+     * 选中时间
+     */
+    handleClickTime(val, index) {
+      val.check = !val.check;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.row {
+  width: 50%;
+}
+.foot-btn {
+  margin-left: 10px;
+}
+.time-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.active {
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+  color: #fff;
+  background: $theme_color !important;
+}
+.time {
+  width: 100%;
+  cursor: pointer;
+  transition: 0.35s;
+  border-radius: 0.8em;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  background: #f3f5f7;
+  height: 100%;
+}
+.time-item {
+  height: 50px;
+  margin: 8px 0;
+  font-size: 15px;
+}
+</style>
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -224,7 +224,6 @@ import memberLayout from "@/views/member/list/index";
 import ossManage from "@/views/sys/oss-manage/ossManage";
 import { getCategoryTree } from "@/api/goods";
 import { shopDetail, shopAdd, shopEdit, getShopByMemberId } from "@/api/shops";
-import * as filters from "@/utils/filters";
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 import region from "@/views/lili-components/region";
 import liliMap from "@/views/my-components/map/index";
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -116,7 +116,7 @@
                    <Scroll :on-reach-bottom="memberSearchEdge">

                      <div dis-hover v-for="(item, index) in members" :key="index" class="scroll-card">
-                        <Button class="btns" :class="{'active':item.___selected}" @click="moveMember(index,item)" style="width: 100%;text-align: left">
+                        <Button class="btns" :class="{'active':item.____selected}" @click="moveMember(index,item)" style="width: 100%;text-align: left">
                          <span v-if="item.mobile" class="mobile">
                            {{item.mobile}}
                          </span>
@@ -501,8 +501,8 @@ export default {


      this.members.forEach((item,index)=>{
-        if(item.___selected && item.mobile == val.mobile){
-          item.___selected = false
+        if(item.____selected && item.mobile == val.mobile){
+          item.____selected = false
        }
      })

@@ -543,7 +543,7 @@ export default {
        this.$Message.error("当前用户暂无手机号绑定");
        return false;
      }
-      item.___selected = true;
+      item.____selected = true;
      if (this.alreadyCheck.length == 0) {
        this.alreadyCheck.push(item.mobile);
        this.alreadyCheckShow.push(item);
@@ -581,7 +581,7 @@ export default {
        this.loading = false;
        if (res.success) {
          res.result.records.forEach((item) => {
-            item.___selected = false;
+            item.____selected = false;
            this.members.push(item);
          });