From e9d0d462443354ae9c93921262fdbf36b273164f Mon Sep 17 00:00:00 2001
From: JiaJun <2394389886@qq.com>
Date: Wed, 15 Apr 2026 09:20:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E9=81=97=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                              |  3 +--
 src/features/goods/GoodsCategoryList.tsx |  6 +++---
 src/features/goods/GoodsRedeemModal.tsx  |  6 +++---
 src/features/goods/useGoodsCatalog.ts    | 12 ++++--------
 src/types/index.ts                       |  3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 1348078..47c853d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -30,8 +30,7 @@ function App() {
 
             if (previousLanguage && previousLanguage !== normalizedLanguage) {
                 await queryClient.cancelQueries()
-                await queryClient.invalidateQueries()
-                await queryClient.refetchQueries({type: 'active'})
+                await queryClient.invalidateQueries({refetchType: 'active'})
             }
 
             previousLanguageRef.current = normalizedLanguage
diff --git a/src/features/goods/GoodsCategoryList.tsx b/src/features/goods/GoodsCategoryList.tsx
index 56aafe2..e26adad 100644
--- a/src/features/goods/GoodsCategoryList.tsx
+++ b/src/features/goods/GoodsCategoryList.tsx
@@ -89,7 +89,7 @@ export function GoodsCategoryList({
                                     className="flex h-[36px] w-[36px] items-center justify-center rounded-[12px] bg-[#FA6A00]/15 text-[#FE9F00]">
                                     <CategoryIcon className="h-[18px] w-[18px]" aria-hidden="true"/>
                                 </div>
-                                <div className="truncate text-[15px] font-semibold text-white">{category.name}</div>
+                                <div className="truncate text-[15px] font-semibold text-white">{t(HOME_CATEGORY_META_MAP[category.id].nameKey)}</div>
                             </div>
                             {showMore && onMoreClick ? (
                                 <button
@@ -116,12 +116,12 @@ export function GoodsCategoryList({
                                             <div className="text-[16px] font-medium text-white">{product.title}</div>
                                             <div className="text-[13px] text-white/52">{product.subtitle}</div>
                                         </div>
-                                        <div className="text-[16px] font-semibold text-[#FA6A00]">{product.score}</div>
+                                        <div className="text-[16px] font-semibold text-[#FA6A00]">{product.scoreValue} {t('common.points')}</div>
                                         <Button
                                             className="h-[36px] w-full text-[13px]"
                                             onClick={() => onRedeem(product, category.id)}
                                         >
-                                            {product.ctaLabel}
+                                            {t(HOME_CATEGORY_META_MAP[category.id].ctaLabelKey)}
                                         </Button>
                                     </div>
                                 </div>
diff --git a/src/features/goods/GoodsRedeemModal.tsx b/src/features/goods/GoodsRedeemModal.tsx
index 9c7f55a..ff5824f 100644
--- a/src/features/goods/GoodsRedeemModal.tsx
+++ b/src/features/goods/GoodsRedeemModal.tsx
@@ -239,7 +239,7 @@ export function GoodsRedeemModal({
                                 </div>
                                 <div className="flex items-center justify-between py-[14px] text-white">
                                     <div className="text-[18px]">{t('goods.pointsRequired')}</div>
-                                    <div className="text-[18px]">{getNumericValue(selectedProductData.score)}</div>
+                                    <div className="text-[18px]">{getNumericValue(String(selectedProductData.scoreValue))}</div>
                                 </div>
                                 <div className="flex items-center justify-between py-[14px] text-white">
                                     <div className="text-[18px] underline decoration-[#1E90FF] underline-offset-[3px]">
@@ -262,7 +262,7 @@ export function GoodsRedeemModal({
                                 </div>
                                 <div className="flex items-center justify-between py-[14px] text-white">
                                     <div className="text-[13px] text-white/78">{t('goods.pointsRequired')}</div>
-                                    <div className="text-[14px]">{getNumericValue(selectedProductData.score)}</div>
+                                    <div className="text-[14px]">{getNumericValue(String(selectedProductData.scoreValue))}</div>
                                 </div>
                                 <div className="flex items-center justify-between py-[14px] text-white">
                                     <div className="text-[13px] text-white/78">{t('goods.turnoverRequirement')}</div>
@@ -287,7 +287,7 @@ export function GoodsRedeemModal({
                                 </div>
                                 <div className="flex items-center justify-between py-[12px]">
                                     <div className="text-[13px] text-white/82">{t('goods.pointsCost')}</div>
-                                    <div className="text-[15px] text-white">{getNumericValue(selectedProductData.score)}</div>
+                                    <div className="text-[15px] text-white">{getNumericValue(String(selectedProductData.scoreValue))}</div>
                                 </div>
                             </div>
 
diff --git a/src/features/goods/useGoodsCatalog.ts b/src/features/goods/useGoodsCatalog.ts
index 5fb1f13..52824a2 100644
--- a/src/features/goods/useGoodsCatalog.ts
+++ b/src/features/goods/useGoodsCatalog.ts
@@ -1,7 +1,6 @@
 import {useQuery} from '@tanstack/react-query'
 
 import {goodList} from '@/api/business.ts'
-import i18n from '@/lib/i18n'
 import {
     API_ORIGIN,
     HOME_CATEGORY_META_MAP,
@@ -23,15 +22,12 @@ function getProductImageUrl(image?: string) {
     return new URL(image, API_ORIGIN).toString()
 }
 
-function mapGoodItemToProductItem(item: GoodsItem, type: goodsType): ProductItem {
-    const categoryMeta = HOME_CATEGORY_META_MAP[type]
-
+function mapGoodItemToProductItem(item: GoodsItem): ProductItem {
     return {
         id: String(item.id),
         title: item.title,
         subtitle: item.description,
-        score: `${item.score} ${i18n.t('common.points')}`,
-        ctaLabel: i18n.t(categoryMeta.ctaLabelKey),
+        scoreValue: item.score,
         imageUrl: getProductImageUrl(item.image),
     }
 }
@@ -39,8 +35,8 @@ function mapGoodItemToProductItem(item: GoodsItem, type: goodsType): ProductItem
 function buildProductCategories(groups: Record<goodsType, GoodsItem[]>): ProductCategory[] {
     return HOME_GOOD_TYPE_ORDER.map((type) => ({
         id: type,
-        name: i18n.t(HOME_CATEGORY_META_MAP[type].nameKey),
-        items: groups[type].map((item) => mapGoodItemToProductItem(item, type)),
+        name: HOME_CATEGORY_META_MAP[type].nameKey,
+        items: groups[type].map((item) => mapGoodItemToProductItem(item)),
     }))
 }
 
diff --git a/src/types/index.ts b/src/types/index.ts
index 58ccdce..6a192c5 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -51,8 +51,7 @@ export type ProductItem = {
     id: string
     title: string
     subtitle: string
-    score: string
-    ctaLabel: string
+    scoreValue: number | string
     imageClassName?: string
     imageUrl?: string
 }