diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue
index 8f4c355..6002d27 100644
--- a/package2/group/groupBuyList.vue
+++ b/package2/group/groupBuyList.vue
@@ -121,12 +121,12 @@
- 拼团进行中
+
{{item._dormStatus}}
- {{item.mingchu ? '明厨亮灶' : '速速加入'}}
+ {{item.groupDeliveryTime}}分钟
{{item.shopName}}
@@ -522,8 +522,11 @@
return (list || []).map((item, i) => {
const index = (offset || 0) + i
const products = Array.isArray(item.products) ? item.products : []
+ const cookingTimeValue = item.shopTakeaway && item.shopTakeaway.cookingTime ? Number(item.shopTakeaway.cookingTime) : 0
+ const cookingTime = isNaN(cookingTimeValue) ? 0 : cookingTimeValue
item._dormStatus = this.groupTags[index % this.groupTags.length]
item._groupTip = ['还差1人就成团', '刚下课,大家都在拼', '这口热乎的很适合夜宵', '附近同学想一起点'][index % 4]
+ item.groupDeliveryTime = item.groupDeliveryTime === null || item.groupDeliveryTime === undefined ? cookingTime + 30 : item.groupDeliveryTime
item._liveAvatars = [
this.groupAvatars[index % this.groupAvatars.length],
this.groupAvatars[(index + 1) % this.groupAvatars.length],