From 56e990c0281986e3b64b7d17280b3cb20bbef61f Mon Sep 17 00:00:00 2001
From: ozh <sylphy.ou@tfegroup.com.hk>
Date: Fri, 9 Oct 2026 15:47:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(family):=20=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=99=8D=E7=BA=A7=E4=B8=8E=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=8D=A1=E7=9B=B4=E8=BE=BE=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- load 拆分依赖：家庭详情必须成功；成员/关爱对象列表失败降级为空
  （受邀者未入圈时这两接口报权限错，不应整页判为家庭不存在）
- load 返回本次成员列表，autoJoin 改用返回值判断避免 stale state
- 加入失败时若详情也未拉到则重拉一次，保证页面可退出
- 加载失败分支改为"重新加载"+ 新增"回首页"按钮（分享卡直达页面栈
  仅一页，navigateBack 会卡死）
---
 src/pages/family/detail.module.scss | 22 ++++++++++++++++++
 src/pages/family/detail.tsx         | 35 +++++++++++++++++++----------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/pages/family/detail.module.scss b/src/pages/family/detail.module.scss
index 584ae2d..5d5dc51 100644
--- a/src/pages/family/detail.module.scss
+++ b/src/pages/family/detail.module.scss
@@ -122,6 +122,28 @@
   color: $color-primary-deep;
 }
 
+// 加载失败分支的兜底回首页按钮（分享卡直达时页面栈无上一页，navigateBack 卡死）
+.fallbackBtn {
+  margin: 24px auto 0;
+  padding: 0 64px;
+  height: 80px;
+  background: $color-primary-grad;
+  border-radius: $radius-pill;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.fallbackBtnPressed {
+  opacity: 0.85;
+}
+
+.fallbackBtnText {
+  font-size: 28px;
+  font-weight: 600;
+  color: #ffffff;
+}
+
 .sectionEmpty {
   display: block;
   padding: 32px 8px;
diff --git a/src/pages/family/detail.tsx b/src/pages/family/detail.tsx
index bdccb22..871577b 100644
--- a/src/pages/family/detail.tsx
+++ b/src/pages/family/detail.tsx
@@ -13,7 +13,7 @@ import { getHomeDetail, getHomeMemberList, joinHome, transferOwner, updateMember
 import { getCareMemberList, type CareMember } from '@/api/careMember'
 import { MAX_CARED_PER_FAMILY } from '@/constants/family'
 import { ROUTES } from '@/constants/routes'
-import { navigateBack, navigateTo, reLaunch } from '@/utils/navigation'
+import { navigateTo, reLaunch } from '@/utils/navigation'
 import { showToast } from '@/utils/toast'
 import styles from './detail.module.scss'
 
@@ -62,26 +62,31 @@ export default function FamilyDetail() {
   // 改昵称：点击成员行触发
   const [renaming, setRenaming] = useState(false)
 
-  const load = async () => {
+  // 拉取家庭数据：详情必须成功；成员/关爱对象列表失败降级为空（受邀者尚未入圈，
+  // 这两个接口会报权限错，不能因此把整个页面判成「家庭不存在」）
+  // 返回本次拉到的成员列表（供 autoJoin 用最新数据判断，避免 stale state）
+  const load = async (): Promise<HomeMember[] | null> => {
     // 分享卡直达本页且未登录：先去登录，登录后回跳本页
     if (!token) {
       const target = encodeURIComponent(`${ROUTES.FAMILY_DETAIL}?id=${familyId}&invite=1`)
       reLaunch(`${ROUTES.LOGIN}?redirect=${target}`)
-      return
+      return null
     }
     setLoading(true)
     try {
-      const [home, memberList, careList] = await Promise.all([
-        getHomeDetail(familyId),
-        getHomeMemberList(familyId),
-        getCareMemberList(familyId)
+      const home = await getHomeDetail(familyId)
+      const [memberList, careList] = await Promise.all([
+        getHomeMemberList(familyId).catch(() => [] as HomeMember[]),
+        getCareMemberList(familyId).catch(() => [] as CareMember[])
       ])
       setFamily(home)
       setMembers(memberList)
       // 上限判定以关爱对象实际列表为准，家庭卡计数仅展示
       setCaredList(careList)
+      return memberList
     } catch {
       setFamily(null)
+      return null
     } finally {
       setLoading(false)
     }
@@ -89,10 +94,10 @@ export default function FamilyDetail() {
 
   // 从添加表单返回时刷新；受邀进入且尚未是成员时自动加入（跳过手动点击步骤）
   useDidShow(() => {
-    load().then(() => {
+    load().then((memberList) => {
       if (
         !isInviteEnter || joining || myUserId == null ||
-        members.length === 0 || members.some((m) => m.memberId === myUserId)
+        !memberList || memberList.length === 0 || memberList.some((m) => m.memberId === myUserId)
       ) return
       autoJoin(familyId)
     })
@@ -107,7 +112,9 @@ export default function FamilyDetail() {
       showToast('已加入家庭')
       await load()
     } catch (e) {
+      // 加入失败（如接口异常）也要让页面可退出：详情能拉到就展示，拉不到走「家庭不存在」分支（带返回按钮）
       showToast(e instanceof Error ? e.message : '加入失败')
+      if (!family) await load()
     } finally {
       setJoining(false)
     }
@@ -205,10 +212,14 @@ export default function FamilyDetail() {
         <StateView
           status="error"
           mode="list"
-          text="该家庭不存在"
-          retryText="返回列表"
-          onRetry={() => navigateBack()}
+          text="无法获取家庭信息"
+          retryText="重新加载"
+          onRetry={() => load()}
         />
+        {/* 分享卡直达时页面栈只有本页，navigateBack 无处可退会卡死——退回首页 */}
+        <View className={styles.fallbackBtn} hoverClass={styles.fallbackBtnPressed} onClick={() => reLaunch(ROUTES.HOME)}>
+          <Text className={styles.fallbackBtnText}>回首页</Text>
+        </View>
       </View>
     )
   }