From ffc7279c597f54b5c151b063def323a1a988095b Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 3 Feb 2021 11:58:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(App):=20=E4=BF=AE=E5=A4=8D=E7=BA=AF=20nvue?=
 =?UTF-8?q?=20=E7=BC=96=E8=AF=91=E6=A8=A1=E5=BC=8F=E4=B8=8B=20pages.json?=
 =?UTF-8?q?=20=E7=BC=BA=E5=B0=91=20style=20=E8=8A=82=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99=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/webpack-uni-nvue-loader/lib/template.js           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
index 6b9291faa..8ee175feb 100644
--- a/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
+++ b/packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
@@ -69,6 +69,7 @@ module.exports = function (content, map) {
   }
 
   Object.assign(appJson.globalStyle, appJson.globalStyle['app-plus'] || {})
+  pageJson.style = pageJson.style || {}
   Object.assign(pageJson.style, pageJson.style['app-plus'] || {})
   const pageJsonStyle = Object.assign(appJson.globalStyle, pageJson.style)
   if (pageJsonStyle.disableScroll === true) {
@@ -78,4 +79,4 @@ module.exports = function (content, map) {
   this.callback(null,
     `<scroll-view :scroll-y="true" :show-scrollbar="${pageJsonStyle.scrollIndicator === 'none' ? 'false' : 'true'}" :enableBackToTop="true" bubble="true" style="flex-direction:column">${content}</scroll-view>`,
     map)
-}
+}
-- 
GitLab