优选库——优选——折扣专区，“平台补贴会场”添加已结束状态判断和显示，目前结束后不能跳转详情页面~

王强
1 parent 4c62134b
Showing 2 changed files with 9 additions and 2 deletions
src/components/goodsItem_8/goodsItem_8.vue
src/pages/discountList/discountList.vue
@@ -26,6 +26,7 @@
 					</div>
 					<div class="icon-box" @click.stop.prevent="primary(item)">
 						<img src="static/img/icon_list_arrow_right.png" class="icon-img" v-if="sty == 2" />
+						<div class="btn btn-disabled" v-else-if="sty == '1' && discountType == '2'">已结束</div>
 						<div class="btn btn-disabled" v-else-if="sty == '1' && (item.num == '2' || (item.num == '1' && item.stock == '0'))">已抢光</div>
 						<img src="static/img/icon_shopping_cart_active.png" class="icon-img" v-else />
@@ -45,7 +46,7 @@
             }
         },
-		props: ["item", "sty"],
+		props: ["item", "sty", "discountType"],
 		computed: {
 			/**
@@ -65,7 +65,8 @@
                     <!-- 商品列表 -->
                     <goods-item-8 v-for="(item, index) in lists[tabs.active]" :key="index" @jump="toDetail" @primary="primary"
                         :item="item"
-                        sty="1">
+                        sty="1"
+                        :discountType="tabs.list[tabs.active].discountType">
                         <!-- 折扣角标 -->
                         <div class="discount-flag" slot="flag" v-if="tabs.list[tabs.active].type == '0' && (parseFloat(item.price) < parseFloat(item.prices))">
@@ -492,6 +493,11 @@
                         return false;
                     }
+                    // 已结束，不跳转
+                    if (this.tabs.list[this.tabs.active].type == '0' && this.tabs.list[this.tabs.active].discountType == '2') {
+                        return false;
+                    }
+
                     // 已抢光，不跳转
                     if (this.tabs.list[this.tabs.active].type == '0' && (item.num == '2' || (item.num == '1' && item.stock == '0'))) {
                         return false;