From 7edf7fb9d55fe164f3d61cf7bb1db5e721f7a753 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Wed, 16 Nov 2022 11:28:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(app):=20=E4=BF=AE=E5=A4=8Dnvue=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5navigationBarTextStyle=E8=AE=BE=E7=BD=AE=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=20(question/150485)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/platforms/app-plus/define-pages.js                  | 3 +--
 .../lib/platforms/app-plus/index.js                         | 6 +++---
 .../lib/platforms/app-plus/index.v3.js                      | 6 +++---
 packages/webpack-uni-pages-loader/lib/platforms/mp.js       | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/define-pages.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/define-pages.js
index a9b209265c..1a67f616ca 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/define-pages.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/define-pages.js
@@ -1,8 +1,7 @@
 const fs = require('fs')
 
 function generatePageCode (pages, pageOptions) {
-  return pages.map(page => {
-    const pagePath = page.path
+  return pages.map(pagePath => {
     if (pageOptions[pagePath].nvue) {
       return ''
     }
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index 3aed10914c..40dc6870b3 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -135,8 +135,8 @@ module.exports = function (pagesJson, userManifestJson, isAppView) {
   parseTheme(appJson.window)
 
   const navigationBarTextStyle =
-  (appJson.pages[0].style && appJson.pages[0].style.navigationBarTextStyle) ||
-  (appJson.window && appJson.window.navigationBarTextStyle) ||
+  (pagesJson.pages[0].style && pagesJson.pages[0].style.navigationBarTextStyle) ||
+  (pagesJson.globalStyle && pagesJson.globalStyle.navigationBarTextStyle) ||
   'white'
   const navigationBarBackgroundColor = (appJson.window && appJson.window.navigationBarBackgroundColor) || '#000000'
 
@@ -491,7 +491,7 @@ module.exports = function (pagesJson, userManifestJson, isAppView) {
   appJson.compilerVersion = uniApp.compilerVersion
 
   if (process.env.UNI_USING_V8) {
-    let entryPagePath = appJson.pages[0].path
+    let entryPagePath = appJson.pages[0]
     let conditionPagePath = false
     if (manifestJson.plus.arguments) {
       try {
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
index 0b874f5cd4..a567d6831e 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
@@ -34,17 +34,17 @@ function parseEntryPagePath (appJson, manifestJson) {
       const args = JSON.parse(argsJsonStr)
       const pathName = args.path || args.pathName
       const entryPageQuery = (args.query ? ('?' + args.query) : '')
-      if (pathName && appJson.pages[0].path !== pathName) {
+      if (pathName && appJson.pages[0] !== pathName) {
         appJson.entryPagePath = pathName
         appJson.entryPageQuery = entryPageQuery
         if (!isTabBarPage(pathName, getTabBarPages(appJson))) {
-          appJson.realEntryPagePath = appJson.pages[0].path
+          appJson.realEntryPagePath = appJson.pages[0]
         }
       }
     } catch (e) {}
   }
   if (!appJson.entryPagePath) {
-    appJson.entryPagePath = appJson.pages[0].path
+    appJson.entryPagePath = appJson.pages[0]
   }
 }
 
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp.js b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
index 9747a29cc4..27b1fd7a53 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/mp.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
@@ -223,7 +223,7 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
   parsePages(
     pagesJson,
     function (page) {
-      app.pages.push(page)
+      app.pages.push(page.path)
     },
     function (root, page, subPackage) {
       if (!isSupportSubPackages()) {
-- 
GitLab