From c3618175f9f21481dffe4fd92af4f7b5d1b74885 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Mon, 19 Apr 2021 14:46:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/t-goods-item/t-goods-item.vue | 22 +++++++++++++---------
 pages/activity/GoodsSeckill/index.vue    |  6 +++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/components/t-goods-item/t-goods-item.vue b/components/t-goods-item/t-goods-item.vue
index 4650a07..033e062 100644
--- a/components/t-goods-item/t-goods-item.vue
+++ b/components/t-goods-item/t-goods-item.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="tui-goods__item" :class="{ 'tui-full__item': isList }" @tap="detail">
+  <view class="tui-goods__item" :class="{ 'tui-full__item': isList }">
     <view class="tui-image__box" :class="{ 'tui-full__imgbox': isList }">
       <image class="tui-goods__img" :class="{ 'tui-full__img': isList }" :src="item.image" mode="widthFix"></image>
     </view>
@@ -23,10 +23,10 @@
           <!-- <tui-button :width="status == 3 ? '146rpx' : '144rpx'" :height="status == 3 ? '60rpx' : '50rpx'" :size="status == 3 ? 26 : 24" :type="status == 1 ? 'gray' : 'danger'" :disabled="status == 1" :plain="status == 3">
             {{ status | getBtnText(item.subscribe) }}
           </tui-button> -->
-          <view class="grab bg-color-red" v-if="item.status === 1 && item.stock > 0" @click="goDetail()">马上抢</view>
-          <view class="grab" v-if="item.status === 1 && item.stock <= 0">已售磬</view>
-          <view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
-          <view class="grab bg-color-red" v-if="item.status === 0">已结束</view>
+          <view class="grab bg-color-red" v-if="timeList[active].status === 1 && item.stock > 0" @click="goDetail">马上抢</view>
+          <view class="grab" v-if="timeList[active].status === 1 && item.stock <= 0">已售磬</view>
+          <view class="grab bg-color-red" v-if="timeList[active].status === 2">即将开始</view>
+          <view class="grab bg-color-red" v-if="timeList[active].status === 0">已结束</view>
         </view>
       </view>
     </view>
@@ -53,6 +53,14 @@ export default {
       type: Number,
       default: 2,
     },
+    timeList: {
+      type: Array,
+      default: [],
+    },
+    active: {
+      type: Number,
+      default: 0,
+    },
   },
   filters: {
     getBtnText(status, subscribe) {
@@ -84,10 +92,6 @@ export default {
     return {}
   },
   methods: {
-    // detail() {
-    //   //项目中应该传id
-    //   this.tui.href(`../seckillDetail/seckillDetail?status=${this.status}`)
-    // },
     goDetail: function() {
       this.$emit('goDetail', this.item)
     },
diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue
index 05583fb..60df6de 100644
--- a/pages/activity/GoodsSeckill/index.vue
+++ b/pages/activity/GoodsSeckill/index.vue
@@ -45,12 +45,12 @@
       <view class="tui-list__goods">
         <view class="tui-goods__left">
           <block v-for="(item, index) in seckillList" :key="index">
-            <t-goods-item v-if="index % 2 == 0" :item="item" :isList="false" @goDetail="goDetail"></t-goods-item>
+            <t-goods-item v-if="index % 2 == 0" :item="item" :timeList="timeList" :active="active" :isList="false" @goDetail="goDetail"></t-goods-item>
           </block>
         </view>
         <view class="tui-goods__right">
           <block v-for="(item, index) in seckillList" :key="index">
-            <t-goods-item v-if="index % 2 !== 0" :item="item" :isList="false" @goDetail="goDetail"></t-goods-item>
+            <t-goods-item v-if="index % 2 !== 0" :item="item" :timeList="timeList" :active="active" :isList="false" @goDetail="goDetail"></t-goods-item>
           </block>
         </view>
       </view>
@@ -189,7 +189,7 @@ export default {
         query: {
           id: item.id,
           time,
-          status: item.status,
+          status: that.timeList[that.active].status,
         },
       })
     },