From 2a24ddc3adff075d990ae21c1ae591a9c9a10867 Mon Sep 17 00:00:00 2001 From: "Your Name (aider)" Date: Wed, 14 May 2025 17:43:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E6=94=AF=E4=BB=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=AF=A6=E6=83=85=E8=A1=8C=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/screens/previewOrder/perviewOrder.tsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/screens/previewOrder/perviewOrder.tsx b/app/screens/previewOrder/perviewOrder.tsx index e43310a..cbfe613 100644 --- a/app/screens/previewOrder/perviewOrder.tsx +++ b/app/screens/previewOrder/perviewOrder.tsx @@ -4,6 +4,12 @@ import BackIcon from "../../components/BackIcon"; import { useNavigation } from "@react-navigation/native"; import { useState, useEffect } from "react"; +// 假设的图标组件 - 请替换为您的实际图标 +const AddressIcon = ({ size, color }) => 📍; // 示例图标 +const AmountIcon = ({ size, color }) => 💰; // 示例图标 +const ShippingIcon = ({ size, color }) => 🚚; // 示例图标 +const WhatsAppIcon = ({ size, color }) => 💬; // 示例图标 + export const PreviewOrder = () => { const {orderData, setOrderData} = useCreateOrderStore(); const navigation = useNavigation(); @@ -65,19 +71,23 @@ export const PreviewOrder = () => { 支付信息 + 收货地址: {orderData?.address || "请选择地址"} + 订单金额: {orderData?.amount ? `${orderData.currency || ''} ${orderData.amount}` : "N/A"} + 运费: {orderData?.shipping_fee ? `${orderData.currency || ''} ${orderData.shipping_fee}` : "N/A"} {orderData?.whatsapp_phone && ( + WhatsApp: {orderData.whatsapp_phone} @@ -232,9 +242,9 @@ const styles = StyleSheet.create({ }, detailRow: { flexDirection: "row", - justifyContent: "space-between", - alignItems: "flex-start", // Align items to the start for multi-line values - paddingVertical: 8, // Vertical padding for each row + // justifyContent: "space-between", // We'll handle spacing differently with icons + alignItems: "center", // Align items vertically centered + paddingVertical: 10, // Adjusted vertical padding borderBottomWidth: 1, borderBottomColor: "#f0f0f0", // Lighter separator line }, @@ -243,7 +253,9 @@ const styles = StyleSheet.create({ color: "#555555", // Slightly lighter label color fontFamily: "PingFang SC", fontWeight: '500', + marginLeft: 8, // Add margin to the left of the label, after the icon marginRight: 10, // Space between label and value + flex: 1, // Allow label to take available space before value }, detailValue: { fontSize: 15,