1

package2/group/groupBuyList.vue

@@ -121,12 +121,12 @@
 						<img :src="item.shopIcon" lazy-load alt="">
 						<view class="shop-steam shop-steam-one"></view>
 						<view class="shop-steam shop-steam-two"></view>
-						<view class="shop-img-badge">拼团进行中</view>
+						<!-- <view class="shop-img-badge">拼团进行中</view> -->
 					</view>
 					<view class="shop-content">
 						<view class="shop-live-row">
 							<text>{{item._dormStatus}}</text>
-							<text>{{item.mingchu ? '明厨亮灶' : '速速加入'}}</text>
+							<text>{{item.groupDeliveryTime}}分钟</text>
 						</view>
 						<view class="shop-name">
 							{{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],