From c42ef04bd2e009f4eb51e25f35d555f6e7c5e665 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Tue, 18 Jun 2024 15:35:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=87=87=E7=94=A8=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/px-transform.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/utils/px-transform.ts b/src/utils/px-transform.ts index 33f5b66c10..b42e67f026 100644 --- a/src/utils/px-transform.ts +++ b/src/utils/px-transform.ts @@ -1,12 +1,7 @@ -import Taro, { pxTransform as transform } from '@tarojs/taro' +import { pxTransform as transform } from '@tarojs/taro' +import { harmony, rn } from './platform-taro' export default function pxTransform(value: number) { - const isHarmony = [ - Taro.ENV_TYPE.HARMONY, - Taro.ENV_TYPE.HARMONYHYBRID, - // @ts-ignore - ].includes(Taro.getEnv()) - - if (isHarmony) return transform(value) - return value + if (harmony() && rn()) return transform(value) + return `${value}px` } From c49d6ca8eebce0e473559bd933d5657c871765ad Mon Sep 17 00:00:00 2001 From: oasis <12181600+oasis-cloud@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:41:31 +0800 Subject: [PATCH 2/3] Update px-transform.ts --- src/utils/px-transform.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/px-transform.ts b/src/utils/px-transform.ts index b42e67f026..058f40e448 100644 --- a/src/utils/px-transform.ts +++ b/src/utils/px-transform.ts @@ -2,6 +2,6 @@ import { pxTransform as transform } from '@tarojs/taro' import { harmony, rn } from './platform-taro' export default function pxTransform(value: number) { - if (harmony() && rn()) return transform(value) + if (harmony() || rn()) return transform(value) return `${value}px` } From 30835a61236a7632aa0996f948baff2de24e7f38 Mon Sep 17 00:00:00 2001 From: oasis <12181600+oasis-cloud@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:41:49 +0800 Subject: [PATCH 3/3] Update px-transform.ts