diff --git a/pages.json b/pages.json
index 026c86f..7cb63d5 100644
--- a/pages.json
+++ b/pages.json
@@ -1,21 +1,20 @@
{
"pages": [
- { "path": "pages/index/index", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/menu/menu", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/confirm/confirm", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/orders/orders", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/chat/chat", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/staff/login", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/staff/board", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/staff/detail", "style": { "navigationStyle": "custom","disableScroll": true } },
- { "path": "pages/staff/chat", "style": { "navigationStyle": "custom","disableScroll": true } }
+ { "path": "pages/index/index", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/menu/menu", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/confirm/confirm", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/orders/orders", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/chat/chat", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/staff/login", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/staff/board", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/staff/detail", "style": { "navigationStyle": "custom" } },
+ { "path": "pages/staff/chat", "style": { "navigationStyle": "custom" } }
],
"globalStyle": {
- "navigationStyle": "custom","disableScroll": true,
+ "navigationStyle": "custom",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "纯瘾大",
"navigationBarBackgroundColor": "#0D0D0D",
"backgroundColor": "#0D0D0D"
}
}
-
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index d96883e..68fa37b 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -69,7 +69,7 @@ export default {
-
-
-
diff --git a/pages/confirm/confirm.vue b/pages/confirm/confirm.vue
index 75f648f..f47f7bb 100644
--- a/pages/confirm/confirm.vue
+++ b/pages/confirm/confirm.vue
@@ -82,7 +82,7 @@ export default {
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f805253..73f5dd5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -128,6 +128,7 @@ export default {
-
-
diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue
index 548e2dc..e23db75 100644
--- a/pages/menu/menu.vue
+++ b/pages/menu/menu.vue
@@ -138,14 +138,14 @@ export default {
-
-
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index 94f86c4..18470d4 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -77,7 +77,7 @@ export default {
-
-
-
diff --git a/pages/staff/board.vue b/pages/staff/board.vue
index d23c960..b20c0b9 100644
--- a/pages/staff/board.vue
+++ b/pages/staff/board.vue
@@ -103,7 +103,7 @@ export default {
-
-
-
diff --git a/pages/staff/chat.vue b/pages/staff/chat.vue
index 0e1173f..6fb499a 100644
--- a/pages/staff/chat.vue
+++ b/pages/staff/chat.vue
@@ -70,7 +70,7 @@ export default {
-
-
-
diff --git a/pages/staff/detail.vue b/pages/staff/detail.vue
index 9da1ff2..ad039d7 100644
--- a/pages/staff/detail.vue
+++ b/pages/staff/detail.vue
@@ -77,7 +77,7 @@ export default {
-
-
-
diff --git a/pages/staff/login.vue b/pages/staff/login.vue
index 4b5398b..a7f0c2a 100644
--- a/pages/staff/login.vue
+++ b/pages/staff/login.vue
@@ -61,6 +61,7 @@ export default {
-
-
diff --git a/uni.scss b/uni.scss
index 6fba8e5..57a3cc8 100644
--- a/uni.scss
+++ b/uni.scss
@@ -26,9 +26,9 @@ page {
color: var(--text);
font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Microsoft YaHei', sans-serif;
font-size: 28rpx;
- min-height: 100vh;
+ height: 100vh;
width: 100%;
- padding-top: 44px;
+ padding-top: var(--status-bar-height, 0px);
}
// 动画
@@ -40,4 +40,3 @@ page {
@keyframes fade-in-up{from{opacity:0;transform:translateY(32rpx)}to{opacity:1;transform:translateY(0)}}
@keyframes card-appear-top{0%{transform:translateY(-40rpx) scale(.5);opacity:0}100%{transform:translateY(0) scale(1);opacity:1}}
@keyframes float-bubble{0%{transform:translateY(0) scale(1);opacity:1}100%{transform:translateY(-180rpx) scale(1.3);opacity:0}}
-