diff --git a/packages/uni-api/src/service/base/upx2px.ts b/packages/uni-api/src/service/base/upx2px.ts index a79e08e8fca6de13492946039b84fdfd09bbf142..25b4ce88aa7428e10feda74462b0c416e2114c84 100644 --- a/packages/uni-api/src/service/base/upx2px.ts +++ b/packages/uni-api/src/service/base/upx2px.ts @@ -39,12 +39,14 @@ export const upx2px = defineSyncApi( if (number === 0) { return 0 } - const config = __uniConfig.globalStyle || {} - // ignore rpxCalcIncludeWidth - const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960) - const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375) let width = newDeviceWidth || deviceWidth - width = width <= maxWidth ? width : baseWidth + if (__PLATFORM__ === 'app' || __PLATFORM__ === 'h5') { + const config = __uniConfig.globalStyle || {} + // ignore rpxCalcIncludeWidth + const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960) + const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375) + width = width <= maxWidth ? width : baseWidth + } let result = (number / BASE_DEVICE_WIDTH) * width if (result < 0) { result = -result diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 4a5af42d36d54845c77946306a7d5901fd3d10f6..0907c625b6ccf0019c8f9fa7fba63328692b928e 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -9919,11 +9919,13 @@ const upx2px = /* @__PURE__ */ defineSyncApi(API_UPX2PX, (number, newDeviceWidth if (number === 0) { return 0; } - const config = __uniConfig.globalStyle || {}; - const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960); - const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375); let width = newDeviceWidth || deviceWidth; - width = width <= maxWidth ? width : baseWidth; + { + const config = __uniConfig.globalStyle || {}; + const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960); + const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375); + width = width <= maxWidth ? width : baseWidth; + } let result = number / BASE_DEVICE_WIDTH * width; if (result < 0) { result = -result; diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js index f6689d4e42da21a8f72f3a47711c301c7ed8dc03..998a9d070d4de406713cdb7317304cad85bcc891 100644 --- a/packages/uni-mp-alipay/dist/uni.api.esm.js +++ b/packages/uni-mp-alipay/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js index 1483956c72431cf43767508ccd7b8f275dd47c10..5aa2de859d18fda657f6f46caa213084bc9ad809 100644 --- a/packages/uni-mp-baidu/dist/uni.api.esm.js +++ b/packages/uni-mp-baidu/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js index aba065d2ff0ca4d86574aaca8c0a49a21bdef22f..54ee8a224ea3d7d9d4c37f50adb1ebd987adb00c 100644 --- a/packages/uni-mp-qq/dist/uni.api.esm.js +++ b/packages/uni-mp-qq/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-toutiao/dist/uni.api.esm.js b/packages/uni-mp-toutiao/dist/uni.api.esm.js index afbc9a949792955bda380b8f540f0bf0cecc7515..5266f86b4600aacd8a90e6fe09d57c2c2fe771c8 100644 --- a/packages/uni-mp-toutiao/dist/uni.api.esm.js +++ b/packages/uni-mp-toutiao/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js index 3597aafe4619a12cd86c656fb47ce303cefede30..5c7f3ff5615ccbb577e0885e94a76b076359f27c 100644 --- a/packages/uni-mp-weixin/dist/uni.api.esm.js +++ b/packages/uni-mp-weixin/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js index cd9bba97ba3d6475dd998640571f7778562d3a49..bd6e7e8a6263a8da90bd8a21833b5eb65854d18c 100644 --- a/packages/uni-quickapp-webview/dist/uni.api.esm.js +++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; }