From d822c3c80932c52bfd74a6a74865a2c11aae78f8 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 3 Aug 2021 10:40:38 +0800
Subject: [PATCH] =?UTF-8?q?swiper=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/ModelFormItem.vue           |  5 +---
 .../indexDecorate/modelFormItem.vue           |  5 +---
 .../indexDecorate/modelList/Seckill.vue       | 29 +++++++++----------
 .../indexDecorate/modelList/seckill.vue       | 29 +++++++++----------
 buyer/src/pages/Index.vue                     |  2 +-
 5 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/buyer/src/components/indexDecorate/ModelFormItem.vue b/buyer/src/components/indexDecorate/ModelFormItem.vue
index 2db22094..2330e581 100644
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -30,10 +30,7 @@
       </ul>
     </template>
     <!-- 限时秒杀 待完善 -->
-    <!-- <template v-if="element.type == 'seckill' && element.options.list.length">
-      <seckill :data="element" class="mb_20"></seckill>
-    </template> -->
-    <template v-if="element.type == 'discountAdvert'">
+    <template v-if="element.type == 'seckill' && element.options.list.length">
       <seckill :data="element" class="mb_20"></seckill>
     </template>
     <!-- 折扣广告 -->
diff --git a/buyer/src/components/indexDecorate/modelFormItem.vue b/buyer/src/components/indexDecorate/modelFormItem.vue
index 2db22094..2330e581 100644
--- a/buyer/src/components/indexDecorate/modelFormItem.vue
+++ b/buyer/src/components/indexDecorate/modelFormItem.vue
@@ -30,10 +30,7 @@
       </ul>
     </template>
     <!-- 限时秒杀 待完善 -->
-    <!-- <template v-if="element.type == 'seckill' && element.options.list.length">
-      <seckill :data="element" class="mb_20"></seckill>
-    </template> -->
-    <template v-if="element.type == 'discountAdvert'">
+    <template v-if="element.type == 'seckill' && element.options.list.length">
       <seckill :data="element" class="mb_20"></seckill>
     </template>
     <!-- 折扣广告 -->
diff --git a/buyer/src/components/indexDecorate/modelList/Seckill.vue b/buyer/src/components/indexDecorate/modelList/Seckill.vue
index 92cdbd63..ea6c5da8 100644
--- a/buyer/src/components/indexDecorate/modelList/Seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/Seckill.vue
@@ -142,21 +142,20 @@ export default {
       }, 1000)
     },
     getListByDay () { // 当天秒杀活动
-      const list = [
-        {
-          timeLine: 18,
-          seckillGoodsList: [
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12}
-          ]
-        }
-      ]
-      this.list = list
-      // this.list = this.data.options.list
+      // const list = [
+      //   {
+      //     timeLine: 18,
+      //     seckillGoodsList: [
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12}
+      //     ]
+      //   }
+      // ]
+      this.list = this.data.options.list
       this.goodsList = this.list[0].seckillGoodsList
       this.countDown(this.currIndex)
     }
diff --git a/buyer/src/components/indexDecorate/modelList/seckill.vue b/buyer/src/components/indexDecorate/modelList/seckill.vue
index 92cdbd63..ea6c5da8 100644
--- a/buyer/src/components/indexDecorate/modelList/seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/seckill.vue
@@ -142,21 +142,20 @@ export default {
       }, 1000)
     },
     getListByDay () { // 当天秒杀活动
-      const list = [
-        {
-          timeLine: 18,
-          seckillGoodsList: [
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
-            {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12}
-          ]
-        }
-      ]
-      this.list = list
-      // this.list = this.data.options.list
+      // const list = [
+      //   {
+      //     timeLine: 18,
+      //     seckillGoodsList: [
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12},
+      //       {goodsImage: 'https://lilishop-oss.oss-cn-beijing.aliyuncs.com/a9593607de404546953055f279fd5d54.png', goodsName: 'dfsdgsdf', originalPrice: 39, price: 12}
+      //     ]
+      //   }
+      // ]
+      this.list = this.data.options.list
       this.goodsList = this.list[0].seckillGoodsList
       this.countDown(this.currIndex)
     }
diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue
index 22adfd16..58b25703 100644
--- a/buyer/src/pages/Index.vue
+++ b/buyer/src/pages/Index.vue
@@ -57,7 +57,7 @@ export default {
           this.modelForm = dataJson;
           // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
           for (let i = 0; i < dataJson.list.length; i++) {
-            if (dataJson.list[i].type === 'discountAdvert') {
+            if (dataJson.list[i].type === 'seckill') {
               let seckill = this.getListByDay()
               dataJson.list[i].options.list = seckill
               break;