diff --git a/App.vue b/App.vue index 91156d5..febd78f 100644 --- a/App.vue +++ b/App.vue @@ -7,5 +7,6 @@ export default { diff --git a/components/AppDialog.vue b/components/AppDialog.vue index be8fa61..d45649c 100644 --- a/components/AppDialog.vue +++ b/components/AppDialog.vue @@ -93,18 +93,23 @@ const cancel = () => { align-items: center; justify-content: center; box-sizing: border-box; - padding: 40rpx; + padding: calc(40rpx + env(safe-area-inset-top)) 40rpx calc(40rpx + env(safe-area-inset-bottom)); background: rgba(35, 18, 10, 0.62); } .app-dialog { + display: flex; width: 650rpx; max-width: 100%; + max-height: calc(var(--app-viewport-height, 100vh) - 80rpx - env(safe-area-inset-top) - env(safe-area-inset-bottom)); + flex-direction: column; + overflow: hidden; @include adaptive.adaptive-auth-dialog; } .app-dialog__content { z-index: 1; display: flex; - max-height: calc(var(--app-viewport-height, 100vh) - 160rpx); + min-height: 0; + flex: 1; flex-direction: column; align-items: center; box-sizing: border-box; diff --git a/components/AppTabbar.vue b/components/AppTabbar.vue index 639a1a9..5cd1440 100644 --- a/components/AppTabbar.vue +++ b/components/AppTabbar.vue @@ -1,10 +1,14 @@