提交 77b2fa5b 编写于 作者: DCloud-WZF's avatar DCloud-WZF 💬

fix(app): 修复nvue首页navigationBarTextStyle设置无效问题 (question/150485)

上级 18fbdd99
const fs = require('fs') const fs = require('fs')
function generatePageCode (pages, pageOptions) { function generatePageCode (pages, pageOptions) {
return pages.map(pagePath => { return pages.map(page => {
const pagePath = page.path
if (pageOptions[pagePath].nvue) { if (pageOptions[pagePath].nvue) {
return '' return ''
} }
......
...@@ -132,10 +132,13 @@ module.exports = function (pagesJson, userManifestJson, isAppView) { ...@@ -132,10 +132,13 @@ module.exports = function (pagesJson, userManifestJson, isAppView) {
_initTheme(appJson, userManifestJson) _initTheme(appJson, userManifestJson)
const { parseTheme(appJson.window)
navigationBarTextStyle = 'white',
navigationBarBackgroundColor = '#000000' const navigationBarTextStyle =
} = parseTheme(appJson.window) || {} (appJson.pages[0].style && appJson.pages[0].style.navigationBarTextStyle) ||
(appJson.window && appJson.window.navigationBarTextStyle) ||
'white'
const navigationBarBackgroundColor = (appJson.window && appJson.window.navigationBarBackgroundColor) || '#000000'
const TABBAR_HEIGHT = 50 const TABBAR_HEIGHT = 50
...@@ -488,7 +491,7 @@ module.exports = function (pagesJson, userManifestJson, isAppView) { ...@@ -488,7 +491,7 @@ module.exports = function (pagesJson, userManifestJson, isAppView) {
appJson.compilerVersion = uniApp.compilerVersion appJson.compilerVersion = uniApp.compilerVersion
if (process.env.UNI_USING_V8) { if (process.env.UNI_USING_V8) {
let entryPagePath = appJson.pages[0] let entryPagePath = appJson.pages[0].path
let conditionPagePath = false let conditionPagePath = false
if (manifestJson.plus.arguments) { if (manifestJson.plus.arguments) {
try { try {
......
...@@ -34,17 +34,17 @@ function parseEntryPagePath (appJson, manifestJson) { ...@@ -34,17 +34,17 @@ function parseEntryPagePath (appJson, manifestJson) {
const args = JSON.parse(argsJsonStr) const args = JSON.parse(argsJsonStr)
const pathName = args.path || args.pathName const pathName = args.path || args.pathName
const entryPageQuery = (args.query ? ('?' + args.query) : '') const entryPageQuery = (args.query ? ('?' + args.query) : '')
if (pathName && appJson.pages[0] !== pathName) { if (pathName && appJson.pages[0].path !== pathName) {
appJson.entryPagePath = pathName appJson.entryPagePath = pathName
appJson.entryPageQuery = entryPageQuery appJson.entryPageQuery = entryPageQuery
if (!isTabBarPage(pathName, getTabBarPages(appJson))) { if (!isTabBarPage(pathName, getTabBarPages(appJson))) {
appJson.realEntryPagePath = appJson.pages[0] appJson.realEntryPagePath = appJson.pages[0].path
} }
} }
} catch (e) {} } catch (e) {}
} }
if (!appJson.entryPagePath) { if (!appJson.entryPagePath) {
appJson.entryPagePath = appJson.pages[0] appJson.entryPagePath = appJson.pages[0].path
} }
} }
......
...@@ -223,7 +223,7 @@ module.exports = function (pagesJson, manifestJson, project = {}) { ...@@ -223,7 +223,7 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
parsePages( parsePages(
pagesJson, pagesJson,
function (page) { function (page) {
app.pages.push(page.path) app.pages.push(page)
}, },
function (root, page, subPackage) { function (root, page, subPackage) {
if (!isSupportSubPackages()) { if (!isSupportSubPackages()) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册