From de14608f98b4072358471e84fedc016b9c0d3b17 Mon Sep 17 00:00:00 2001 From: Mac Date: Sat, 3 May 2025 08:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/screens/Recipient/ConfirmOrder.tsx | 5 +++-- app/screens/productStatus/Status.tsx | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/screens/Recipient/ConfirmOrder.tsx b/app/screens/Recipient/ConfirmOrder.tsx index a86142b..813c67a 100644 --- a/app/screens/Recipient/ConfirmOrder.tsx +++ b/app/screens/Recipient/ConfirmOrder.tsx @@ -11,6 +11,7 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack'; import BackIcon from '../../components/BackIcon'; import fontSize from '../../utils/fontsizeUtils'; import useOrderStore from '../../store/order'; +import widthUtils from '../../utils/widthUtils'; import { ordersApi } from '../../services/api/orders'; import { Order } from '../../services/api/orders'; export function ConfirmOrder() { @@ -208,7 +209,7 @@ const styles = StyleSheet.create({ fontWeight: '500', }, border: { - height: 6, + height: widthUtils(6,6).height, backgroundColor: '#f5f5f5', }, orderNumber: { @@ -241,7 +242,7 @@ const styles = StyleSheet.create({ shippingLabel: { fontSize: fontSize(14), color: '#666', - width: 80, + width: widthUtils(80,80).width, }, shippingValue: { fontSize: fontSize(14), diff --git a/app/screens/productStatus/Status.tsx b/app/screens/productStatus/Status.tsx index 6a1744e..8a14b1f 100644 --- a/app/screens/productStatus/Status.tsx +++ b/app/screens/productStatus/Status.tsx @@ -13,6 +13,7 @@ import BackIcon from "../../components/BackIcon"; import MassageIcon from "../../components/MassageIcon"; import { useEffect, useState, useRef } from "react"; import fontSize from "../../utils/fontsizeUtils"; +import widthUtils from "../../utils/widthUtils"; import { ordersApi, PaginatedOrderResponse, @@ -300,7 +301,7 @@ const styles = StyleSheet.create({ alignItems: "center", }, statusTitle: { - fontSize: 16, + fontSize: fontSize(16), fontWeight: "600", }, statusList: { @@ -312,7 +313,7 @@ const styles = StyleSheet.create({ width: "100%", }, statusItem: { - width: 100, + width: widthUtils(100,100).width, padding: 16, backgroundColor: "white", }, @@ -369,8 +370,8 @@ const styles = StyleSheet.create({ borderColor: "#f5f5f5", }, orderProductItemImage: { - width: 30, - height: 30, + width: widthUtils(30,30).width, + height: widthUtils(30,30).height, marginRight: 10, }, orderProductItemInfo: {