From 5d5806d0cd3954a635421a186e0fb6e53e91015d Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 20 Jan 2021 19:25:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/custom/groupbuy-detail.vue | 7 ++++++-
src/views/modules/custom/groupbuyinfo.vue | 9 ++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/modules/custom/groupbuy-detail.vue b/src/views/modules/custom/groupbuy-detail.vue
index c16d701..d258990 100644
--- a/src/views/modules/custom/groupbuy-detail.vue
+++ b/src/views/modules/custom/groupbuy-detail.vue
@@ -28,6 +28,9 @@
{{ dataForm.createdTime }}
+
+ {{ dataForm.groupBuyEndTime }}
+
查看
@@ -36,6 +39,7 @@
团购中
+ 已截团
已结束
已取消
@@ -117,7 +121,8 @@ export default {
shieldFlag: '',
shieldReason: '',
prices: [],
- images: []
+ images: [],
+ groupBuyEndTime: ''
},
previewImgList: [],
signUpList: [],
diff --git a/src/views/modules/custom/groupbuyinfo.vue b/src/views/modules/custom/groupbuyinfo.vue
index 7276e26..4287297 100644
--- a/src/views/modules/custom/groupbuyinfo.vue
+++ b/src/views/modules/custom/groupbuyinfo.vue
@@ -44,12 +44,11 @@
-
+
-
查看
@@ -217,7 +216,11 @@ export default {
},
cellStyle (row, column, rowIndex, columnIndex) {
if (row.column.label === '状态' && row.row.groupBuyStatus === 0) {
- return 'color:#00A066'
+ if (row.row.groupBuyEndTime !== '' && row.row.groupBuyEndTime !== undefined && row.row.groupBuyEndTime !== null && (new Date(row.row.groupBuyEndTime).getTime() < new Date().getTime())) {
+ return 'color:#E30000'
+ } else {
+ return 'color:#00A066'
+ }
} else if (row.column.label === '状态' && row.row.groupBuyStatus === 5) {
return 'color:#E30000'
}