Merge branch 'v2-220418' of…

Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into feat-memberLevel

Merge branch 'v2-220418' of…
33d41b9c · XieZhiXiong · 02852670 · d2d4cf11 · 33d41b9c
Commit 33d41b9c authored Apr 14, 2022 by XieZhiXiong
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

index.tsx ...on/saleOrder/agentPurchaseOrder/commodityDetail/index.tsx +4 -1

No files found.
--- a/src/pages/transaction/saleOrder/agentPurchaseOrder/commodityDetail/index.tsx
+++ b/src/pages/transaction/saleOrder/agentPurchaseOrder/commodityDetail/index.tsx
@@ -275,7 +275,10 @@ const CommodityDetail: React.FC = (props: any) => {
      setMarketingData(data as unknown as MarketingDetailType);
      // 如果有活动标签，则表示是活动商品
      if (data.tagDetailList && data.tagDetailList.length > 0) {
-        setHasActivity(true)
+        // 排除拼团商品
+        if (data.tagDetailList.every((item: { activityType: number }) => item.activityType !== MarketingTypeEnum.activity_type_9)) {
+          setHasActivity(true)
+        }
      } else {
        setCurrentGroupDetail(undefined)
        setHasActivity(false)