From 785c8db06e09673591c2fd25f69bab19079e7b20 Mon Sep 17 00:00:00 2001 From: "Your Name (aider)" Date: Wed, 14 May 2025 17:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8D=A1=E7=89=87=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/screens/previewOrder/perviewOrder.tsx | 70 ++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/app/screens/previewOrder/perviewOrder.tsx b/app/screens/previewOrder/perviewOrder.tsx index 082e29f..a868c00 100644 --- a/app/screens/previewOrder/perviewOrder.tsx +++ b/app/screens/previewOrder/perviewOrder.tsx @@ -45,6 +45,29 @@ export const PreviewOrder = () => { 立即支付 + {/* Order Details Card */} + + 订单详情 + + 收货地址: + {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} + + )} + + {/* Payment Details */} @@ -71,7 +94,7 @@ export const PreviewOrder = () => { onPress={handleSubmit} disabled={showPhoneInput && !phoneNumber} > - 提交 + 确认支付 @@ -182,4 +205,49 @@ const styles = StyleSheet.create({ fontSize: 16, backgroundColor: "#f9f9f9", }, + // Card styles for order details + card: { + backgroundColor: "#ffffff", // White background for the card + borderRadius: 12, // Rounded corners + marginHorizontal: 15, // Horizontal margin + marginTop: 20, // Margin from the top element + padding: 18, // Inner padding + shadowColor: "#000", // Shadow for depth + shadowOffset: { + width: 0, + height: 2, + }, + shadowOpacity: 0.1, + shadowRadius: 3.84, + elevation: 5, // Elevation for Android + }, + cardTitle: { + fontSize: 18, + fontWeight: "bold", + color: "#333333", + marginBottom: 15, // Space below the title + fontFamily: "PingFang SC", + }, + 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 + borderBottomWidth: 1, + borderBottomColor: "#f0f0f0", // Lighter separator line + }, + detailLabel: { + fontSize: 15, + color: "#555555", // Slightly lighter label color + fontFamily: "PingFang SC", + fontWeight: '500', + marginRight: 10, // Space between label and value + }, + detailValue: { + fontSize: 15, + color: "#333333", // Darker value color + fontFamily: "PingFang SC", + textAlign: 'right', + flexShrink: 1, // Allow text to shrink and wrap + }, });