From 29dd7b43ec322c76f27b392db25c6086e552ed9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=95=8F?= Date: Sun, 25 Apr 2021 17:15:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(H5):=20=E4=BF=AE=E5=A4=8Dh5=E7=AB=AF?= =?UTF-8?q?=E9=83=A8=E5=88=86rpx=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BD=AC=E5=8C=96=E4=B8=BApx=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/app-vue-style-loader/lib/addStylesClient.js | 2 +- .../packages/h5-vue-style-loader/lib/addStylesClient.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js index efb454d95..5c304b26a 100644 --- a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js +++ b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js @@ -246,7 +246,7 @@ function processCss(css) { .replace(VAR_WINDOW_LEFT, '0px') .replace(VAR_WINDOW_RIGHT, '0px') } - return css.replace(/\{[\s\S]+?\}|@media.+\{/g, function (css) { + return css.replace(/\{[\s\S]+?\}|@media[^{]+/g, function (css) { return css.replace(UPX_RE, function (a, b) { return uni.upx2px(b) + 'px' }) diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js index 78f15f8c6..44f65c541 100644 --- a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js +++ b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js @@ -253,7 +253,7 @@ function processCss(css) { .replace(BODY_SCOPED_RE, page) .replace(BODY_RE, '') .replace(PAGE_SCOPED_RE, 'body.' + page + ' uni-page-body') - .replace(/\{[\s\S]+?\}|@media.+\{/g, function (css) { + .replace(/\{[\s\S]+?\}|@media[^{]+/g, function (css) { if(typeof uni === 'undefined'){ return css } -- GitLab