From b8937d942f9b2d6f580a5a0dbcf1aaefa3acc1c8 Mon Sep 17 00:00:00 2001
From: ozh <sylphy.ou@tfegroup.com.hk>
Date: Wed, 9 Sep 2026 17:54:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(device-tab):=20=E7=A7=BB=E9=99=A4=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E8=AE=BE=E5=A4=87=E9=A1=B5=E6=82=AC=E6=B5=AE=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BB=85?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=8A=9F=E8=83=BD=E5=8D=A1=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/device/index.module.scss | 32 ++++++++++--------------------
 src/pages/device/index.tsx         |  7 +++----
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/pages/device/index.module.scss b/src/pages/device/index.module.scss
index ce3a73d..48c6cc4 100644
--- a/src/pages/device/index.module.scss
+++ b/src/pages/device/index.module.scss
@@ -12,9 +12,18 @@
   align-items: center;
 }
 
+// 绿色衬底：占位高度与浮卡上浮量(-40px)匹配，卡片叠在它上面而不是压进导航栏
+.heroSpace {
+  height: 64px;
+  background: #2ccb98;
+  margin-bottom: -40px;
+  position: relative;
+  z-index: 1;
+}
+
 // 设备应用家庭信息卡：白色卡片浮在绿色头部下，浅灰行内分隔
 .familyCard {
-  margin: -40px 24px 0;
+  margin: 0 24px;
   padding: 8px 32px 32px;
   background: $color-bg-white;
   border-radius: $radius-lg;
@@ -31,10 +40,6 @@
   border-bottom: 1px solid $color-border;
 }
 
-.familyRow:last-of-type {
-  border-bottom: none;
-}
-
 .familyLabel {
   font-size: 30px;
   color: $color-text-secondary;
@@ -47,6 +52,7 @@
 }
 
 .switchBtn {
+  width: 100%;
   margin-top: 24px;
   height: 88px;
   background: $color-primary-grad;
@@ -172,22 +178,6 @@
 .statusText { font-size: 24px; color: $color-primary-deep; }
 .statusTextOff { color: $color-text-secondary; }
 
-.fab {
-  position: fixed;
-  right: 40px;
-  bottom: 60px;
-  width: 112px;
-  height: 112px;
-  border-radius: $radius-circle;
-  background: $color-primary-grad;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: $shadow-fab;
-}
-
-.fabIcon { font-size: 48px; color: #ffffff; font-weight: 300; }
-
 // 切换家庭圈弹层内的列表项
 .sheetList {
   padding-bottom: 16px;
diff --git a/src/pages/device/index.tsx b/src/pages/device/index.tsx
index e0c007a..a7fc6d6 100644
--- a/src/pages/device/index.tsx
+++ b/src/pages/device/index.tsx
@@ -86,6 +86,9 @@ export default function DeviceList() {
     <View className={styles.page}>
       <Navbar title="智能设备" autoBack={false} variant="hero" />
 
+      {/* 绿色衬底：承接浮卡的上浮区，避免 -40px 压到导航标题 */}
+      <View className={styles.heroSpace} />
+
       {/* 设备应用家庭信息卡 */}
       <View className={styles.familyCard}>
         <View className={styles.familyRow}>
@@ -143,10 +146,6 @@ export default function DeviceList() {
         </View>
       )}
 
-      <View className={styles.fab} onClick={goAdd}>
-        <Text className={styles.fabIcon}>+</Text>
-      </View>
-
       {/* 切换家庭圈弹层 */}
       <BottomSheet visible={familySheetOpen} title="切换家庭圈" onClose={closeFamilySheet}>
         <View className={styles.sheetList}>