From 7b40db8e66a8885ff309a2c511ed60b46d12773d Mon Sep 17 00:00:00 2001 From: moyayu <1623253835@qq.com> Date: Thu, 28 May 2026 18:53:47 +0800 Subject: [PATCH] fix: ensure purchase activity price displays across pages --- src/components/sp-goods-cell/index.js | 2 +- src/components/sp-goods-price/index.js | 2 +- src/components/sp-order-item/index.js | 2 +- src/components/sp-render-goods/index.jsx | 2 +- src/pages/cart/comps/comp-goodsitem.js | 2 +- src/subpages/purchase/activity-list.js | 3 ++- src/subpages/purchase/select-identity.js | 3 ++- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/sp-goods-cell/index.js b/src/components/sp-goods-cell/index.js index 818374061..ca0f2ada6 100644 --- a/src/components/sp-goods-cell/index.js +++ b/src/components/sp-goods-cell/index.js @@ -24,7 +24,7 @@ function SpGoodsCell(props) { const { userInfo = {}, vipInfo = {} } = useSelector((state) => state.user) const { priceDisplayConfig = {} } = useSelector((state) => state.purchase) const { checkout_page = {} } = priceDisplayConfig - const { activity_price: enPurActivityPrice, sale_price: enPurSalePrice } = checkout_page + const { activity_price: enPurActivityPrice = true, sale_price: enPurSalePrice } = checkout_page if (!info) { return null } diff --git a/src/components/sp-goods-price/index.js b/src/components/sp-goods-price/index.js index e07b5a323..0ccf140ad 100644 --- a/src/components/sp-goods-price/index.js +++ b/src/components/sp-goods-price/index.js @@ -24,7 +24,7 @@ function SpGoodsPrice(props) { const { priceDisplayConfig = {} } = useSelector((state) => state.purchase) const { isLogin } = useLogin() const { items_page = {} } = priceDisplayConfig - const { activity_price: enPurActivityPrice, sale_price: enPurSalePrice } = items_page + const { activity_price: enPurActivityPrice = true, sale_price: enPurSalePrice } = items_page if (!info) { return null diff --git a/src/components/sp-order-item/index.js b/src/components/sp-order-item/index.js index 32c711e79..83f34074c 100644 --- a/src/components/sp-order-item/index.js +++ b/src/components/sp-order-item/index.js @@ -29,7 +29,7 @@ function SpOrderItem(props) { const { market_price: enMarketPrice } = order_page const { priceDisplayConfig = {} } = useSelector((state) => state.purchase) const { order_detail_page = {} } = priceDisplayConfig - const { activity_price: enPurActivityPrice, sale_price: enPurSalePrice } = order_detail_page + const { activity_price: enPurActivityPrice = true, sale_price: enPurSalePrice } = order_detail_page if (!info) return null diff --git a/src/components/sp-render-goods/index.jsx b/src/components/sp-render-goods/index.jsx index ce4ffe1b0..01b5bf3d5 100644 --- a/src/components/sp-render-goods/index.jsx +++ b/src/components/sp-render-goods/index.jsx @@ -27,7 +27,7 @@ function SpGoodsCard(props) { } = item_page const { priceDisplayConfig = {} } = useSelector((state) => state.purchase) const { items_page = {} } = priceDisplayConfig - const { activity_price: enPurActivityPrice, sale_price: enPurSalePrice } = items_page + const { activity_price: enPurActivityPrice = true, sale_price: enPurSalePrice } = items_page const { onClick, diff --git a/src/pages/cart/comps/comp-goodsitem.js b/src/pages/cart/comps/comp-goodsitem.js index 07c283f28..62af41174 100644 --- a/src/pages/cart/comps/comp-goodsitem.js +++ b/src/pages/cart/comps/comp-goodsitem.js @@ -52,7 +52,7 @@ function CompGoodsItem(props) { const { market_price: enMarketPrice } = cart_page const { priceDisplayConfig = {} } = useSelector((state) => state.purchase) const { cart_page: pcart_page = {} } = priceDisplayConfig - const { activity_price: enPurActivityPrice, sale_price: enPurSalePrice } = pcart_page + const { activity_price: enPurActivityPrice = true, sale_price: enPurSalePrice } = pcart_page const [state, setState] = useImmer(initialState) const { localNum } = state diff --git a/src/subpages/purchase/activity-list.js b/src/subpages/purchase/activity-list.js index 761a08e39..22ef6d20a 100644 --- a/src/subpages/purchase/activity-list.js +++ b/src/subpages/purchase/activity-list.js @@ -197,11 +197,12 @@ function PurchaseActivityList() { const handlePriceConfig = (val) => { if (!val) return {} const priceConfig = JSON.parse(JSON.stringify(val)) + const isEnabled = (value) => ![false, 'false', 0, '0'].includes(value) Object.keys(priceConfig).forEach((key) => { const c_config = priceConfig[key] if (c_config) { for (let ckey in c_config) { - c_config[ckey] = c_config[ckey] == 'true' + c_config[ckey] = isEnabled(c_config[ckey]) } } }) diff --git a/src/subpages/purchase/select-identity.js b/src/subpages/purchase/select-identity.js index 65a184782..d26982313 100644 --- a/src/subpages/purchase/select-identity.js +++ b/src/subpages/purchase/select-identity.js @@ -25,11 +25,12 @@ import './select-identity.scss' function handlePriceConfig(val) { if (!val) return {} const priceConfig = JSON.parse(JSON.stringify(val)) + const isEnabled = (value) => ![false, 'false', 0, '0'].includes(value) Object.keys(priceConfig).forEach((key) => { const c_config = priceConfig[key] if (c_config) { for (const ckey in c_config) { - c_config[ckey] = c_config[ckey] == 'true' + c_config[ckey] = isEnabled(c_config[ckey]) } } })