From c6874acb1b3c2aa340b2e0447f1b1758f2f9c560 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 5 Aug 2021 18:07:11 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8bug=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E7=AB=AF=E5=88=A0=E9=99=A4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/assets/styles/coupon.scss           |   3 -
 buyer/src/pages/home/userCenter/Coupons.vue   |  10 +-
 manager/src/router/router.js                  |   6 -
 .../views/promotion/seckill/addSeckill.vue    | 219 ------------------
 .../src/views/promotion/seckill/seckill.vue   |   8 +-
 5 files changed, 13 insertions(+), 233 deletions(-)
 delete mode 100644 manager/src/views/promotion/seckill/addSeckill.vue

diff --git a/buyer/src/assets/styles/coupon.scss b/buyer/src/assets/styles/coupon.scss
index 52399f82..9afd57a7 100644
--- a/buyer/src/assets/styles/coupon.scss
+++ b/buyer/src/assets/styles/coupon.scss
@@ -55,9 +55,6 @@
     color: #fff;
     font-size: 16px;
     padding: 20px;
-    &:hover{
-      font-weight: bold;
-    }
   }
   i{
     position: absolute;
diff --git a/buyer/src/pages/home/userCenter/Coupons.vue b/buyer/src/pages/home/userCenter/Coupons.vue
index 7a1284ee..0914d866 100644
--- a/buyer/src/pages/home/userCenter/Coupons.vue
+++ b/buyer/src/pages/home/userCenter/Coupons.vue
@@ -14,7 +14,7 @@
           <p>有效期：{{item.endTime}}</p>
         </div>
         <b></b>
-        <a class="c-right" @click="go(item)">立即使用</a>
+        <a class="c-right" :class="{'canot-use':params.memberCouponStatus !== 'NEW'}" @click="go(item)">立即使用</a>
         <i class="circle-top"></i>
         <i class="circle-bottom"></i>
       </li>
@@ -66,9 +66,12 @@ export default {
     // 切换优惠券状态
     change (index) {
       this.params.memberCouponStatus = this.statusList[index]
+      this.params.pageNumber = 1;
       this.getList()
     },
     go (item) { // 根据使用条件跳转商品列表页面
+      if (this.params.memberCouponStatus !== 'NEW') return;
+
       if (item.storeId !== 'platform') {
         this.$router.push({path: '/merchant', query: {id: item.storeId}})
       } else {
@@ -127,10 +130,15 @@ export default {
     width: 43px;
     font-size: 14px;
   }
+  .canot-use{
+    color: #999;
+    background-color: #eee;
+  }
   i {
     right: 34px;
   }
 }
+
 .pageration {
   text-align: right;
 }
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index 3284d3b7..e1b76c4d 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -240,12 +240,6 @@ export const otherRouter = {
       name: "seckill-goods",
       component: () => import("@/views/promotion/seckill/seckillGoods.vue")
     },
-    {
-      path: "promotion/seckill/manager-seckill-add",
-      title: "添加限时抢购",
-      name: "manager-seckill-add",
-      component: () => import("@/views/promotion/seckill/addSeckill.vue")
-    },
     {
       path: "/floorList/renovation",
       title: "编辑模板",
diff --git a/manager/src/views/promotion/seckill/addSeckill.vue b/manager/src/views/promotion/seckill/addSeckill.vue
deleted file mode 100644
index 129a505c..00000000
--- a/manager/src/views/promotion/seckill/addSeckill.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <div>
-    <Card>
-      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
-        <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
-                :disabled="form.promotionStatus != 'NEW'"
-                style="width: 260px"
-              />
-            </FormItem>
-            <FormItem label="报名截止时间" prop="applyEndTime">
-              <DatePicker
-                type="datetime"
-                v-model="form.applyEndTime"
-                format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择"
-                clearable
-                :disabled="form.promotionStatus != 'NEW'"
-                style="width: 200px"
-              >
-              </DatePicker>
-            </FormItem>
-            <FormItem label="活动开始时间" prop="startTime">
-              <DatePicker
-                type="datetime"
-                v-model="form.startTime"
-                :disabled="form.promotionStatus != 'NEW'"
-                format="yyyy-MM-dd"
-                placeholder="请选择"
-                clearable
-                style="width: 200px"
-              >
-              </DatePicker>
-            </FormItem>
-            <FormItem label="抢购时间段" prop="seckillPeriod">
-              <Tag
-                v-for="item in form.seckillPeriod"
-                :key="item"
-                :name="item"
-                closable
-                style="marrgin-left: 10px"
-                @on-close="removePeriodTime"
-                >{{ item >= 10 ? item : "0" + item }}:00</Tag
-              >
-              <InputNumber
-                :max="23"
-                :min="0"
-                v-model="periodTime"
-                v-show="showAddPeriod"
-                @on-blur="addPeriodTime"
-              ></InputNumber>
-              <Button
-                type="default"
-                @click="addPeriod"
-                v-if="form.promotionStatus == 'NEW'"
-                >添加时间段</Button
-              >
-            </FormItem>
-            <FormItem label="申请规则" prop="seckillRule">
-              <Input
-                type="text"
-                v-model="form.seckillRule"
-                placeholder="申请规则"
-                clearable
-                :disabled="form.promotionStatus != 'NEW'"
-                style="width: 260px"
-              />
-            </FormItem>
-          </div>
-          <div class="foot-btn">
-            <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
-            <Button
-              type="primary"
-              :loading="submitLoading"
-              v-if="form.promotionStatus == 'NEW'"
-              @click="handleSubmit"
-              >提交</Button
-            >
-          </div>
-        </div>
-      </Form>
-    </Card>
-  </div>
-</template>
-
-<script>
-import { saveSeckill, updateSeckill, seckillDetail } from "@/api/promotion";
-
-export default {
-  name: "addSeckill",
-  data() {
-    return {
-      modalType: 0, // 添加、编辑标识
-      form: {
-        /** 活动名称 */
-        promotionName: "",
-        /** 报名截止时间 */
-        applyEndTime: "",
-        /** 活动开始时间 */
-        startTime: "",
-        /** 抢购时间段 */
-        seckillPeriod: [],
-        /** 申请规则 */
-        seckillRule: "",
-        promotionStatus: "NEW",
-      },
-      id: this.$route.query.id, // 活动id
-      periodTime: null,  // 抢购时间段
-      showAddPeriod: false, // input显隐
-      submitLoading: false, // 添加或编辑提交状态
-
-      formRule: {
-        promotionName: [{ required: true, message: "请填写活动名称" }],
-        applyEndTime: [{ required: true, message: "请选择报名截止时间" }],
-        seckillPeriod: [{ required: true, message: "请填写抢购时间段" }],
-        startTime: [{ required: true, message: "请选择活动开始时间" }],
-        seckillRule: [{ required: true, message: "请输入申请规则" }],
-      },
-    };
-  },
-  mounted() {
-    // 如果id不为空则查询信息
-    if (this.id) {
-      this.getData();
-      this.modalType = 1;
-    }
-  },
-  methods: {
-    // 关闭当前页面
-    closeCurrentPage() {
-      this.$store.commit("removeTag", "manager-seckill-add");
-      localStorage.pageOpenedList = JSON.stringify(this.$store.state.app.pageOpenedList);
-      this.$router.go(-1);
-    },
-    // 获取活动详情
-    getData() {
-      seckillDetail(this.id).then((res) => {
-        if (res.success) {
-          let data = res.result;
-          data.seckillPeriod = res.result.hours.split(",");
-          this.form = data;
-        }
-      });
-    },
-    addPeriod() { // 添加时间段显示input
-      this.addPeriodTime();
-      this.showAddPeriod = true;
-    },
-    addPeriodTime() { // 添加秒杀时间段
-      this.showAddPeriod = false;
-      if (
-        this.periodTime !== null &&
-        !this.form.seckillPeriod.includes(this.periodTime)
-      ) {
-        this.form.seckillPeriod.push(this.periodTime);
-      }
-    },
-    removePeriodTime(event, name) { // 移除秒杀时间段
-      this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name);
-    },
-    /** 添加秒杀活动 */
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.submitLoading = true;
-          this.form.hours = this.form.seckillPeriod.toString();
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            saveSeckill(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res && res.success) {
-                this.$Message.success("限时抢购活动添加成功");
-                this.closeCurrentPage();
-              }
-            });
-          } else {
-            delete this.form.createTime;
-            delete this.form.updateTime;
-            delete this.form.endTime;
-            // 编辑
-            updateSeckill(this.form).then((res) => {
-              this.submitLoading = false;
-              if (res && res.success) {
-                this.$Message.success("限时抢购活动修改成功");
-                this.closeCurrentPage();
-              }
-            });
-          }
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-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;
-}
-// .ivu-form-item{
-//   margin-bottom: 30px;
-// }
-</style>
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index 248f44f5..662a5dc4 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -21,10 +21,10 @@
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
-      <Row class="operation padding-row">
+      <!-- <Row class="operation padding-row">
         <Button type="primary" @click="add">添加活动</Button>
-      </Row>
-      <Tabs value="list"  @on-click="clickTabPane">
+      </Row> -->
+      <Tabs value="list" class="mt_10" @on-click="clickTabPane">
         <TabPane label="秒杀活动列表" name="list">
           <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
             <template slot-scope="{ row }" slot="action">
@@ -32,7 +32,7 @@
 
               <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="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="manage(row)">管理</Button>
 
               <Button type="error" size="small" v-if="
                 row.promotionStatus == 'START' || row.promotionStatus == 'NEW'