fix(app): statusBarStyle

packages/shims-uni-app.d.ts

@@ -8,7 +8,7 @@ declare namespace Page {
       options: Record<string, any>
       meta: UniApp.PageRouteMeta
       openType: UniApp.OpenType
-      statusBarStyle?: string
+      statusBarStyle?: 'dark' | 'light'
     }
   }
 }

packages/uni-app-plus/dist/uni-app-service.es.js

@@ -1704,6 +1704,7 @@ var serviceContext = (function (vue) {
           options: pageQuery,
           meta,
           openType,
+          statusBarStyle: meta.navigationBar.titleColor === '#000000' ? 'dark' : 'light',
       };
   }
 
@@ -9014,12 +9015,11 @@ var serviceContext = (function (vue) {
   plus.navigator.setStatusBarStyle = newSetStatusBarStyle;
   function setStatusBarStyle(statusBarStyle) {
       if (!statusBarStyle) {
-          const pages = getCurrentPages();
-          if (!pages.length) {
+          const page = getCurrentPage();
+          if (!page) {
               return;
           }
-          statusBarStyle = pages[pages.length - 1].$page
-              .statusBarStyle;
+          statusBarStyle = page.$page.statusBarStyle;
           if (!statusBarStyle || statusBarStyle === lastStatusBarStyle) {
               return;
           }
@@ -10519,6 +10519,7 @@ var serviceContext = (function (vue) {
               if (callOnShow && !webview.__preload__) {
                   invokeHook(tabBarPage, ON_SHOW);
               }
+              setStatusBarStyle();
               resolve(undefined);
           }
           else {
@@ -10532,7 +10533,6 @@ var serviceContext = (function (vue) {
                   resolve(undefined);
               }, 70);
           }
-          setStatusBarStyle();
       });
   }
 

packages/uni-app-plus/src/service/api/route/switchTab.ts

@@ -111,6 +111,7 @@ function _switchTab({
       if (callOnShow && !(webview as any).__preload__) {
         invokeHook(tabBarPage, ON_SHOW)
       }
+      setStatusBarStyle()
       resolve(undefined)
     } else {
       showWebview(
@@ -129,6 +130,5 @@ function _switchTab({
         70
       )
     }
-    setStatusBarStyle()
   })
 }

packages/uni-app-plus/src/service/statusBar.ts

+import { getCurrentPage } from '@dcloudio/uni-core'
 import { formatLog } from '@dcloudio/uni-shared'
 
 type SetStatusBarStyle = typeof plus.navigator.setStatusBarStyle
@@ -22,12 +23,11 @@ plus.navigator.setStatusBarStyle = newSetStatusBarStyle
 
 export function setStatusBarStyle(statusBarStyle?: StatusBarStyle) {
   if (!statusBarStyle) {
-    const pages = getCurrentPages()
-    if (!pages.length) {
+    const page = getCurrentPage()
+    if (!page) {
       return
     }
-    statusBarStyle = pages[pages.length - 1].$page
-      .statusBarStyle as StatusBarStyle
+    statusBarStyle = page.$page.statusBarStyle as StatusBarStyle
     if (!statusBarStyle || statusBarStyle === lastStatusBarStyle) {
       return
     }

packages/uni-app-vite/dist/plugin/build.js

@@ -7,26 +7,29 @@ exports.buildOptions = void 0;
 const path_1 = __importDefault(require("path"));
 const slash_1 = __importDefault(require("slash"));
 const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
-exports.buildOptions = {
-    rollupOptions: {
-        input: uni_cli_shared_1.resolveMainPathOnce(process.env.UNI_INPUT_DIR),
-        external: ['vue'],
-        output: {
-            name: 'AppService',
-            format: process.env.UNI_APP_CODE_SPLITING ? 'amd' : 'iife',
-            entryFileNames: 'app-service.js',
-            manualChunks: {},
-            chunkFileNames(chunk) {
-                if (chunk.isDynamicEntry && chunk.facadeModuleId) {
-                    const filepath = path_1.default.relative(process.env.UNI_INPUT_DIR, chunk.facadeModuleId);
-                    return slash_1.default(filepath.replace(path_1.default.extname(filepath), '.js'));
-                }
-                return '[name].js';
-            },
-            assetFileNames: '[name][extname]',
-            globals: {
-                vue: 'Vue',
+function buildOptions() {
+    return {
+        rollupOptions: {
+            input: uni_cli_shared_1.resolveMainPathOnce(process.env.UNI_INPUT_DIR),
+            external: ['vue'],
+            output: {
+                name: 'AppService',
+                format: process.env.UNI_APP_CODE_SPLITING ? 'amd' : 'iife',
+                entryFileNames: 'app-service.js',
+                manualChunks: {},
+                chunkFileNames(chunk) {
+                    if (chunk.isDynamicEntry && chunk.facadeModuleId) {
+                        const filepath = path_1.default.relative(process.env.UNI_INPUT_DIR, chunk.facadeModuleId);
+                        return slash_1.default(filepath.replace(path_1.default.extname(filepath), '.js'));
+                    }
+                    return '[name].js';
+                },
+                assetFileNames: '[name][extname]',
+                globals: {
+                    vue: 'Vue',
+                },
             },
         },
-    },
-};
+    };
+}
+exports.buildOptions = buildOptions;

packages/uni-app-vite/dist/plugin/index.js

@@ -10,7 +10,7 @@ exports.UniAppPlugin = {
     uni: uni_1.uniOptions,
     config() {
         return {
-            build: build_1.buildOptions,
+            build: build_1.buildOptions(),
         };
     },
     configResolved: configResolved_1.configResolved,

packages/uni-cli-shared/src/json/pages.ts

@@ -99,9 +99,13 @@ function normalizePageStyle(
 ) {
   if (pageStyle) {
     if (platform === 'h5') {
-      extend(pageStyle, pageStyle['app'] || pageStyle['app-plus'] || {})
+      extend(pageStyle, pageStyle['app'] || pageStyle['app-plus'])
+    }
+    if (platform === 'app') {
+      extend(pageStyle, pageStyle['app'] || pageStyle['app-plus'])
+    } else {
+      extend(pageStyle, pageStyle[platform])
     }
-    extend(pageStyle, pageStyle[platform] || {})
     if (['h5', 'app'].includes(platform)) {
       pageStyle.navigationBar = normalizeNavigationBar(pageStyle)
       if (isEnablePullDownRefresh(pageStyle)) {

packages/uni-core/src/helpers/page.ts

@@ -116,5 +116,7 @@ export function initPageInternalInstance(
     options: pageQuery,
     meta,
     openType,
+    statusBarStyle:
+      meta.navigationBar.titleColor === '#000000' ? 'dark' : 'light',
   }
 }