|
|
@@ -1,11 +1,11 @@
|
|
|
<template>
|
|
|
<view :class="['page-wrapper', { dark: isDark }]">
|
|
|
<cwg-match-media :max-width="991" v-if="!isLoginPage">
|
|
|
- <cwg-pc-header @open-right-drawer="openRightDrawer" @open-left-drawer="openLeftDrawer" class="header-box"
|
|
|
+ <cwg-pc-header @open-right-drawer="openRightDrawer" @open-left-drawer="openLeftDrawer"
|
|
|
:sidebarVisible="sidebarVisible" />
|
|
|
<view class="sidebar-mask mask-visible" v-if="sidebarVisible" @click="openLeftDrawer">
|
|
|
</view>
|
|
|
- <view class="fixed"></view>
|
|
|
+ <view class="fixed" v-if=pageTitle></view>
|
|
|
<cwg-header v-if=pageTitle class="custom-header" :title="pageTitle" />
|
|
|
</cwg-match-media>
|
|
|
<cwg-language style="width: 0;display: none;" />
|
|
|
@@ -36,7 +36,7 @@
|
|
|
<slot />
|
|
|
</view>
|
|
|
</transition>
|
|
|
- <cwg-custom-footer />
|
|
|
+ <cwg-custom-footer v-if=!pageTitle />
|
|
|
</view>
|
|
|
</view>
|
|
|
<cwg-match-media :max-width="991">
|
|
|
@@ -197,17 +197,17 @@ onShow(() => {
|
|
|
@import "@/uni.scss";
|
|
|
|
|
|
.page-wrapper {
|
|
|
- height: calc(100vh - 56px);
|
|
|
+ height: calc(100vh - (56px + var(--status-bar-height)));
|
|
|
}
|
|
|
|
|
|
.header-box {
|
|
|
width: 100%;
|
|
|
- height: 56px;
|
|
|
+ height: calc(56px + var(--status-bar-height));
|
|
|
}
|
|
|
|
|
|
.page-content {
|
|
|
width: 100%;
|
|
|
- height: calc(100vh - 56px);
|
|
|
+ height: calc(100vh - (56px + var(--status-bar-height)));
|
|
|
overflow: hidden;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
@@ -215,7 +215,7 @@ onShow(() => {
|
|
|
box-sizing: border-box;
|
|
|
|
|
|
.content-info {
|
|
|
- height: calc(100vh - 56px);
|
|
|
+ height: calc(100vh - (56px + var(--status-bar-height)));
|
|
|
overflow: auto;
|
|
|
}
|
|
|
|
|
|
@@ -238,7 +238,7 @@ onShow(() => {
|
|
|
left: 0;
|
|
|
top: 0;
|
|
|
width: 100vw;
|
|
|
- height: calc(100vh - 56px);
|
|
|
+ height: calc(100vh - (56px + var(--status-bar-height)));
|
|
|
background-color: rgba(0, 0, 0, 0.2);
|
|
|
z-index: 101;
|
|
|
}
|
|
|
@@ -246,7 +246,7 @@ onShow(() => {
|
|
|
.mask-visible {
|
|
|
background-color: rgba(0, 0, 0, 0);
|
|
|
width: 100vw;
|
|
|
- height: 56px;
|
|
|
+ height: calc(56px + var(--status-bar-height));
|
|
|
}
|
|
|
|
|
|
.sidebar-visible {
|
|
|
@@ -262,7 +262,7 @@ onShow(() => {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
justify-content: space-between;
|
|
|
- min-height: calc(100vh - 56px);
|
|
|
+ min-height: calc(100vh - (56px + var(--status-bar-height)));
|
|
|
}
|
|
|
|
|
|
.chat-icon {
|
|
|
@@ -303,7 +303,7 @@ onShow(() => {
|
|
|
// top: 0;
|
|
|
// left: 0;
|
|
|
width: 100%;
|
|
|
- height: 56px;
|
|
|
+ height: calc(56px + var(--status-bar-height));
|
|
|
background-color: var(--color-white);
|
|
|
z-index: 9;
|
|
|
}
|
|
|
@@ -312,7 +312,7 @@ onShow(() => {
|
|
|
background-color: var(--color-white);
|
|
|
padding: 0 px2rpx(15);
|
|
|
position: fixed;
|
|
|
- top: 56px;
|
|
|
+ top: calc(56px + var(--status-bar-height));
|
|
|
left: 0;
|
|
|
}
|
|
|
|