diff --git a/components/tab-bar/homeGroupPending.vue b/components/tab-bar/homeGroupPending.vue index 2c7dbac..f726095 100644 --- a/components/tab-bar/homeGroupPending.vue +++ b/components/tab-bar/homeGroupPending.vue @@ -256,6 +256,7 @@ status: 0, isFace: 0, merchantType: 1, + useCache: true, pageNumber: 1, pageSize: 10, keyWord: '' @@ -863,6 +864,7 @@ return (item.shopItem && item.shopItem.shopIcon) || item.productPicture || '/static/images/img/shangpintu.png' }, formatGroupItem(item) { + const targetMembers = Number(item.targetMembers || 2) return { ...item, uiShopIcon: this.getShopIcon(item), @@ -870,8 +872,8 @@ uiShopName: this.getShopName(item), uiProductName: item.productName || '热门拼团', uiShopType: this.getShopType(item), - uiTargetMembers: item.targetMembers || 2, - uiCurrentMembers: item.currentMembers || 0, + uiTargetMembers: targetMembers, + uiCurrentMembers: this.currentMembers(item, targetMembers), uiMissingMembers: this.missingMembers(item), uiStoreOriginalPrice: this.formatOptionalPrice(item.storeOriginalPrice), uiGroupPrice: this.formatPrice(item.groupPrice), @@ -951,7 +953,12 @@ missingMembers(item) { const target = Number(item.targetMembers || 2) const current = Number(item.currentMembers || 0) - return Math.max(target - current, 0) + return Math.max(target - current, 1) + }, + currentMembers(item, targetMembers) { + const target = Number(targetMembers || item.targetMembers || 2) + const current = Number(item.currentMembers || 0) + return Math.min(Math.max(current, 0), Math.max(target - 1, 0)) }, buildProgressStyle(item) { const target = Number(item.targetMembers || 2)