Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into examples

src/components/FirstUI/fui-footer/fui-footer.vue

@@ -130,14 +130,15 @@
 	.fui-footer__fixed-bottom {
 		position: fixed;
 		z-index: 99;
+        bottom: 0;
 		left: 0;
 		right: 0;
 		/* #ifndef APP-NVUE */
-		left: constant(safe-area-inset-left);
+		/* left: constant(safe-area-inset-left);
 		left: env(safe-area-inset-left);
 		right: constant(safe-area-inset-right);
-		right: env(safe-area-inset-right)
-			/* #endif */
+		right: env(safe-area-inset-right) */
+        /* #endif */
 	}
 
 	.fui-footer__link {

src/pages.json

@@ -54,18 +54,14 @@
         {
             "path": "pages/common/about/index",
             "style": {
-                "navigationBarTitleText": "关于我们",
-                "backgroundColorTop": "#FFFFFF",
-                "backgroundColorBottom": "#FFFFFF"
+                "navigationBarTitleText": "关于我们"
             }
         },
         // === 问题反馈 ===
         {
             "path": "pages/common/feedback/index",
             "style": {
-                "navigationBarTitleText": "问题反馈",
-                "backgroundColorTop": "#FFFFFF",
-                "backgroundColorBottom": "#FFFFFF"
+                "navigationBarTitleText": "问题反馈"
             }
         },
         // === Webview ===
@@ -89,9 +85,7 @@
                 // #ifdef H5
                 "titleNView": false,
                 // #endif
-                "navigationBarTitleText": "开发中",
-                "backgroundColorTop": "#FFFFFF",
-                "backgroundColorBottom": "#FFFFFF"
+                "navigationBarTitleText": "开发中"
             }
         },
         // === 版本更新 ===
@@ -116,7 +110,7 @@
             "path": "pages/common/notice/index",
             "style": {
                 "navigationStyle": "custom",
-                "background": "transparent",
+                "backgroundColor": "transparent",
                 "app-plus": {
                     "animationDuration": 200,
                     "animationType": "fade-in",
@@ -146,6 +140,8 @@
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
         "backgroundColor": "#F8F8F8",
+        "backgroundColorTop": "#F8F8F8",
+        "backgroundColorBottom": "#F8F8F8",
         "pageOrientation": "portrait",
         "app-plus": {
             "scrollIndicator": "none",

src/pages/common/notice/index.vue

@@ -125,6 +125,7 @@
     }
 
     .notice-mask {
+        height: 100%;
         position: fixed;
         inset: 0;
         /* #ifndef APP-NVUE */

src/pages/common/webview/index.vue

@@ -40,7 +40,7 @@
 
         // #ifdef APP-PLUS
         // 本地网页或白名单同源检测
-        if (page.link.startsWith('/hybrid/') || isSameOrigin(new URI(page.link))) {
+        if (page.link.startsWith('/hybrid/') || page.link.startsWith('/static/') || isSameOrigin(new URI(page.link))) {
             page.security = true
 
             // 延迟获取 webview 对象，插入 js 文件