From 8f4fab2ff480bdd79629ff1f64ea1a9f0a41b120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Wed, 1 Mar 2023 21:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=89=E6=B5=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                      | 5 +++--
 src/components/layout/layout.vue | 6 +-----
 src/pages/auth/auth.vue          | 6 ++++--
 src/pages/index/index.vue        | 2 +-
 src/pages/member/member.vue      | 6 +++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 63c649c..a600aa2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,6 +62,8 @@ export default {
 }
 // 沉浸样式
 .immerse-image {
+    position: absolute;
+    top: 0;
     width: 100%;
     line-height: 0;
     .image {
@@ -70,8 +72,7 @@ export default {
     }
 }
 .immerse-main {
-    position: absolute;
-    top: 0;
+    position: relative;
     width: 100%;
     box-sizing: border-box;
     .head-title {
diff --git a/src/components/layout/layout.vue b/src/components/layout/layout.vue
index 497b959..eecee85 100644
--- a/src/components/layout/layout.vue
+++ b/src/components/layout/layout.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="page-layout" :style="{ backgroundColor: backgroundColor, minHeight: minHeight, paddingBottom: layoutPb + 'px' }">
+    <view class="page-layout" :style="{ backgroundColor: backgroundColor, minHeight: minHeight }">
         <view
             class="page-header"
             :class="[textColor]"
@@ -75,10 +75,6 @@ export default {
             type: String,
             default: "dark",
         },
-        layoutPb: {
-            type: Number,
-            default: 0,
-        },
         hasPaddingTop: {
             type: Boolean,
             default: true,
diff --git a/src/pages/auth/auth.vue b/src/pages/auth/auth.vue
index 3ffe577..7d4e3a5 100644
--- a/src/pages/auth/auth.vue
+++ b/src/pages/auth/auth.vue
@@ -4,7 +4,7 @@
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />
             </view>
-            <view class="immerse-main" :style="{ top: safePt + utils.rpx2px(20) + 'px' }">
+            <view class="immerse-main" :style="{ paddingTop: safePt + utils.rpx2px(20) + 'px' }">
                 <view class="head-title">
                     <text class="title">熊熊建材安装<text class="color">师傅版</text></text>
                     <text class="desc">将好师傅交给用户让好服务走进万家 </text>
@@ -168,7 +168,9 @@ export default {
 .auth-container {
     position: relative;
     width: 100%;
-    padding-bottom: 30rpx;
+}
+.immerse-main {
+    padding-bottom: 20rpx;
 }
 .section {
     width: 710rpx;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index ab9ff17..ae92898 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -4,7 +4,7 @@
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />
             </view>
-            <view class="immerse-main" :style="{ top: safePt + utils.rpx2px(20) + 'px' }">
+            <view class="immerse-main" :style="{ paddingTop: safePt + utils.rpx2px(20) + 'px' }">
                 <view class="head-title">
                     <text class="title">熊熊建材安装<text class="color">师傅版</text></text>
                     <text class="desc">将好师傅交给用户让好服务走进万家 </text>
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index 315edbb..6acb98f 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -1,10 +1,10 @@
 <template>
-    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :hasPaddingTop="false" :layoutPb="utils.rpx2px(40)">
+    <app-layout v-model="safePt" btnType="unset" headerBackgroundColor="unset" :hasPaddingTop="false">
         <view class="member-container">
             <view class="immerse-image">
                 <image class="image" :src="backgroundImage" mode="aspectFill" />
             </view>
-            <view class="immerse-main" :style="{ top: safePt + utils.rpx2px(20) + 'px' }">
+            <view class="immerse-main" :style="{ paddingTop: safePt + utils.rpx2px(20) + 'px' }">
                 <view class="head">
                     <view class="headimg">
                         <image class="image" :src="userInfo.headimg" mode="aspectFill" />
@@ -134,7 +134,7 @@ export default {
 
 <style lang="less" scoped>
 .immerse-main {
-    padding: 0 20rpx;
+    padding: 0 20rpx 20rpx;
 }
 .member-container {
     width: 100%;