1

package2/group/groupBuyList.vue

@@ -125,6 +125,9 @@
 							<text class="shop-status-tag" :class="{'shop-status-disabled': item.supportDineIn != 1}">
 								{{getDineInText(item)}}
 							</text>
+							<text class="shop-delivery-fee-tag" v-if="shouldShowBaseDeliveryFee(item)">
+								配送费{{formatAmountText(item.baseDeliveryFee)}}元起
+							</text>
 							<text class="shop-time-tag">{{item.groupDeliveryTime}}分钟</text>
 						</view>
 						<view class="shop-name">
@@ -645,11 +648,11 @@
 				const locationText = item.shopDeliveryLocation == 1 ? '送宿舍' : '送楼下'
 				return `商家自配送 · ${feeText} · ${locationText}`
 			},
+			shouldShowBaseDeliveryFee(item) {
+				const fee = item ? parseFloat(item.baseDeliveryFee) : 0
+				return !!(item && item.supportShopDelivery != 1 && !isNaN(fee) && fee > 0)
+			},
 			formatOnlineWorkerText(item) {
-				const fee = parseFloat(item.baseDeliveryFee)
-				if (!isNaN(fee) && fee > 0) {
-					return `配送费${this.formatAmountText(fee)}元起 ${item.areaName} 附近 ${item.onlineWorkerCount} 位同学在线接单`
-				}
 				return `${item.areaName} 附近 ${item.onlineWorkerCount} 位同学在线接单`
 			},
 			formatAmountText(value) {
@@ -1502,6 +1505,11 @@
 			color: #87938f !important;
 		}
 
+		.shop-delivery-fee-tag {
+			background: rgba(255, 111, 44, 0.1);
+			color: #ff6f2c;
+		}
+
 		.shop-time-tag {
 			margin-left: auto;
 			background: #ff744d;