完成50%

pages/tree/t08-member-states.vue

@@ -12,9 +12,9 @@
     <ModulePageBackground module="tree" />
     <view class="member-status-page__header"><PageHeader :title="pageTitle" /></view>
 
-    <view class="member-status-context">
+    <view v-if="hasValidContext" class="member-status-context">
       <text>{{ genealogyName }}</text>
-      <text v-if="member">{{ member.name }} · 第 {{ member.generation }} 世 · {{ member.branch }}</text>
+      <text v-if="member">{{ memberIdentityCopy }}</text>
       <text v-else>未找到成员身份</text>
     </view>
 
@@ -45,7 +45,8 @@ import { computed, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import ModulePageBackground from "@/components/ModulePageBackground.vue";
 import PageHeader from "@/components/PageHeader.vue";
-import { genealogyContext } from "@/utils/genealogy-context.js";
+import { findTreeMemberPresentationFixture } from "@/data/mock.js";
+import { goBack, goRoot } from "@/utils/navigation.js";
 
 const genealogyId = ref("");
 const personId = ref("");
@@ -53,18 +54,13 @@ const statusState = ref("loading");
 const genealogyName = ref("汤氏家谱");
 const member = ref(null);
 
-const memberFixtures = {
-  101: { id: 101, name: "汤文远", generation: 12, branch: "主支", allowedStates: ["deceased"] },
-  102: { id: 102, name: "汤正国", generation: 13, branch: "长房", allowedStates: ["privacy"] },
-  103: { id: 103, name: "汤正华", generation: 13, branch: "二房", allowedStates: ["forbidden"] },
-};
 const states = {
   privacy: {
     eyebrow: "隐私成员",
     title: "敏感资料只向授权成员展示",
     copy: "该成员姓名和世系位置仍然保留，出生信息、联系方式和生平内容按权限隐藏。",
     guideTitle: "当前可见范围",
-    guides: ["姓名、世代与所属支系可见", "联系方式和详细生平已隐藏", "本人或谱主可维护授权范围"],
+    guides: ["姓名、世代与家族关系可见", "联系方式和详细生平已隐藏", "本人或谱主可维护授权范围"],
     action: "返回成员档案",
   },
   deceased: {
@@ -94,22 +90,33 @@ const states = {
 };
 const activeStatus = computed(() => states[statusState.value] || states.error);
 const pageTitle = computed(() => statusState.value === "deceased" ? "成员纪念" : statusState.value === "privacy" ? "隐私资料" : "成员状态");
+const hasValidContext = computed(() => Boolean(genealogyId.value && personId.value));
+const memberIdentityCopy = computed(() => {
+  if (!member.value) return "";
+  const identity = `${member.value.name} · 第 ${member.value.generation} 世`;
+  return ["privacy", "forbidden"].includes(member.value.status)
+    ? `${identity} · ${member.value.relation}`
+    : `${identity} · ${member.value.branch}`;
+});
 
 onLoad((query) => {
-  genealogyId.value = query.genealogyId || genealogyContext.getCurrentGenealogyId() || "";
-  personId.value = query.personId || "";
-  if (genealogyId.value) genealogyContext.setCurrentGenealogyId(genealogyId.value);
-  member.value = memberFixtures[personId.value] || null;
+  genealogyId.value = String(query.genealogyId || "");
+  personId.value = String(query.personId || "");
+  member.value = hasValidContext.value
+    ? findTreeMemberPresentationFixture(genealogyId.value, personId.value)
+    : null;
   const requestedState = ["privacy", "deceased", "forbidden"].includes(query.state) ? query.state : "";
-  statusState.value = member.value?.allowedStates.includes(requestedState) ? requestedState : "error";
+  const derivedState = member.value?.status || "";
+  statusState.value = member.value && (!requestedState || requestedState === derivedState)
+    ? requestedState || derivedState
+    : "error";
 });
 
 const handleAction = () => {
   if (statusState.value === "forbidden") {
-    uni.reLaunch({ url: "/pages/genealogy/g01-my-genealogies" });
-    return;
+    return goRoot("G01");
   }
-  uni.navigateBack();
+  return goBack();
 };
 </script>