Skip to content

basic-uniapp-v3
basic-uniapp-v3
提交 b0ebcfef 作者: 方治民
操作

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

上级 ba93d1f6 dd285206
正在显示 包含 11 行增加 和 13 行删除
src/components/FirstUI/fui-footer/fui-footer.vue
...@@ -130,13 +130,14 @@ ...@@ -130,13 +130,14 @@
.fui-footer__fixed-bottom { .fui-footer__fixed-bottom {
position: fixed; position: fixed;
z-index: 99; z-index: 99;
bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
left: constant(safe-area-inset-left); /* left: constant(safe-area-inset-left);
left: env(safe-area-inset-left); left: env(safe-area-inset-left);
right: constant(safe-area-inset-right); right: constant(safe-area-inset-right);
right: env(safe-area-inset-right) right: env(safe-area-inset-right) */
/* #endif */ /* #endif */
} }
......
src/pages.json
...@@ -54,18 +54,14 @@ ...@@ -54,18 +54,14 @@
{ {
"path": "pages/common/about/index", "path": "pages/common/about/index",
"style": { "style": {
"navigationBarTitleText": "关于我们", "navigationBarTitleText": "关于我们"
"backgroundColorTop": "#FFFFFF",
"backgroundColorBottom": "#FFFFFF"
} }
}, },
// === 问题反馈 === // === 问题反馈 ===
{ {
"path": "pages/common/feedback/index", "path": "pages/common/feedback/index",
"style": { "style": {
"navigationBarTitleText": "问题反馈", "navigationBarTitleText": "问题反馈"
"backgroundColorTop": "#FFFFFF",
"backgroundColorBottom": "#FFFFFF"
} }
}, },
// === Webview === // === Webview ===
...@@ -89,9 +85,7 @@ ...@@ -89,9 +85,7 @@
// #ifdef H5 // #ifdef H5
"titleNView": false, "titleNView": false,
// #endif // #endif
"navigationBarTitleText": "开发中", "navigationBarTitleText": "开发中"
"backgroundColorTop": "#FFFFFF",
"backgroundColorBottom": "#FFFFFF"
} }
}, },
// === 版本更新 === // === 版本更新 ===
...@@ -116,7 +110,7 @@ ...@@ -116,7 +110,7 @@
"path": "pages/common/notice/index", "path": "pages/common/notice/index",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"background": "transparent", "backgroundColor": "transparent",
"app-plus": { "app-plus": {
"animationDuration": 200, "animationDuration": 200,
"animationType": "fade-in", "animationType": "fade-in",
...@@ -146,6 +140,8 @@ ...@@ -146,6 +140,8 @@
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8",
"backgroundColorTop": "#F8F8F8",
"backgroundColorBottom": "#F8F8F8",
"pageOrientation": "portrait", "pageOrientation": "portrait",
"app-plus": { "app-plus": {
"scrollIndicator": "none", "scrollIndicator": "none",
......
src/pages/common/notice/index.vue
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
} }
.notice-mask { .notice-mask {
height: 100%;
position: fixed; position: fixed;
inset: 0; inset: 0;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
......
src/pages/common/webview/index.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
// #ifdef APP-PLUS // #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 page.security = true
// 延迟获取 webview 对象，插入 js 文件 // 延迟获取 webview 对象，插入 js 文件
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论