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 a9b209265c9efac2f5b0c49a8a926b6e212f1480..1a67f616ca78b337fbcb574e2858b26885e1fd8f 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 3aed10914c5fa51e24e22c77976ae2c9e956fee7..40dc6870b3d1cc9076cd6695cb820b384a0d141e 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 0b874f5cd46ed735b00bfd6c84bece890f24de08..a567d6831ef6bc324b9ebe3b9cfda3e8ef5c5ed8 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 9747a29cc4d8416566505b7e0a5d6d7e038ce230..27b1fd7a538e5ff8520c425456499074d7eec762 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()) {