手机支付问题，解决冲突

app/screens/productStatus/OrderDatails.tsx

@@ -54,15 +54,7 @@ import { cartApi } from "../../services/api/cart";
 import IconComponent from "../../components/IconComponent";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { CountryList } from "../../constants/countries";
-
-// 定义本地存储的国家数据类型
-interface LocalCountryData {
-  code: string;
-  flag: string;
-  name: string;
-  phoneCode: string;
-  userCount: number;
-}
+import { getOrderTransLanguage } from "../../utils/languageUtils";
 
 // 定义选项类型
 interface PaymentOption {
@@ -78,6 +70,15 @@ interface TabType {
   options: PaymentOption[];
 }
 
+// 定义本地存储的国家数据类型
+interface LocalCountryData {
+  code: string;
+  flag: string;
+  name: string;
+  phoneCode: string;
+  userCount: number;
+}
+
 type Styles = {
   safeArea: ViewStyle;
   safeAreaContent: ViewStyle;
@@ -970,7 +971,7 @@ export const OrderDetails = () => {
                         <View style={styles.productItemInfo}>
                           <View style={styles.productItemInfoName}>
                             <Text style={styles.productItemInfoNameText}>
-                              {item.product_name}
+                              {getOrderTransLanguage(item) || item.product_name_fr}
                             </Text>
                           </View>
                           <View style={styles.productItemInfoSku}>
@@ -1042,7 +1043,7 @@ export const OrderDetails = () => {
                         {t("order.platform_shipping")}
                       </Text>
                       <Text style={styles.orderIdText1}>
-                        {orderDetails.domestic_shipping_fee}
+                        {orderDetails.domestic_shipping_fee} {orderDetails.currency}
                       </Text>
                     </View>
                     <View style={styles.orderId}>
@@ -1050,21 +1051,21 @@ export const OrderDetails = () => {
                         {t("order.international_shipping")}
                       </Text>
                       <Text style={styles.orderIdText1}>
-                        {orderDetails.shipping_fee}
+                        {orderDetails.shipping_fee} {orderDetails.currency}
                       </Text>
                     </View>
                     <View style={styles.dottedLine}></View>
                     <View style={styles.orderId}>
                       <Text style={styles.TotalText}>{t("order.total")}</Text>
                       <Text style={styles.TotalPrice}>
-                        {orderDetails.total_amount}
+                        {orderDetails.total_amount} {orderDetails.currency}
                       </Text>
                     </View>
                     <View>
                       <Text style={styles.orderRemakeText}>
-                        + ${orderDetails.shipping_fee}{" "}
+                        + {orderDetails.shipping_fee}{" "}
                         {t("order.estimated_shipping")}
-                        (COD)
+                        ({orderDetails.currency})
                       </Text>
                     </View>
                   </View>

app/screens/productStatus/Status.tsx

@@ -26,6 +26,7 @@ import {
 import { useNavigation } from "@react-navigation/native";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { useOrderListStore } from "../../store/orderList";
+import { getOrderTransLanguage } from "../../utils/languageUtils";
 // import ImageView from "react-native-image-viewing";
 
 type StatusScreenRouteProp = RouteProp<
@@ -243,7 +244,7 @@ export function Status() {
                         </TouchableOpacity>
                         <View style={styles.orderProductItemInfo}>
                           <Text style={styles.orderProductItemInfoName}>
-                            {item.product_name}
+                            {getOrderTransLanguage(item) || item.product_name_fr}
                           </Text>
                           {item.sku_attributes?.map((attr, index) => (
                             <Text

app/utils/languageUtils.ts

@@ -59,9 +59,12 @@ export const getSkuTransLanguage = <T extends Record<string, any>>(data: T): str
 
 
 export const getOrderTransLanguage = <T extends Record<string, any>>(data: T): string => {
+  console.log(data);
+  
   // 获取当前i18n语言
   const currentLang = getCurrentLanguage();
   
+  
   // 特殊处理中文
   if (currentLang === 'zh' && 'value' in data) {
     return data.value as string;
@@ -72,14 +75,19 @@ export const getOrderTransLanguage = <T extends Record<string, any>>(data: T): s
     key.startsWith('product_name')
   );
 
+  
+
   // 查找匹配的字段
   const matchedField = translationFields.find(field => {
     // 从字段名中提取语言代码
-    const langCode = field.replace('product_name', '');
+    const langCode = field.replace('product_name_', '');
+    
     // 如果没有后缀，则为法语
     return langCode === '' ? currentLang === 'fr' : langCode === currentLang;
   });
   
+  
+
   // 返回匹配的翻译值，如果没有匹配则返回法语
-  return (data[matchedField || 'product_name'] as string) || '';
+  return (data[matchedField || 'product_name_fr'] as string) || '';
 };