From ece85b81c66f39de068e139dac16ea0b877f0c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Thu, 2 Mar 2023 16:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9hasPaddingTop=E4=B8=BAshowHea?=
 =?UTF-8?q?der?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/layout.vue | 40 +++++++++++++++-----------------
 src/pages/auth/auth.vue          |  2 +-
 src/pages/index/index.vue        |  2 +-
 src/pages/member/member.vue      |  2 +-
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/components/layout/layout.vue b/src/components/layout/layout.vue
index eecee85..92d1124 100644
--- a/src/components/layout/layout.vue
+++ b/src/components/layout/layout.vue
@@ -1,30 +1,31 @@
 <template>
     <view class="page-layout" :style="{ backgroundColor: backgroundColor, minHeight: minHeight }">
         <view
+            v-if="showHeader"
             class="page-header"
             :class="[textColor]"
             :style="{
-                height: header.height + 'px',
-                paddingTop: header.pt + 'px',
+                paddingTop: statusBarHeight + 'px',
+                height: headerHeight + 'px',
                 backgroundColor: headerBackgroundColor,
             }"
         >
             <block v-if="btnType === 'city'">
-                <view class="page-index-btn change-city" :style="{ height: header.height + 'px' }" @click="changeCity">
+                <view class="page-index-btn change-city" :style="{ height: headerHeight + 'px' }" @click="changeCity">
                     <text class="iconfont icon-31dingwei"></text>
                     <text class="city">成都市</text>
                 </view>
             </block>
             <block v-if="btnType === 'back'">
-                <view class="page-index-btn back" :style="{ height: header.height + 'px' }" @click="onClick">
+                <view class="page-index-btn back" :style="{ height: headerHeight + 'px' }" @click="onClick">
                     <text class="iconfont icon-fanhui"></text>
                 </view>
             </block>
             <view class="page-title">
-                <text class="title-text" :style="{ lineHeight: header.height + 'px' }">{{ title }}</text>
+                <text class="title-text" :style="{ lineHeight: headerHeight + 'px' }">{{ title }}</text>
             </view>
         </view>
-        <view class="page-body" :style="{ paddingTop: bodyPt + 'px' }">
+        <view class="page-body" :style="{ paddingTop: bodyPaddingTop + 'px' }">
             <slot></slot>
         </view>
         <view class="page-footer"></view>
@@ -37,12 +38,9 @@ export default {
     name: "component-layout",
     data() {
         return {
-            header: {
-                height: 0,
-                pt: 0,
-            },
-            bodyPt: 0,
-            bodyPb: 0,
+            headerHeight: 0,
+            statusBarHeight: 0,
+            bodyPaddingTop: 0,
         };
     },
     components: {},
@@ -75,7 +73,7 @@ export default {
             type: String,
             default: "dark",
         },
-        hasPaddingTop: {
+        showHeader: {
             type: Boolean,
             default: true,
         },
@@ -88,17 +86,17 @@ export default {
     mounted() {
         const { statusBarHeight, headerHeight } = this.config;
         // #ifndef H5
-        this.header.pt = statusBarHeight;
-        this.header.height = headerHeight;
+        this.statusBarHeight = statusBarHeight;
+        this.headerHeight = headerHeight;
         // #endif
         // #ifdef H5
-        this.header.pt = 0;
-        this.header.height = this.$utils.rpx2px(headerHeight * 2);
+        this.statusBarHeight = 0;
+        this.headerHeight = this.$utils.rpx2px(headerHeight * 2);
         // #endif
-        let safePt = this.header.pt + this.header.height;
-        this.$emit("input", safePt);
-        if (this.hasPaddingTop) {
-            this.bodyPt = safePt;
+        let safePaddingTop = this.statusBarHeight + this.headerHeight;
+        this.$emit("input", safePaddingTop);
+        if (this.showHeader) {
+            this.bodyPaddingTop = safePaddingTop;
         }
     },
     methods: {
diff --git a/src/pages/auth/auth.vue b/src/pages/auth/auth.vue
index 7d4e3a5..01c2be0 100644
--- a/src/pages/auth/auth.vue
+++ b/src/pages/auth/auth.vue
@@ -1,5 +1,5 @@
 <template>
-    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :hasPaddingTop="false">
+    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :showHeader="false">
         <view class="auth-container">
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 890e923..f72fcd1 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :hasPaddingTop="false">
+    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :showHeader="false">
         <view class="index-container">
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index 930dcf9..0308d14 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -1,5 +1,5 @@
 <template>
-    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :hasPaddingTop="false">
+    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :showHeader="false">
         <view class="member-container">
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />