diff --git a/uniapp/youjiala/src/components/family-tree-chart/family-tree-chart.vue b/uniapp/youjiala/src/components/family-tree-chart/family-tree-chart.vue
index bdda11d..619fa32 100644
--- a/uniapp/youjiala/src/components/family-tree-chart/family-tree-chart.vue
+++ b/uniapp/youjiala/src/components/family-tree-chart/family-tree-chart.vue
@@ -275,6 +275,81 @@ function toggleDirection(): void {
     vertical.value = !vertical.value;
 }
 
+// ===== 控制条可拖拽：按住顶部握把行挪位（拖拽热区只在握把，不碰动作钮），
+// ctrlOffset 为整条相对默认右上锚点的位移 =====
+const ctrlOffset = ref({ x: 0, y: 0 });
+let dragStart: { tx: number; ty: number; ox: number; oy: number } | null = null;
+
+function onCtrlTouchStart(e: TouchEvent): void {
+    const t0 = e.touches?.[0];
+    if (!t0) {
+        return;
+    }
+    dragStart = { tx: t0.clientX, ty: t0.clientY, ox: ctrlOffset.value.x, oy: ctrlOffset.value.y };
+}
+
+function onCtrlTouchMove(e: TouchEvent): void {
+    const t0 = e.touches?.[0];
+    if (!dragStart || !t0) {
+        return;
+    }
+    const sys = uni.getSystemInfoSync();
+    const barW = uni.upx2px(88);
+    const barH = uni.upx2px(384); // 握把 + 4 动作钮各 76 + 分隔线
+    const edge = uni.upx2px(16);
+    // 默认锚点（top/right 定位）换算成 left/top 基准，再按屏幕边界夹取
+    const baseLeft = sys.windowWidth - uni.upx2px(24) - barW;
+    const baseTop = uni.upx2px(120) + (sys.safeAreaInsets?.top || 0);
+    const minX = edge - baseLeft;
+    const maxX = sys.windowWidth - edge - barW - baseLeft;
+    const minY = edge + uni.upx2px(110) + (sys.safeAreaInsets?.top || 0) - baseTop;
+    const maxY = sys.windowHeight - edge - barH - baseTop;
+    ctrlOffset.value = {
+        x: Math.min(Math.max(dragStart.ox + t0.clientX - dragStart.tx, minX), maxX),
+        y: Math.min(Math.max(dragStart.oy + t0.clientY - dragStart.ty, minY), maxY),
+    };
+}
+
+function onCtrlTouchEnd(): void {
+    dragStart = null;
+}
+
+// ===== 双指捏合缩放：画布触摸层两指距离比换算 zoom（5% 步进，比 ± 钮细腻）=====
+let pinchStartDist = 0;
+let pinchStartZoom = 1;
+
+function touchGap(t0: Touch, t1: Touch): number {
+    return Math.hypot(t1.clientX - t0.clientX, t1.clientY - t0.clientY);
+}
+
+function onChartTouchStart(e: TouchEvent): void {
+    if (e.touches?.length === 2) {
+        pinchStartDist = touchGap(e.touches[0], e.touches[1]);
+        pinchStartZoom = zoom.value;
+    } else {
+        pinchStartDist = 0;
+    }
+}
+
+function onChartTouchMove(e: TouchEvent): void {
+    if (e.touches?.length !== 2 || pinchStartDist <= 0) {
+        return;
+    }
+    const ratio = touchGap(e.touches[0], e.touches[1]) / pinchStartDist;
+    const next = Math.min(ZOOM_MAX, Math.max(ZOOM_MIN, Math.round(pinchStartZoom * ratio * 20) / 20));
+    if (next !== zoom.value) {
+        // H5：捏合期间拦掉默认滚动，避免双指被 scroll-view 当成拖动
+        e.preventDefault?.();
+        zoom.value = next;
+    }
+}
+
+function onChartTouchEnd(e: TouchEvent): void {
+    if (!e.touches || e.touches.length < 2) {
+        pinchStartDist = 0;
+    }
+}
+
 function requestLoad(personId: string): void {
     emit("select-child", personId);
 }
@@ -457,15 +532,18 @@ function close(): void {
                 <text class="ftc__title">
                     {{ props.title || t('FamilyTreePage.pedigreeChart') }}
                 </text>
-                <!-- 退出钮统一为「取消」文字胶囊（底部抽屉风格语言，不再用 X） -->
-                <view class="ftc__cancel" @tap="close">
-                    <text class="ftc__cancel-text">
-                        {{ t("FamilyTreePage.cancel") }}
-                    </text>
+                <!-- 退出钮按用户要求改为 × 关闭图标（灰底圆钮） -->
+                <view class="ftc__close" @tap="close">
+                    <u-icon name="close" size="28" color="#5c626b" />
                 </view>
             </view>
-            <!-- 悬浮控制条：放大/缩小/百分比复位/横纵布局切换（对齐旧图 G6 工具钮） -->
-            <view class="ftc__ctrl">
+            <!-- 悬浮控制条：放大/缩小/百分比复位/横纵布局切换（对齐旧图 G6 工具钮）；
+                 会挡树图内容，按住顶部握把行可拖拽挪位；动作钮只响应单击，与拖拽互不干扰 -->
+            <view class="ftc__ctrl" :style="{ transform: `translate(${ctrlOffset.x}px, ${ctrlOffset.y}px)` }">
+                <view class="ftc__ctrl-grip" @touchstart="onCtrlTouchStart" @touchmove="onCtrlTouchMove"
+                    @touchend="onCtrlTouchEnd" @touchcancel="onCtrlTouchEnd">
+                    <text class="ftc__ctrl-grip-dot">⠿</text>
+                </view>
                 <view class="ftc__ctrl-btn" @tap="zoomIn">
                     <text class="ftc__ctrl-glyph">＋</text>
                 </view>
@@ -479,7 +557,9 @@ function close(): void {
                     <text class="ftc__ctrl-glyph">⇅</text>
                 </view>
             </view>
-            <scroll-view class="ftc__scroll" scroll-x scroll-y :show-scrollbar="true">
+            <!-- 画布：双指捏合缩放（touch 层只识别两指，单指滚动不受影响） -->
+            <scroll-view class="ftc__scroll" scroll-x scroll-y :show-scrollbar="true" @touchstart="onChartTouchStart"
+                @touchmove="onChartTouchMove" @touchend="onChartTouchEnd" @touchcancel="onChartTouchEnd">
                 <view v-if="hasRoot" class="ftc__tree" :style="{ zoom }">
                     <family-tree-node :person-id="rootPersonId" :preview="null" :expandable="true" :depth="0" />
                 </view>
@@ -518,18 +598,17 @@ function close(): void {
     color: #1f2329;
 }
 
-.ftc__cancel {
-    padding: 12rpx 40rpx;
-    border-radius: 999rpx;
+.ftc__close {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 64rpx;
+    height: 64rpx;
+    border-radius: 50%;
     background-color: #f2f3f5;
 }
 
-.ftc__cancel-text {
-    font-size: 26rpx;
-    color: #5c626b;
-}
-
-/* 悬浮控制条：右侧竖排，白底圆角轻阴影 */
+/* 悬浮控制条：右侧竖排，白底圆角轻阴影；整条可拖拽（见 ctrlOffset） */
 .ftc__ctrl {
     position: absolute;
     top: calc(120rpx + env(safe-area-inset-top));
@@ -543,6 +622,24 @@ function close(): void {
     box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.12);
 }
 
+/* 顶部握把行：拖拽热区（touch-action:none 只加在这里，动作钮手势不受影响）；
+   与动作钮等高，手指易按住 */
+.ftc__ctrl-grip {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 76rpx;
+    border-bottom: 2rpx solid #f2f3f5;
+    cursor: move;
+    touch-action: none;
+}
+
+.ftc__ctrl-grip-dot {
+    font-size: 22rpx;
+    line-height: 1;
+    color: #c0c4cc;
+}
+
 .ftc__ctrl-btn {
     display: flex;
     align-items: center;
diff --git a/uniapp/youjiala/src/components/family-tree-home/family-tree-home.vue b/uniapp/youjiala/src/components/family-tree-home/family-tree-home.vue
new file mode 100644
index 0000000..1606619
--- /dev/null
+++ b/uniapp/youjiala/src/components/family-tree-home/family-tree-home.vue
@@ -0,0 +1,1730 @@
+<script setup lang="ts">
+/**
+ * 族谱管理两态首页组件（由 pages/dashboard 整页拆入，页面壳只留守卫接线）：
+ * 融合旧 family-tree-enquiry（列表/查询）与 family-tree-operation（详情/编辑/谱系图/关系维护/权限）——
+ * 交互照 share.vue（群管理）两态模式：列表态显 tabbar、点卡进详情（隐 tabbar，返回回列表），
+ * 视觉按媒体页同套（themeVars、白底 hero、分区折叠、hero 圆形动作钮）。
+ * 编辑权限沿用旧页口径：不做功能级权限登记，由数据级 IsManager / IsCanAmend 把关。
+ * 页面生命周期（onShow 守卫）留在 dashboard.vue：uni-app 页面钩子在子组件中不触发，
+ * 组件通过 defineExpose 的 reloadIfList 供页面在守卫回调里调用。
+ */
+import type { LoadedTreeNode } from "@/components/family-tree-chart/types";
+import type { FamilyPersonDisplayData } from "@/data/auto/familyPersonDisplayData";
+import { useLocale } from "uview-pro";
+import { computed, onMounted, ref } from "vue";
+import { useAdminPick, useThemeGradient, useThemeTokens } from "@/composables";
+import { usePolicyOptions } from "@/composables/usePolicyOptions";
+import { FamilyTreeChildrenMapViewEntity } from "@/data/auto/familyTreeChildrenMapViewEntity";
+import { FamilyTreeData } from "@/data/auto/familyTreeData";
+import { FamilyTreeSearchCriteria } from "@/data/auto/familyTreeSearchCriteria";
+import { FamilyTreeSpouseMapViewEntity } from "@/data/auto/familyTreeSpouseMapViewEntity";
+import { FamilyTreeViewEntity } from "@/data/auto/familyTreeViewEntity";
+import familyTreeService from "@/service/master/familyTreeService";
+
+/** ready：组件挂载完成通知（时序口径见文件底部 onMounted 注释） */
+const emit = defineEmits<{ (e: "ready"): void }>();
+
+const { t } = useLocale();
+const { themeBackground } = useThemeGradient();
+// 主题派生色经 CSS 变量下发（与媒体/共享页同套）：卡片渐变/徽章/主按钮/链接全部跟主题
+const { primary, accentGradient, accentSoft, accentShadow } = useThemeTokens();
+const themeVars = computed(() => ({
+  "--fg-primary": primary.value,
+  "--fg-gradient": accentGradient.value,
+  "--fg-soft": accentSoft.value,
+  "--fg-shadow": accentShadow.value,
+}));
+const { getPolicyOptions, getPolicyText } = usePolicyOptions();
+
+// ===== 列表态 =====
+/** 族谱卡树形字形：内联 SVG（uview 图标集无树形），白线主干 + 枝头圆点，同 transferGlyph 套路 */
+const treeGlyph = `data:image/svg+xml,${encodeURIComponent([
+  "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48' fill='none' stroke='#ffffff' stroke-width='2.6' stroke-linecap='round'>",
+  "<path d='M24 42V12'/>",
+  "<path d='M24 33 15 24'/>",
+  "<path d='M24 26 33 17'/>",
+  "<path d='M24 19 17 12'/>",
+  "<path d='M24 19 31 12'/>",
+  "<circle cx='24' cy='9' r='2.6' fill='#ffffff' stroke='none'/>",
+  "<circle cx='14' cy='23' r='2.6' fill='#ffffff' stroke='none'/>",
+  "<circle cx='34' cy='16' r='2.6' fill='#ffffff' stroke='none'/>",
+  "<circle cx='16' cy='11' r='2.2' fill='#ffffff' stroke='none'/>",
+  "<circle cx='32' cy='11' r='2.2' fill='#ffffff' stroke='none'/>",
+  "</svg>",
+].join(""))}`;
+
+const trees = ref<FamilyTreeViewEntity[]>([]);
+const loading = ref(false);
+const errorText = ref("");
+const keyword = ref("");
+const showSearch = ref(false);
+const busy = ref(false);
+const inDetail = ref(false);
+/** 列表整体收起态：卡区缩成一条窄横条（伸缩钮在列表右缘） */
+const listCollapsed = ref(false);
+
+/** 关键字过滤：族谱名称/简介 前端包含匹配（列表量级小，不再走后端筛选链） */
+const filteredTrees = computed(() => {
+  const kw = keyword.value.trim().toLowerCase();
+  if (!kw) {
+    return trees.value;
+  }
+  return trees.value.filter(
+    row => `${row.TreeName ?? ""}`.toLowerCase().includes(kw)
+      || `${row.Brief ?? ""}`.toLowerCase().includes(kw),
+  );
+});
+
+async function loadTrees(): Promise<void> {
+  loading.value = true;
+  errorText.value = "";
+  try {
+    const criteria = new FamilyTreeSearchCriteria();
+    criteria.GridColumns = [];
+    criteria.orderby = FamilyTreeViewEntity.DB_TREE_NAME;
+    // 分页字段必须显式给正数：criteria 默认 page=0/limit=0，后端按 limit=0 返回空集
+    criteria.page = 1;
+    criteria.limit = 999;
+    const result = await familyTreeService.FindBySearchCriteria(criteria);
+    trees.value = result?.Datas ?? [];
+  }
+  catch (error: any) {
+    trees.value = [];
+    errorText.value = error?.message || t("FilePage.loadFailed");
+  }
+  finally {
+    loading.value = false;
+  }
+}
+
+function onToggleSearch(): void {
+  showSearch.value = !showSearch.value;
+}
+
+function onSearch(): void {
+  // 关键字过滤由 filteredTrees 计算属性即时完成，确认键无需再拉接口
+}
+
+async function onRetry(): Promise<void> {
+  await loadTrees();
+}
+
+// ===== 详情态数据（原 family-tree-operation 全量照搬） =====
+const data = ref<FamilyTreeData>(new FamilyTreeData());
+const tree = computed(() => data.value.FamilyTree);
+const currentPerson = computed(() => data.value.CurrentPerson?.FamilyPerson);
+const spouseMaps = computed(() => data.value.CurrentPerson?.FamilyTreeSpouseMaps ?? []);
+const childMaps = computed(() => data.value.CurrentPerson?.FamilyTreeChildrenMaps ?? []);
+
+const treeId = ref("");
+const loaded = ref(false);
+const isEdit = ref(false);
+const isCreate = ref(false);
+
+/** 谱系图 sub 模式的懒加载缓存（personId -> 子树记录），对齐旧 loadedNodes */
+const loadedNodes = ref<Record<string, LoadedTreeNode>>({});
+const subChartVisible = ref(false);
+const fullChartVisible = ref(false);
+
+/** 快速建员弹层：三种用途共用一个组件实例（对齐旧 quickCreatePurpose） */
+const qcVisible = ref(false);
+const qcPurpose = ref<"spouse" | "child" | "ancestor">("spouse");
+const qcTitle = computed(() => {
+  if (qcPurpose.value === "spouse") {
+    return t("FamilyTreePage.addSpouse");
+  }
+  return qcPurpose.value === "child"
+    ? t("FamilyTreePage.addChild")
+    : t("FamilyTreePage.addAncestor");
+});
+
+/** 关系行的就地展开（编辑表单可见性），key 用配偶/孩子 PersonId */
+const expandedSpouses = ref<Record<string, boolean>>({});
+const expandedChildren = ref<Record<string, boolean>>({});
+
+/** 孩子行的两个枚举编辑器：记住当前操作哪一行（同一时刻只有一个 picker 开着） */
+const relationTarget = ref<FamilyTreeChildrenMapViewEntity | null>(null);
+const relationPickerVisible = ref(false);
+const parentTarget = ref<FamilyTreeChildrenMapViewEntity | null>(null);
+const parentPickerVisible = ref(false);
+
+const relationItems = computed(() => getPolicyOptions("RelationTypePolicy"));
+const spouseOptions = computed(() =>
+  spouseMaps.value
+    .filter(item => item.SpouseId)
+    .map(item => ({
+      key: item.SpouseId,
+      label: `${item.SpouseSurname ?? ""}${item.SpouseGenealogyName ?? ""}`,
+    })),
+);
+
+const pendingPermissions = computed(() =>
+  (data.value.FamilyTreePermissions ?? []).filter(item => item.ValidIndc === "N"),
+);
+const managerPermissions = computed(() =>
+  (data.value.FamilyTreePermissions ?? []).filter(item => item.ValidIndc === "Y"),
+);
+
+/** 详情区分区卡折叠态（与媒体/共享页同款交互）：默认全展开，点标题行切换 */
+type FoldKey = "info" | "person" | "spouses" | "children" | "perms";
+const folded = ref<Record<FoldKey, boolean>>({
+  info: false,
+  person: false,
+  spouses: false,
+  children: false,
+  perms: false,
+});
+
+function toggleFold(key: FoldKey): void {
+  folded.value[key] = !folded.value[key];
+}
+
+const navTitle = computed(() => {
+  if (isCreate.value) {
+    return t("FamilyTreePage.addTreeBut");
+  }
+  return String(tree.value.TreeName || "") || t("MinePage.familyTree");
+});
+
+function toast(title: string): void {
+  uni.showToast({ title, icon: "none" });
+}
+
+function confirmDialog(title: string, content: string): Promise<boolean> {
+  return new Promise((resolve) => {
+    uni.showModal({
+      title,
+      content,
+      success: res => resolve(!!res.confirm),
+      fail: () => resolve(false),
+    });
+  });
+}
+
+async function withBusy(task: () => Promise<void>, tip?: string): Promise<void> {
+  if (busy.value) {
+    return;
+  }
+  busy.value = true;
+  uni.showLoading({ title: tip || t("FilePage.pleaseWait"), mask: true });
+  try {
+    await task();
+  }
+  catch (error: any) {
+    toast(error?.message || t("FilePage.actionFailed"));
+  }
+  finally {
+    uni.hideLoading();
+    busy.value = false;
+  }
+}
+
+function ensureLists(): void {
+  if (!data.value.CurrentPerson) {
+    data.value.CurrentPerson = new FamilyTreeData().CurrentPerson;
+  }
+  if (!data.value.CurrentPerson.FamilyTreeSpouseMaps) {
+    data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
+  }
+  if (!data.value.CurrentPerson.FamilyTreeChildrenMaps) {
+    data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
+  }
+}
+
+function resetDetail(): void {
+  data.value = new FamilyTreeData();
+  ensureLists();
+  treeId.value = "";
+  loaded.value = false;
+  isEdit.value = false;
+  isCreate.value = false;
+  loadedNodes.value = {};
+  expandedSpouses.value = {};
+  expandedChildren.value = {};
+}
+
+/** 载入详情：FindByCurrentPerson({ key, personId })，首载 personId 传空串（后端回默认族员） */
+async function load(): Promise<void> {
+  const result = await familyTreeService.FindByCurrentPerson({
+    key: treeId.value.trim(),
+    personId: currentPerson.value?.PersonId ?? "",
+  });
+  if (!result || result.FamilyTree == null) {
+    toast(t("AdminPage.notExistTip"));
+    loaded.value = false;
+    return;
+  }
+  data.value = result;
+  ensureLists();
+  loaded.value = true;
+  // 无修改权限：强制回到查看模式（旧 onSearch 同款）
+  if (!data.value.IsCanAmend && isEdit.value && !isCreate.value) {
+    isEdit.value = false;
+    toast(t("FamilyTreePage.noAmendTip"));
+  }
+}
+
+async function onOpenTree(row: FamilyTreeViewEntity): Promise<void> {
+  resetDetail();
+  treeId.value = row.TreeId;
+  await withBusy(() => load());
+  if (loaded.value) {
+    inDetail.value = true;
+  }
+}
+
+function onCreateTree(): void {
+  resetDetail();
+  isCreate.value = true;
+  isEdit.value = true;
+  inDetail.value = true;
+}
+
+async function onBack(): Promise<void> {
+  if (!inDetail.value) {
+    // 首页无上级：H5 深链带历史时能退则退，否则停在列表
+    if (getCurrentPages().length > 1) {
+      uni.navigateBack();
+    }
+    return;
+  }
+  await exitDetail();
+}
+
+async function exitDetail(): Promise<void> {
+  resetDetail();
+  inDetail.value = false;
+  await loadTrees();
+}
+
+function onAmend(): void {
+  if (!data.value.IsCanAmend) {
+    toast(t("FamilyTreePage.noAmendTip"));
+    return;
+  }
+  isEdit.value = true;
+}
+
+async function onCancelEdit(): Promise<void> {
+  if (isCreate.value || !loaded.value) {
+    await exitDetail();
+    return;
+  }
+  isEdit.value = false;
+  await withBusy(() => load());
+}
+
+/** 保存按 CreatedBy 有无决定 Update / Insert（旧页口径）；成功回查看态 */
+async function onSave(): Promise<void> {
+  if (!String(tree.value.TreeName ?? "").trim()) {
+    toast(t("FamilyTreePage.treeNameRequired"));
+    return;
+  }
+  ensureLists();
+  await withBusy(async () => {
+    const isUpdate = String(tree.value.CreatedBy ?? "").trim() !== "";
+    const result = await (isUpdate
+      ? familyTreeService.Update(data.value)
+      : familyTreeService.Insert(data.value));
+    if (result?.FamilyTree) {
+      data.value = result;
+      ensureLists();
+      treeId.value = result.FamilyTree.TreeId;
+    }
+    isEdit.value = false;
+    isCreate.value = false;
+    loaded.value = true;
+    toast(t("AdminPage.savedTip"));
+  });
+}
+
+async function onDeleteTree(): Promise<void> {
+  const ok = await confirmDialog(
+    t("AdminPage.confirmDeleteTitle"),
+    String(tree.value.TreeName || treeId.value),
+  );
+  if (!ok) {
+    return;
+  }
+  await withBusy(async () => {
+    await familyTreeService.Delete(tree.value.TreeId);
+    toast(t("AdminPage.deletedTip"));
+    resetDetail();
+    inDetail.value = false;
+    await loadTrees();
+  });
+}
+
+function onPublicChange(value: boolean): void {
+  tree.value.PublicIndc = value ? "Y" : "N";
+}
+
+// ===== 当前族员切换（族员搜索 / 图上点人）=====
+const personPicker = useAdminPick("person");
+
+function pickCurrentPerson(): void {
+  personPicker.open({ page: "familyPersonEnquiry" }, (rows) => {
+    const personId = String(rows[0]?.PersonId ?? "");
+    if (personId) {
+      setCurrentPerson(personId);
+    }
+  });
+}
+
+async function setCurrentPerson(personId: string): Promise<void> {
+  const result = await familyTreeService.FindByCurrentPerson({
+    key: treeId.value.trim(),
+    personId,
+  });
+  if (result?.CurrentPerson?.FamilyPerson?.PersonId) {
+    data.value = result;
+    ensureLists();
+    loaded.value = true;
+  }
+}
+
+// ===== 谱系图（sub 懒加载 / full 全树）=====
+async function onChartSelectChild(personId: string): Promise<void> {
+  if (!personId || !treeId.value || loadedNodes.value[personId]) {
+    return;
+  }
+  try {
+    const result = await familyTreeService.FindByCurrentPerson({
+      key: treeId.value.trim(),
+      personId,
+    });
+    const cp = result?.CurrentPerson;
+    if (cp?.FamilyPerson) {
+      loadedNodes.value = {
+        ...loadedNodes.value,
+        [personId]: {
+          person: cp.FamilyPerson,
+          spouses: cp.FamilyTreeSpouseMaps ?? [],
+          children: cp.FamilyTreeChildrenMaps ?? [],
+        },
+      };
+    }
+  }
+  catch (error) {
+    console.error(error);
+  }
+}
+
+function onChartPickPerson(personId: string): void {
+  setCurrentPerson(personId);
+}
+
+// ===== 夫妻表 =====
+function refreshParentOrderby(): void {
+  spouseMaps.value.forEach((item, idx) => {
+    item.Orderby = idx + 1;
+  });
+}
+
+function pushSpouse(person: FamilyPersonDisplayData): void {
+  ensureLists();
+  const spouse = new FamilyTreeSpouseMapViewEntity();
+  spouse.TreeId = treeId.value;
+  spouse.PersonId = currentPerson.value?.PersonId ?? "";
+  spouse.SpouseId = person.PersonId;
+  spouse.SpouseSurname = person.Surname;
+  spouse.SpouseCommonName = person.CommonName;
+  spouse.SpouseGenealogyName = person.GenealogyName;
+  spouse.Gender = person.Gender;
+  data.value.CurrentPerson.FamilyTreeSpouseMaps.push(spouse);
+  refreshParentOrderby();
+}
+
+function deleteSpouse(spouseId: string): void {
+  data.value.CurrentPerson.FamilyTreeSpouseMaps = spouseMaps.value.filter(
+    item => item.SpouseId !== spouseId,
+  );
+  refreshParentOrderby();
+}
+
+function moveSpouse(index: number, offset: number): void {
+  const list = data.value.CurrentPerson.FamilyTreeSpouseMaps;
+  const target = index + offset;
+  if (target < 0 || target >= list.length) {
+    return;
+  }
+  const item = list.splice(index, 1)[0];
+  list.splice(target, 0, item);
+  refreshParentOrderby();
+}
+
+// ===== 孩子表 =====
+function refreshSonOrderby(): void {
+  childMaps.value.forEach((item, idx) => {
+    item.Orderby = idx + 1;
+  });
+}
+
+function pushChild(person: FamilyPersonDisplayData): void {
+  ensureLists();
+  const child = new FamilyTreeChildrenMapViewEntity();
+  child.TreeId = treeId.value;
+  child.PersonId = currentPerson.value?.PersonId ?? "";
+  child.ChildrenId = person.PersonId;
+  child.ChildrenSurname = person.Surname;
+  child.ChildrenCommonName = person.CommonName;
+  child.ChildrenGenealogyName = person.GenealogyName;
+  child.Gender = person.Gender;
+  data.value.CurrentPerson.FamilyTreeChildrenMaps.push(child);
+  refreshSonOrderby();
+}
+
+function deleteChild(childrenId: string): void {
+  data.value.CurrentPerson.FamilyTreeChildrenMaps = childMaps.value.filter(
+    item => item.ChildrenId !== childrenId,
+  );
+  refreshSonOrderby();
+}
+
+function moveChild(index: number, offset: number): void {
+  const list = data.value.CurrentPerson.FamilyTreeChildrenMaps;
+  const target = index + offset;
+  if (target < 0 || target >= list.length) {
+    return;
+  }
+  const item = list.splice(index, 1)[0];
+  list.splice(target, 0, item);
+  refreshSonOrderby();
+}
+
+// ===== 快速建员回填（对齐旧 onPersonQuickCreated）=====
+function onQuickCreated(person: FamilyPersonDisplayData): void {
+  if (!person || !person.PersonId) {
+    return;
+  }
+  if (qcPurpose.value === "spouse") {
+    pushSpouse(person);
+  }
+  else if (qcPurpose.value === "child") {
+    pushChild(person);
+  }
+  else {
+    tree.value.AncestorPersonId = person.PersonId;
+    tree.value.AncestorPersonGenealogyName = person.GenealogyName;
+  }
+}
+
+function openQuickCreate(purpose: "spouse" | "child" | "ancestor"): void {
+  qcPurpose.value = purpose;
+  qcVisible.value = true;
+}
+
+// 已有成员里选配偶（快速建员之外的入口，对齐旧页）
+const spousePicker = useAdminPick("spouse");
+
+function pickSpouse(): void {
+  spousePicker.open({ page: "familyPersonEnquiry" }, (rows) => {
+    const row = rows[0];
+    if (!row?.PersonId) {
+      return;
+    }
+    pushSpouse({
+      PersonId: String(row.PersonId),
+      Surname: String(row.Surname ?? ""),
+      GenealogyName: String(row.GenealogyName ?? ""),
+      CommonName: String(row.CommonName ?? ""),
+      Gender: String(row.Gender ?? ""),
+    } as FamilyPersonDisplayData);
+  });
+}
+
+// ===== 孩子行的枚举编辑器 =====
+function openRelationPicker(record: FamilyTreeChildrenMapViewEntity): void {
+  relationTarget.value = record;
+  relationPickerVisible.value = true;
+}
+
+function onRelationConfirm(key: string): void {
+  if (relationTarget.value) {
+    relationTarget.value.RelationType = key;
+  }
+  relationPickerVisible.value = false;
+}
+
+function openParentPicker(record: FamilyTreeChildrenMapViewEntity): void {
+  parentTarget.value = record;
+  parentPickerVisible.value = true;
+}
+
+function onParentConfirm(key: string): void {
+  if (parentTarget.value) {
+    parentTarget.value.SpouseId = key;
+  }
+  parentPickerVisible.value = false;
+}
+
+// ===== 权限维护 =====
+async function requestManager(): Promise<void> {
+  const personId = currentPerson.value?.PersonId ?? "";
+  if (!treeId.value || !personId) {
+    return;
+  }
+  await familyTreeService.RequestFamilyTreePermission({
+    treeId: treeId.value.trim(),
+    currentPersonId: personId,
+  });
+  toast(t("FamilyTreePage.requestSentTip"));
+  load();
+}
+
+async function approvePermission(
+  record: { PersonId: string; UserName: string },
+  managerIndc: string,
+): Promise<void> {
+  await familyTreeService.ApproveFamilyTreePermission({
+    treeId: treeId.value,
+    currentPersonId: record.PersonId,
+    userName: record.UserName,
+    managerIndc,
+  });
+  load();
+}
+
+async function rejectPermission(record: { PersonId: string; UserName: string }): Promise<void> {
+  await familyTreeService.RejectFamilyTreePermission({
+    treeId: treeId.value,
+    currentPersonId: record.PersonId,
+    userName: record.UserName,
+  });
+  load();
+}
+
+// ===== 只读文案小工具 =====
+function genderText(gender?: string): string {
+  return getPolicyText("GenderPolicy", gender ?? "");
+}
+
+/** 孩子行展开态的两个只读文案：母亲（配偶选项）与关系（枚举） */
+function spouseLabel(spouseId?: string): string {
+  if (!spouseId) {
+    return t("AdminPage.notSetTip");
+  }
+  return spouseOptions.value.find(item => item.key === spouseId)?.label ?? spouseId;
+}
+
+function relationLabel(relationType?: string): string {
+  if (!relationType) {
+    return t("AdminPage.notSetTip");
+  }
+  return getPolicyText("RelationTypePolicy", relationType) || relationType;
+}
+
+function datePart(value?: Date | string): string {
+  return String(value ?? "").slice(0, 10);
+}
+
+// 首次进入时页面 onShow 早于子组件挂载（页面壳的 ref 还没绑定），
+// 挂载完成后 emit ready 让壳页补发首拉；后续 onShow 组件已挂载，直接调 expose
+onMounted(() => {
+  emit("ready");
+});
+
+// 供页面壳（dashboard）在 onShow 守卫回调里调用：列表态每次重拉
+// （别端增删改后回来能看到最新），详情编辑中回页不打断
+defineExpose({
+  reloadIfList(): void {
+    if (!inDetail.value) {
+      loadTrees();
+    }
+  },
+});
+</script>
+
+<template>
+  <!-- 列表态显示 tabbar，进详情（或弹层展开）收起 -->
+  <app-page :hide-nav="true" :show-tabbar="!inDetail">
+    <view class="tree-page" :style="[{ background: themeBackground }, themeVars]">
+      <!-- ===== 列表态：软底分区面板（标题 + 搜索/新建/伸缩圆钮组 + 白底族谱卡） ===== -->
+      <!-- 隐藏原生滚动条：否则 Chrome 滚动条占右侧 ~17px，面板左右留白不对称 -->
+      <scroll-view v-if="!inDetail" scroll-y :show-scrollbar="false" class="tree-page__body tree-page__body--list">
+        <view class="tree-panel">
+          <view class="tree-panel__head">
+            <text class="tree-panel__title">{{ t("FamilyTreePage.listTitle") }}</text>
+            <view class="tree-panel__acts">
+              <view class="tree-panel__act" @tap="onToggleSearch">
+                <u-icon name="search" size="34" :color="primary" />
+              </view>
+              <view class="tree-panel__act tree-panel__act--add" @tap="onCreateTree">
+                <u-icon name="plus" size="30" color="#ffffff" />
+              </view>
+              <view class="tree-panel__act" @tap="listCollapsed = !listCollapsed">
+                <u-icon :name="listCollapsed ? 'arrow-up' : 'arrow-down'" size="34" :color="primary" />
+              </view>
+            </view>
+          </view>
+          <view v-if="showSearch" class="tree-panel__search">
+            <search-input v-model="keyword" :placeholder="t('FamilyTreePage.searchPlaceholder')" @search="onSearch" />
+          </view>
+          <view v-if="!listCollapsed" class="tree-panel__list">
+            <view v-if="loading" class="tree-page__state">
+              <text class="tree-page__state-text">{{ t("FilePage.loading") }}</text>
+            </view>
+            <view v-else-if="errorText" class="tree-page__state">
+              <text class="tree-page__state-text tree-page__state-text--error">{{ errorText }}</text>
+              <text class="tree-page__retry" @click="onRetry">{{ t("FilePage.retryBut") }}</text>
+            </view>
+            <template v-else>
+              <view v-if="!filteredTrees.length" class="tree-page__empty">
+                <text class="tree-page__state-text">{{ t("FamilyTreePage.chartEmpty") }}</text>
+              </view>
+              <view v-for="row in filteredTrees" :key="row.TreeId" class="tree-card" @tap="onOpenTree(row)">
+                <view class="tree-card__avatar">
+                  <image class="tree-card__glyph" :src="treeGlyph" mode="aspectFit" />
+                </view>
+                <view class="tree-card__main">
+                  <text class="tree-card__name">{{ row.TreeName || t("FamilyTreePage.unnamed") }}</text>
+                  <text class="tree-card__desc">{{ row.Brief || t("FamilyTreePage.noBrief") }}</text>
+                  <view class="tree-card__meta">
+                    <text class="tree-card__chip tree-card__chip--code">{{ row.TreeId }}</text>
+                    <text v-if="row.PublicIndc === 'Y'" class="tree-card__chip tree-card__chip--public">
+                      {{ t("FamilyTreePage.chipPublic") }}
+                    </text>
+                    <text v-else class="tree-card__chip">{{ t("FamilyTreePage.chipPrivate") }}</text>
+                    <text v-if="row.Surname || row.GenealogyName" class="tree-card__ancestor">
+                      {{ `${row.Surname}${row.GenealogyName}` }}
+                    </text>
+                  </view>
+                </view>
+                <u-icon name="arrow-right" size="30" color="#c0c4cc" />
+              </view>
+            </template>
+          </view>
+        </view>
+      </scroll-view>
+
+      <!-- ===== 详情态：族谱管理 ===== -->
+      <view v-else class="tree-page__body">
+        <view class="tree-page__head">
+          <hero-navbar :title="navTitle" @back="onBack" />
+        </view>
+        <view class="tree-page__scroll-wrap">
+          <scroll-view scroll-y class="tree-page__scroll">
+            <!-- 头卡（与媒体/共享页同套）：白底 + 主题浅底图标 + 编号灰字独立行 -->
+            <view class="detail-hero">
+              <view class="detail-hero__avatar">
+                <u-icon name="account-fill" size="64" :color="primary" />
+              </view>
+              <view class="detail-hero__main">
+                <text class="detail-hero__name">{{ tree.TreeName || t("FamilyTreePage.unnamed") }}</text>
+                <text class="detail-hero__code">
+                  {{ tree.TreeId || t("FamilyTreePage.treeIdPlaceholder") }}
+                </text>
+                <view class="detail-hero__chips">
+                  <text v-if="tree.PublicIndc === 'Y'" class="detail-hero__chip">
+                    {{ t("FamilyTreePage.chipPublic") }}
+                  </text>
+                  <text v-else class="detail-hero__chip detail-hero__chip--member">
+                    {{ t("FamilyTreePage.chipPrivate") }}
+                  </text>
+                  <text v-if="data.IsManager" class="detail-hero__chip detail-hero__chip--admin">
+                    {{ t("FamilyTreePage.managerTag") }}
+                  </text>
+                </view>
+              </view>
+              <!-- 修改 / 删除：右上角圆形图标动作（与共享页同套，IsCanAmend 才出现） -->
+              <view v-if="loaded && !isEdit && data.IsCanAmend" class="detail-hero__acts">
+                <view class="detail-hero__act" @tap="onAmend">
+                  <u-icon name="edit-pen" size="34" :color="primary" />
+                </view>
+                <view class="detail-hero__act detail-hero__act--danger" @tap="onDeleteTree">
+                  <u-icon name="trash" size="34" color="#f0413e" />
+                </view>
+              </view>
+            </view>
+
+            <!-- 动作栏（仅编辑态：取消 / 保存） -->
+            <view v-if="isEdit" class="detail-actions">
+              <view class="detail-actions__btn" @tap="onCancelEdit">
+                <text>{{ t("AdminPage.cancelBut") }}</text>
+              </view>
+              <view class="detail-actions__btn detail-actions__btn--primary" @tap="onSave">
+                <text>{{ t("AdminPage.saveBut") }}</text>
+              </view>
+            </view>
+
+            <!-- 族谱信息卡：点标题行折叠/展开 -->
+            <view class="detail-card">
+              <view class="detail-card__head" @tap="toggleFold('info')">
+                <text class="detail-card__title">{{ t("FamilyTreePage.infoTitle") }}</text>
+                <u-icon :name="folded.info ? 'arrow-right' : 'arrow-down'" size="26" color="#8f959e" />
+              </view>
+              <view v-show="!folded.info">
+                <view class="detail-field">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.treeId") }}</text>
+                  <text class="detail-field__static">{{ tree.TreeId || "-" }}</text>
+                </view>
+                <view class="detail-field">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.treeName") }}</text>
+                  <input v-model="tree.TreeName" class="detail-field__input" :disabled="!isEdit" :maxlength="50"
+                    :placeholder="t('FamilyTreePage.treeNameRequired')">
+                </view>
+                <view class="detail-field">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.brief") }}</text>
+                  <textarea v-model="tree.Brief" class="detail-field__textarea" :disabled="!isEdit" :maxlength="1000"
+                    :placeholder="t('FamilyTreePage.noBrief')" />
+                </view>
+                <view class="detail-field">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.treeCover") }}</text>
+                  <input v-model="tree.TreeCoverFilename" class="detail-field__input" :disabled="!isEdit"
+                    :maxlength="255">
+                </view>
+                <view class="detail-field detail-field--row">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.publicIndc") }}</text>
+                  <u-switch :model-value="tree.PublicIndc === 'Y'" :disabled="!isEdit" :active-color="primary"
+                    @change="onPublicChange" />
+                </view>
+                <view class="detail-field">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.ancestor") }}</text>
+                  <text class="detail-field__static">{{ tree.AncestorPersonGenealogyName || "-" }}</text>
+                  <text v-if="isEdit" class="detail-op-line" @tap="openQuickCreate('ancestor')">
+                    + {{ t("FamilyTreePage.addAncestor") }}
+                  </text>
+                </view>
+              </view>
+            </view>
+
+            <!-- 当前族员卡：只读信息 + 操作钮组 -->
+            <view v-if="loaded" class="detail-card">
+              <view class="detail-card__head" @tap="toggleFold('person')">
+                <text class="detail-card__title">{{ t("FamilyTreePage.currentPerson") }}</text>
+                <u-icon :name="folded.person ? 'arrow-right' : 'arrow-down'" size="26" color="#8f959e" />
+              </view>
+              <view v-show="!folded.person">
+                <view class="detail-field detail-field--row">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.gender") }}</text>
+                  <text class="detail-field__value">{{ genderText(currentPerson?.Gender) || "-" }}</text>
+                </view>
+                <view class="detail-field detail-field--row">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.genealogyName") }}</text>
+                  <text class="detail-field__value">{{ currentPerson?.GenealogyName || "-" }}</text>
+                </view>
+                <view class="detail-field detail-field--row">
+                  <text class="detail-field__label">{{ t("FamilyTreePage.commonName") }}</text>
+                  <text class="detail-field__value">{{ currentPerson?.CommonName || "-" }}</text>
+                </view>
+                <view class="op-btns">
+                  <view class="op-btn" @tap="pickCurrentPerson">
+                    <u-icon name="search" size="26" :color="primary" />
+                    <text class="op-btn-text">{{ t("FamilyTreePage.personSearch") }}</text>
+                  </view>
+                  <view class="op-btn" @tap="subChartVisible = true">
+                    <u-icon name="grid" size="26" :color="primary" />
+                    <text class="op-btn-text">{{ t("FamilyTreePage.pedigreeChart") }}</text>
+                  </view>
+                  <view class="op-btn" @tap="fullChartVisible = true">
+                    <u-icon name="list" size="26" :color="primary" />
+                    <text class="op-btn-text">{{ t("FamilyTreePage.ancestryChart") }}</text>
+                  </view>
+                  <view v-if="!data.IsManager" class="op-btn" @tap="requestManager">
+                    <u-icon name="shield" size="26" :color="primary" />
+                    <text class="op-btn-text">{{ t("FamilyTreePage.applyManage") }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 夫妻记录卡：查看态只读可展开（对齐旧系统查看态的关系维护），编辑态带添加/排序/删除 -->
+            <view class="detail-card">
+              <view class="detail-card__head" @tap="toggleFold('spouses')">
+                <view class="detail-card__title-group">
+                  <text class="detail-card__title">{{ t("FamilyTreePage.spouseTitle") }}</text>
+                  <text class="detail-card__count">{{ spouseMaps.length }}</text>
+                </view>
+                <view class="detail-card__head-acts">
+                  <template v-if="isEdit">
+                    <text class="detail-card__add" @tap.stop="openQuickCreate('spouse')">
+                      + {{ t("FamilyTreePage.addSpouse") }}
+                    </text>
+                    <text class="detail-card__add" @tap.stop="pickSpouse">
+                      {{ t("FamilyTreePage.pickSpouse") }}
+                    </text>
+                  </template>
+                  <u-icon :name="folded.spouses ? 'arrow-right' : 'arrow-down'" size="26" color="#8f959e" />
+                </view>
+              </view>
+              <view v-show="!folded.spouses">
+                <view v-if="!spouseMaps.length" class="detail-empty">
+                  <text>{{ t("FamilyTreePage.spouseEmpty") }}</text>
+                </view>
+                <view v-for="(record, index) in spouseMaps" :key="record.SpouseId" class="rel-item">
+                  <view class="rel-head" @tap="expandedSpouses[record.SpouseId] = !expandedSpouses[record.SpouseId]">
+                    <view class="rel-text">
+                      <text class="rel-name">{{ record.SpouseSurname }}{{ record.SpouseGenealogyName }}</text>
+                      <text class="rel-sub">{{ genderText(record.Gender) }}</text>
+                    </view>
+                    <view class="rel-ops">
+                      <template v-if="isEdit">
+                        <u-icon name="arrow-up" size="28" :color="index === 0 ? '#e0e0e0' : primary"
+                          @click.stop="moveSpouse(index, -1)" />
+                        <u-icon name="arrow-down" size="28"
+                          :color="index === spouseMaps.length - 1 ? '#e0e0e0' : primary"
+                          @click.stop="moveSpouse(index, 1)" />
+                        <u-icon name="trash" size="32" color="#c4c8cf" @click.stop="deleteSpouse(record.SpouseId)" />
+                      </template>
+                      <u-icon :name="expandedSpouses[record.SpouseId] ? 'up' : 'down'" size="26" color="#8f959e" />
+                    </view>
+                  </view>
+                  <view v-if="expandedSpouses[record.SpouseId]" class="rel-form">
+                    <template v-if="isEdit">
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.marryDateText") }}</text>
+                        <input v-model="record.MarryDateText" class="sub-input" :maxlength="50">
+                      </view>
+                      <picker mode="date" :value="datePart(record.MarryDate)"
+                        @change="record.MarryDate = $event.detail.value">
+                        <view class="sub-row">
+                          <text class="sub-label">{{ t("FamilyTreePage.marryDate") }}</text>
+                          <view class="sub-picker">
+                            <text class="sub-picker-text">{{ datePart(record.MarryDate) || t("AdminPage.notSetTip")
+                            }}</text>
+                            <u-icon name="arrow-right" size="24" color="#c4c8cf" />
+                          </view>
+                        </view>
+                      </picker>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.divorceDateText") }}</text>
+                        <input v-model="record.DivorceDateText" class="sub-input" :maxlength="50">
+                      </view>
+                      <picker mode="date" :value="datePart(record.DivorceDate)"
+                        @change="record.DivorceDate = $event.detail.value">
+                        <view class="sub-row">
+                          <text class="sub-label">{{ t("FamilyTreePage.divorceDate") }}</text>
+                          <view class="sub-picker">
+                            <text class="sub-picker-text">{{
+                              datePart(record.DivorceDate) || t("AdminPage.notSetTip")
+                            }}</text>
+                            <u-icon name="arrow-right" size="24" color="#c4c8cf" />
+                          </view>
+                        </view>
+                      </picker>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.marryType") }}</text>
+                        <input v-model="record.MarryType" class="sub-input" :maxlength="50">
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.isCurrent") }}</text>
+                        <u-switch :model-value="record.IsCurrent === 'Y'" size="40" :active-color="primary"
+                          @change="record.IsCurrent = $event ? 'Y' : 'N'" />
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
+                        <input v-model="record.Remark" class="sub-input" :maxlength="100">
+                      </view>
+                    </template>
+                    <!-- 查看态只读明细 -->
+                    <template v-else>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.marryDate") }}</text>
+                        <text class="sub-static">{{ datePart(record.MarryDate) || "-" }}</text>
+                      </view>
+                      <view v-if="record.MarryDateText" class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.marryDateText") }}</text>
+                        <text class="sub-static">{{ record.MarryDateText }}</text>
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.divorceDate") }}</text>
+                        <text class="sub-static">{{ datePart(record.DivorceDate) || "-" }}</text>
+                      </view>
+                      <view v-if="record.MarryType" class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.marryType") }}</text>
+                        <text class="sub-static">{{ record.MarryType }}</text>
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.isCurrent") }}</text>
+                        <text class="sub-static">
+                          {{ record.IsCurrent === "Y" ? t("FamilyTreePage.yes") : t("FamilyTreePage.no") }}
+                        </text>
+                      </view>
+                      <view v-if="record.Remark" class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
+                        <text class="sub-static">{{ record.Remark }}</text>
+                      </view>
+                    </template>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 子女记录卡：查看态只读可展开，编辑态带添加/排序/删除 -->
+            <view class="detail-card">
+              <view class="detail-card__head" @tap="toggleFold('children')">
+                <view class="detail-card__title-group">
+                  <text class="detail-card__title">{{ t("FamilyTreePage.childTitle") }}</text>
+                  <text class="detail-card__count">{{ childMaps.length }}</text>
+                </view>
+                <view class="detail-card__head-acts">
+                  <text v-if="isEdit" class="detail-card__add" @tap.stop="openQuickCreate('child')">
+                    + {{ t("FamilyTreePage.addChild") }}
+                  </text>
+                  <u-icon :name="folded.children ? 'arrow-right' : 'arrow-down'" size="26" color="#8f959e" />
+                </view>
+              </view>
+              <view v-show="!folded.children">
+                <view v-if="!childMaps.length" class="detail-empty">
+                  <text>{{ t("FamilyTreePage.childEmpty") }}</text>
+                </view>
+                <view v-for="(record, index) in childMaps" :key="record.ChildrenId" class="rel-item">
+                  <view class="rel-head"
+                    @tap="expandedChildren[record.ChildrenId] = !expandedChildren[record.ChildrenId]">
+                    <view class="rel-text">
+                      <text class="rel-name">{{ record.ChildrenSurname }}{{ record.ChildrenGenealogyName }}</text>
+                      <text class="rel-sub">{{ genderText(record.Gender) }}</text>
+                    </view>
+                    <view class="rel-ops">
+                      <template v-if="isEdit">
+                        <u-icon name="arrow-up" size="28" :color="index === 0 ? '#e0e0e0' : primary"
+                          @click.stop="moveChild(index, -1)" />
+                        <u-icon name="arrow-down" size="28"
+                          :color="index === childMaps.length - 1 ? '#e0e0e0' : primary"
+                          @click.stop="moveChild(index, 1)" />
+                        <u-icon name="trash" size="32" color="#c4c8cf" @click.stop="deleteChild(record.ChildrenId)" />
+                      </template>
+                      <u-icon :name="expandedChildren[record.ChildrenId] ? 'up' : 'down'" size="26" color="#8f959e" />
+                    </view>
+                  </view>
+                  <view v-if="expandedChildren[record.ChildrenId]" class="rel-form">
+                    <template v-if="isEdit">
+                      <view class="sub-row" @tap="openParentPicker(record)">
+                        <text class="sub-label">{{ t("FamilyTreePage.parent") }}</text>
+                        <view class="sub-picker">
+                          <text class="sub-picker-text">{{ spouseLabel(record.SpouseId) }}</text>
+                          <u-icon name="arrow-right" size="24" color="#c4c8cf" />
+                        </view>
+                      </view>
+                      <view class="sub-row" @tap="openRelationPicker(record)">
+                        <text class="sub-label">{{ t("FamilyTreePage.relationType") }}</text>
+                        <view class="sub-picker">
+                          <text class="sub-picker-text">{{ relationLabel(record.RelationType) }}</text>
+                          <u-icon name="arrow-right" size="24" color="#c4c8cf" />
+                        </view>
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
+                        <input v-model="record.Remark" class="sub-input" :maxlength="100">
+                      </view>
+                    </template>
+                    <!-- 查看态只读明细 -->
+                    <template v-else>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.parent") }}</text>
+                        <text class="sub-static">{{ spouseLabel(record.SpouseId) }}</text>
+                      </view>
+                      <view class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.relationType") }}</text>
+                        <text class="sub-static">{{ relationLabel(record.RelationType) }}</text>
+                      </view>
+                      <view v-if="record.Remark" class="sub-row">
+                        <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
+                        <text class="sub-static">{{ record.Remark }}</text>
+                      </view>
+                    </template>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 权限维护卡（仅管理员且查看态） -->
+            <view v-if="loaded && data.IsManager && !isEdit" class="detail-card">
+              <view class="detail-card__head" @tap="toggleFold('perms')">
+                <text class="detail-card__title">{{ t("FamilyTreePage.permTitle") }}</text>
+                <u-icon :name="folded.perms ? 'arrow-right' : 'arrow-down'" size="26" color="#8f959e" />
+              </view>
+              <view v-show="!folded.perms">
+                <text class="perm-section-label">{{ t("FamilyTreePage.permPending") }}</text>
+                <view v-if="!pendingPermissions.length" class="detail-empty">
+                  <text>{{ t("FamilyTreePage.permEmpty") }}</text>
+                </view>
+                <view v-for="record in pendingPermissions" :key="record.PersonId" class="perm-row">
+                  <view class="rel-text">
+                    <text class="rel-name">{{ record.UserLocalName || record.UserName }}</text>
+                    <text v-if="record.PersonLocalName" class="rel-sub">{{ record.PersonLocalName }}</text>
+                  </view>
+                  <view class="perm-ops">
+                    <view class="perm-op" @tap="approvePermission(record, 'N')">
+                      <text class="perm-op-text">{{ t("FamilyTreePage.approve") }}</text>
+                    </view>
+                    <view class="perm-op" @tap="approvePermission(record, 'Y')">
+                      <text class="perm-op-text">{{ t("FamilyTreePage.setManager") }}</text>
+                    </view>
+                    <view class="perm-op perm-op--danger" @tap="rejectPermission(record)">
+                      <text class="perm-op-text perm-op-text--danger">{{ t("FamilyTreePage.reject") }}</text>
+                    </view>
+                  </view>
+                </view>
+
+                <text class="perm-section-label">{{ t("FamilyTreePage.permManager") }}</text>
+                <view v-if="!managerPermissions.length" class="detail-empty">
+                  <text>{{ t("FamilyTreePage.permEmpty") }}</text>
+                </view>
+                <view v-for="record in managerPermissions" :key="record.PersonId" class="perm-row">
+                  <view class="rel-text">
+                    <text class="rel-name">{{ record.UserLocalName || record.UserName }}</text>
+                    <text class="rel-sub">{{
+                      record.ManagerIndc === "Y" ? t("FamilyTreePage.managerTag") : t("FamilyTreePage.memberTag")
+                    }}</text>
+                  </view>
+                  <view class="perm-ops">
+                    <view class="perm-op perm-op--danger" @tap="rejectPermission(record)">
+                      <text class="perm-op-text perm-op-text--danger">{{ t("FamilyTreePage.remove") }}</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <view class="tree-page__detail-space" />
+          </scroll-view>
+        </view>
+      </view>
+
+      <!-- 快速建员 / 谱系图 / 祖谱系图 / 枚举选择器（浮层两态共用） -->
+      <person-quick-create v-model:visible="qcVisible" :tree-id="treeId" :title="qcTitle" @created="onQuickCreated" />
+      <family-tree-chart v-model:visible="subChartVisible" mode="sub" :root="data" :loaded-nodes="loadedNodes"
+        :title="t('FamilyTreePage.pedigreeChart')" @select-child="onChartSelectChild"
+        @pick-person="onChartPickPerson" />
+      <family-tree-chart v-model:visible="fullChartVisible" mode="full" :tree-id="treeId" :root="data"
+        :title="t('FamilyTreePage.ancestryChart')" />
+      <option-picker :visible="relationPickerVisible" :title="t('FamilyTreePage.relationType')" :items="relationItems"
+        :empty-text="t('FamilyTreePage.relationEmpty')" @close="relationPickerVisible = false"
+        @confirm="onRelationConfirm" />
+      <option-picker :visible="parentPickerVisible" :title="t('FamilyTreePage.parent')" :items="spouseOptions"
+        :empty-text="t('FamilyTreePage.parentEmpty')" @close="parentPickerVisible = false" @confirm="onParentConfirm" />
+    </view>
+  </app-page>
+</template>
+
+<style lang="scss" scoped>
+/* ===== 页面骨架（媒体/共享页同套：整屏固定 + 内滚） ===== */
+.tree-page {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.tree-page__body {
+  display: flex;
+  flex: 1;
+  min-height: 0;
+  flex-direction: column;
+}
+
+.tree-page__head {
+  flex-shrink: 0;
+}
+
+.tree-page__scroll-wrap {
+  flex: 1;
+  min-height: 0;
+  margin: 20rpx 20rpx 0;
+  overflow: hidden;
+}
+
+/* 列表态整页滚动：分区面板按内容撑高（为日后首页并列多块面板留位）。
+   box-sizing 必加：uni 给 scroll-view 根设了 width:100%，默认 content-box 下
+   padding 会外溢成 100%+两侧留白，导致面板整体右移、两边不对称 */
+.tree-page__body--list {
+  display: block;
+  box-sizing: border-box;
+  padding: 20rpx;
+}
+
+/* ===== 列表态分区面板：主题浅底圆角，标题与圆钮组同行，白底族谱卡嵌在其中 ===== */
+.tree-panel {
+  padding: 28rpx;
+  border-radius: 32rpx;
+  background: var(--fg-soft, #f6efe8);
+}
+
+.tree-panel__head {
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+}
+
+.tree-panel__title {
+  flex: 1;
+  font-size: 38rpx;
+  font-weight: 700;
+  color: #1f2329;
+}
+
+.tree-panel__acts {
+  display: flex;
+  align-items: center;
+  gap: 14rpx;
+}
+
+/* 头部圆钮：搜索/伸缩白底深图，新建主题渐变底白图（与旧悬浮球同面色）；
+   白钮投影与橙钮光晕同量级，三颗视觉分量一致 */
+.tree-panel__act {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background-color: #ffffff;
+  box-shadow: 0 6rpx 16rpx rgba(31, 35, 41, 0.12);
+}
+
+.tree-panel__act--add {
+  background: var(--fg-gradient, #ff9d45);
+  box-shadow: 0 6rpx 16rpx var(--fg-shadow, rgba(255, 157, 69, 0.35));
+}
+
+.tree-panel__search {
+  margin-top: 20rpx;
+}
+
+/* search-input 自带页级 24rpx 左右留白（通栏页面用），嵌进面板要剥掉才能与卡片对齐 */
+.tree-panel__search :deep(.search-input) {
+  padding-right: 0;
+  padding-left: 0;
+}
+
+.tree-panel__list {
+  margin-top: 24rpx;
+}
+
+.tree-page__scroll {
+  height: 100%;
+}
+
+.tree-page__detail-space {
+  height: 48rpx;
+}
+
+.tree-page__state,
+.tree-page__empty {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 24rpx;
+  padding: 64rpx 32rpx;
+}
+
+.tree-page__state-text {
+  font-size: 26rpx;
+  color: #9aa0a6;
+}
+
+.tree-page__state-text--error {
+  color: #f0413e;
+}
+
+.tree-page__retry {
+  padding: 8rpx 28rpx;
+  border-radius: 999rpx;
+  font-size: 26rpx;
+  color: var(--fg-primary, #2b8fff);
+  background-color: var(--fg-soft, #eaf4ff);
+}
+
+/* ===== 列表卡片（媒体页 album-card 同套） ===== */
+.tree-card {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  margin: 0 0 20rpx;
+  padding: 28rpx;
+  border-radius: 24rpx;
+  background-color: #ffffff;
+  box-shadow: 0 6rpx 18rpx rgba(31, 35, 41, 0.05);
+}
+
+.tree-card:last-child {
+  margin-bottom: 0;
+}
+
+.tree-card__avatar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 88rpx;
+  height: 88rpx;
+  border-radius: 20rpx;
+  background: var(--fg-gradient, linear-gradient(135deg, #4a9dff, #2b8fff));
+  flex-shrink: 0;
+}
+
+/* 树形字形（内联 SVG data-URI） */
+.tree-card__glyph {
+  width: 56rpx;
+  height: 56rpx;
+}
+
+.tree-card__main {
+  display: flex;
+  flex: 1;
+  min-width: 0;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.tree-card__name {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #1f2329;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.tree-card__desc {
+  font-size: 24rpx;
+  color: #8f959e;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.tree-card__meta {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 10rpx;
+}
+
+.tree-card__chip {
+  padding: 2rpx 14rpx;
+  border-radius: 8rpx;
+  font-size: 20rpx;
+  color: #5c626b;
+  background-color: #f2f3f5;
+
+  &--code,
+  &--public {
+    color: var(--fg-primary, #2b8fff);
+    background-color: var(--fg-soft, #eaf4ff);
+  }
+}
+
+.tree-card__ancestor {
+  margin-left: auto;
+  font-size: 20rpx;
+  color: #bfc3c9;
+}
+
+/* ===== 详情头卡 + 圆形动作钮（与共享页同套） ===== */
+.detail-hero {
+  position: relative;
+  display: flex;
+  align-items: center;
+  gap: 28rpx;
+  margin: 0 4rpx 20rpx;
+  padding: 40rpx 32rpx;
+  border-radius: 32rpx;
+  background-color: #ffffff;
+}
+
+.detail-hero__acts {
+  position: absolute;
+  top: 28rpx;
+  right: 28rpx;
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
+/* 圆形动作钮：浅灰底 + 主题色图标，删除用浅红底红图标 */
+.detail-hero__act {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 76rpx;
+  height: 76rpx;
+  border-radius: 50%;
+  background-color: #f2f3f5;
+
+  &--danger {
+    background-color: #ffeceb;
+  }
+}
+
+.detail-hero__avatar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 32rpx;
+  background-color: var(--fg-soft, #eaf4ff);
+  flex-shrink: 0;
+}
+
+.detail-hero__main {
+  display: flex;
+  flex: 1;
+  min-width: 0;
+  flex-direction: column;
+  gap: 10rpx;
+}
+
+.detail-hero__name {
+  font-size: 40rpx;
+  font-weight: 700;
+  color: #1f2329;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/* 族谱编号独立成行：灰字说明（同媒体页专辑编号） */
+.detail-hero__code {
+  font-size: 26rpx;
+  color: #8f959e;
+}
+
+.detail-hero__chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12rpx;
+  margin-top: 6rpx;
+}
+
+/* 头卡胶囊：公开=主题浅底主题字，管理员=黄底橙字，私密=浅灰 */
+.detail-hero__chip {
+  padding: 6rpx 22rpx;
+  border-radius: 12rpx;
+  font-size: 24rpx;
+  color: var(--fg-primary, #2b8fff);
+  background-color: var(--fg-soft, #eaf4ff);
+
+  &--admin {
+    color: #ff9500;
+    background-color: #fff4e0;
+  }
+
+  &--member {
+    color: #5c626b;
+    background-color: #f2f3f5;
+  }
+}
+
+/* ===== 动作栏（仅编辑态）：96/24 描边规格，主钮跟主题 ===== */
+.detail-actions {
+  display: flex;
+  gap: 20rpx;
+  margin: 0 4rpx 20rpx;
+}
+
+.detail-actions__btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+  height: 96rpx;
+  border: 2rpx solid #e5e6eb;
+  border-radius: 24rpx;
+  font-size: 32rpx;
+  color: #5c626b;
+  background-color: #ffffff;
+
+  &--primary {
+    border-color: transparent;
+    font-weight: 600;
+    color: #ffffff;
+    background-color: var(--fg-primary, #2b8fff);
+  }
+}
+
+/* ===== 分区卡片（折叠） ===== */
+.detail-card {
+  margin: 0 4rpx 20rpx;
+  padding: 28rpx;
+  border-radius: 24rpx;
+  background-color: #ffffff;
+}
+
+.detail-card__head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+/* 标题行右侧一组：添加钮 + 折叠箭头 */
+.detail-card__head-acts {
+  display: flex;
+  align-items: center;
+  gap: 28rpx;
+}
+
+.detail-card__title-group {
+  display: flex;
+  align-items: center;
+  gap: 14rpx;
+}
+
+.detail-card__title {
+  font-size: 34rpx;
+  font-weight: 700;
+  color: #1f2329;
+}
+
+/* 标题后的条数徽标（对齐旧系统「夫妻关系 1」的计数） */
+.detail-card__count {
+  padding: 2rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
+  color: var(--fg-primary, #ff7d1f);
+  background: var(--fg-soft, rgba(255, 157, 69, 0.14));
+}
+
+.detail-card__add {
+  font-size: 26rpx;
+  color: var(--fg-primary, #2b8fff);
+}
+
+.detail-empty {
+  padding: 40rpx 0;
+  text-align: center;
+  font-size: 24rpx;
+  color: #bfc3c9;
+}
+
+/* ===== 字段行：白底描边输入件（同媒体页编辑态） ===== */
+.detail-field {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+  margin-top: 24rpx;
+}
+
+.detail-field--row {
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.detail-field__label {
+  font-size: 26rpx;
+  color: #5c626b;
+}
+
+/* 编号/祖先等不可编辑说明：纯灰字 */
+.detail-field__static {
+  font-size: 28rpx;
+  line-height: 1.6;
+  color: #8f959e;
+}
+
+.detail-field__value {
+  font-size: 28rpx;
+  color: #1f2329;
+}
+
+.detail-field__input {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 24rpx;
+  height: 88rpx;
+  border: 2rpx solid #e6e7ea;
+  border-radius: 16rpx;
+  font-size: 28rpx;
+  color: #1f2329;
+  background-color: #ffffff;
+}
+
+.detail-field__textarea {
+  box-sizing: border-box;
+  width: 100%;
+  min-height: 200rpx;
+  padding: 20rpx 24rpx;
+  border: 2rpx solid #e6e7ea;
+  border-radius: 16rpx;
+  font-size: 28rpx;
+  color: #1f2329;
+  background-color: #ffffff;
+}
+
+/* 字段下的操作行（新增祖先等） */
+.detail-op-line {
+  font-size: 26rpx;
+  color: var(--fg-primary, #2b8fff);
+}
+
+/* ===== 当前族员操作钮组 ===== */
+.op-btns {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+  gap: 16rpx;
+  margin-top: 24rpx;
+  padding-top: 24rpx;
+  border-top: 2rpx solid #f2f3f5;
+}
+
+.op-btn {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 8rpx 0;
+}
+
+.op-btn-text {
+  margin-left: 6rpx;
+  font-size: 26rpx;
+  color: var(--fg-primary, #2b8fff);
+}
+
+/* ===== 关系行（夫妻/孩子）：展开编辑 + 排序/删除 ===== */
+.rel-item {
+  padding: 16rpx 0;
+  border-bottom: 2rpx solid #f2f3f5;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.rel-head {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.rel-text {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+
+.rel-name {
+  font-size: 28rpx;
+  color: #1f2329;
+}
+
+.rel-sub {
+  margin-top: 4rpx;
+  font-size: 22rpx;
+  color: #8f959e;
+}
+
+.rel-ops {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 20rpx;
+  flex-shrink: 0;
+}
+
+.rel-form {
+  margin-top: 12rpx;
+  padding: 8rpx 20rpx 8rpx 24rpx;
+  background-color: #f7f8fa;
+  border-radius: 16rpx;
+}
+
+.sub-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 80rpx;
+}
+
+.sub-label {
+  font-size: 24rpx;
+  color: #5c626b;
+  flex-shrink: 0;
+}
+
+/* 查看态只读值：与编辑控件同列右对齐 */
+.sub-static {
+  flex: 1;
+  min-width: 0;
+  margin-left: 24rpx;
+  font-size: 26rpx;
+  color: #1f2329;
+  text-align: right;
+}
+
+.sub-input {
+  box-sizing: border-box;
+  flex: 1;
+  min-width: 0;
+  height: 64rpx;
+  margin-left: 24rpx;
+  padding: 0 20rpx;
+  border: 2rpx solid #e6e7ea;
+  border-radius: 12rpx;
+  font-size: 26rpx;
+  color: #1f2329;
+  background-color: #ffffff;
+  text-align: right;
+}
+
+.sub-picker {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 8rpx;
+}
+
+.sub-picker-text {
+  font-size: 24rpx;
+  color: #5c626b;
+}
+
+/* ===== 权限维护行 ===== */
+.perm-section-label {
+  display: block;
+  padding: 24rpx 0 4rpx;
+  font-size: 24rpx;
+  color: #8f959e;
+}
+
+.perm-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 92rpx;
+  padding: 12rpx 0;
+  border-bottom: 2rpx solid #f2f3f5;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.perm-ops {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 16rpx;
+  flex-shrink: 0;
+}
+
+.perm-op {
+  padding: 8rpx 20rpx;
+  background-color: #f2f3f5;
+  border-radius: 999rpx;
+
+  &--danger {
+    background-color: #ffeceb;
+  }
+}
+
+.perm-op-text {
+  font-size: 24rpx;
+  color: var(--fg-primary, #2b8fff);
+
+  &--danger {
+    color: #f0413e;
+  }
+}
+</style>
diff --git a/uniapp/youjiala/src/components/float-add-btn/float-add-btn.vue b/uniapp/youjiala/src/components/float-add-btn/float-add-btn.vue
index 071164c..ecade22 100644
--- a/uniapp/youjiala/src/components/float-add-btn/float-add-btn.vue
+++ b/uniapp/youjiala/src/components/float-add-btn/float-add-btn.vue
@@ -43,13 +43,17 @@ function sizePx(): number {
   return uni.upx2px(112);
 }
 
-/** 夹在屏幕可视区内，四边留 8px 呼吸位 */
+/** 夹在屏幕可视区内：左右/底缘留 8px 呼吸位；顶让出导航栏条带、底让出 tabbar 条带——
+ *  两带是 z-index 更高的 fixed/sticky 层（page-navbar 为 9，本球仅 8），球一旦进入，
+ *  mousedown/touchstart 会被上层截走，表现为"球卡死拖不动"（位置全页面共享存储，一处卡处处卡） */
 function clampPos(x: number, y: number): { x: number; y: number } {
-  const { windowWidth, windowHeight } = uni.getSystemInfoSync();
+  const { windowWidth, windowHeight, statusBarHeight = 0, safeAreaInsets } = uni.getSystemInfoSync();
   const size = sizePx();
+  const minY = (statusBarHeight || 0) + uni.upx2px(100);
+  const maxY = windowHeight - size - (safeAreaInsets?.bottom ?? 0) - uni.upx2px(110);
   return {
     x: Math.min(Math.max(8, x), windowWidth - size - 8),
-    y: Math.min(Math.max(8, y), windowHeight - size - 8),
+    y: Math.min(Math.max(minY, y), Math.max(minY, maxY)),
   };
 }
 
diff --git a/uniapp/youjiala/src/components/page-navbar/page-navbar.vue b/uniapp/youjiala/src/components/page-navbar/page-navbar.vue
index 40ffed6..373a50a 100644
--- a/uniapp/youjiala/src/components/page-navbar/page-navbar.vue
+++ b/uniapp/youjiala/src/components/page-navbar/page-navbar.vue
@@ -90,6 +90,8 @@ const transferIcon = computed(() => transferGlyph(props.transferring ? TRANSFER_
             <view v-if="props.showQuickToggle" class="page-navbar__btn" @tap="emit('toggle-quick')">
                 <u-icon name="grid" size="38" :color="props.quickOn ? '#2b8fff' : '#8f959e'" />
             </view>
+            <!-- 页面自定义动作区（如首页「新建族谱」圆钮）：追加在最右，不填不影响既有页面 -->
+            <slot name="actions" />
         </view>
     </view>
 </template>
diff --git a/uniapp/youjiala/src/components/video-player/video-player.vue b/uniapp/youjiala/src/components/video-player/video-player.vue
index 56ed232..6bfad9b 100644
--- a/uniapp/youjiala/src/components/video-player/video-player.vue
+++ b/uniapp/youjiala/src/components/video-player/video-player.vue
@@ -183,6 +183,13 @@ function attachHls(): void {
         hls.loadSource(url);
         hls.attachMedia(el);
         hls.on(Hls.Events.MANIFEST_PARSED, () => {
+            // m3u8 清单解析完即有总时长：先取 level 的 totalDuration，再兜底读元素
+            const d = Number(hls?.levels?.[0]?.totalDuration) || 0;
+            if (d > 0 && isFinite(d)) {
+                duration.value = d;
+            } else {
+                syncDuration();
+            }
             if (pending != null) {
                 el.currentTime = pending;
             }
@@ -382,8 +389,24 @@ function onWaiting(): void {
 function onPlaying(): void {
     buffering.value = false;
 }
-function onCanplay(): void {
+function onCanplay(e: { detail?: { duration?: number } }): void {
     buffering.value = false;
+    // 未点播放也先亮总时长：uni canplay 的 detail.duration（H5/App/小程序都有）
+    const d = Number(e?.detail?.duration) || 0;
+    if (d > 0 && isFinite(d)) {
+        duration.value = d;
+        return;
+    }
+    syncDuration();
+}
+/** H5 兜底：从内层 <video> 元素读 duration（loadedmetadata 后即可用） */
+function syncDuration(): void {
+    // #ifdef H5
+    const d = Number(getInnerVideo()?.duration) || 0;
+    if (d > 0 && isFinite(d)) {
+        duration.value = d;
+    }
+    // #endif
 }
 function onTimeUpdate(e: { detail: { currentTime: number; duration: number } }): void {
     // 画面在推进就说明已经播出来了，清掉缓冲转圈（uni video 的 playing/canplay 在 H5 不一定派发）
@@ -392,12 +415,33 @@ function onTimeUpdate(e: { detail: { currentTime: number; duration: number } }):
     if (e.detail?.duration && isFinite(e.detail.duration)) {
         duration.value = e.detail.duration;
     }
+    syncBuffer();
 }
 function onProgress(e: { detail: { buffered: number } }): void {
     const b = e.detail?.buffered;
     if (typeof b === "number") {
         bufferedRatio.value = Math.min(1, Math.max(bufferedRatio.value, b / 100));
     }
+    syncBuffer();
+}
+/**
+ * H5 校准缓冲条：原生 buffered 常留最后零点几秒不放（要播到才认），
+ * 导致进度条尾部永远露出一截轨道底色、与缓冲条不重合；距结束 1s 内视为满缓冲。
+ */
+function syncBuffer(): void {
+    // #ifdef H5
+    const el = getInnerVideo();
+    if (!el?.buffered?.length || !duration.value) {
+        return;
+    }
+    let end = 0;
+    for (let i = 0; i < el.buffered.length; i++) {
+        end = Math.max(end, Number(el.buffered.end(i)) || 0);
+    }
+    if (end >= duration.value - 1) {
+        bufferedRatio.value = 1;
+    }
+    // #endif
 }
 function onLoadedmetadata(e: { detail: { width: number; height: number } }): void {
     const w = e.detail?.width ?? 0;
@@ -405,6 +449,8 @@ function onLoadedmetadata(e: { detail: { width: number; height: number } }): voi
     if (w && h) {
         landscape.value = w > h;
     }
+    // 元数据就绪即可拿时长，不等播放（H5）
+    syncDuration();
     if (pendingSeek != null) {
         ensureCtx();
         ctx?.seek(pendingSeek);
diff --git a/uniapp/youjiala/src/locale/lang/en-US.json b/uniapp/youjiala/src/locale/lang/en-US.json
index 0099488..1fcf8f4 100644
--- a/uniapp/youjiala/src/locale/lang/en-US.json
+++ b/uniapp/youjiala/src/locale/lang/en-US.json
@@ -84,7 +84,6 @@
     "personSearch": "Member Search",
     "pedigreeChart": "Pedigree Chart",
     "ancestryChart": "Ancestry Chart",
-    "cancel": "Cancel",
     "chartEmpty": "No family tree data",
     "applyManage": "Apply for Manager",
     "requestSentTip": "Request submitted, waiting for approval",
@@ -119,7 +118,13 @@
     "memberTag": "Member",
     "inputTreeIdTip": "Please enter tree ID",
     "noAmendTip": "You have no permission to amend this family tree",
-    "treeNameRequired": "Please enter tree name"
+    "treeNameRequired": "Please enter tree name",
+    "unnamed": "Unnamed Tree",
+    "noBrief": "No brief",
+    "chipPublic": "Public",
+    "chipPrivate": "Private",
+    "searchPlaceholder": "Search tree name",
+    "listTitle": "Family Trees"
   },
   "FamilyPersonPage": {
     "title": "Family Member Query",
@@ -622,6 +627,7 @@
     "noPermissionText": "No accessible admin function",
     "menuLoading": "Loading menu…",
     "menuRetryBut": "Reload",
+    "menuSection": "Features",
     "menuEmptyText": "The server returned no authorized function",
     "loadingTip": "Loading…",
     "savingTip": "Saving…"
diff --git a/uniapp/youjiala/src/locale/lang/zh-CN.json b/uniapp/youjiala/src/locale/lang/zh-CN.json
index c863bcb..3261aec 100644
--- a/uniapp/youjiala/src/locale/lang/zh-CN.json
+++ b/uniapp/youjiala/src/locale/lang/zh-CN.json
@@ -84,7 +84,6 @@
     "personSearch": "族员搜索",
     "pedigreeChart": "谱系图",
     "ancestryChart": "祖谱系图",
-    "cancel": "取消",
     "chartEmpty": "暂无族谱数据",
     "applyManage": "申请管理",
     "requestSentTip": "申请已提交，等待管理员审批",
@@ -119,7 +118,13 @@
     "memberTag": "成员",
     "inputTreeIdTip": "请输入族谱编号",
     "noAmendTip": "您没有该族谱的修改权限",
-    "treeNameRequired": "请输入族谱名称"
+    "treeNameRequired": "请输入族谱名称",
+    "unnamed": "未命名族谱",
+    "noBrief": "暂无简介",
+    "chipPublic": "公开",
+    "chipPrivate": "私密",
+    "searchPlaceholder": "搜索族谱名称",
+    "listTitle": "有家族谱"
   },
   "FamilyPersonPage": {
     "title": "家族成员查询",
@@ -622,6 +627,7 @@
     "noPermissionText": "没有可访问的管理功能",
     "menuLoading": "菜单加载中…",
     "menuRetryBut": "重新加载",
+    "menuSection": "功能菜单",
     "menuEmptyText": "后端没有返回你有权限的功能",
     "loadingTip": "加载中…",
     "savingTip": "保存中…"
diff --git a/uniapp/youjiala/src/manifest.json b/uniapp/youjiala/src/manifest.json
index d814269..a34affa 100644
--- a/uniapp/youjiala/src/manifest.json
+++ b/uniapp/youjiala/src/manifest.json
@@ -55,6 +55,10 @@
       "mode": "history",
       "base": "/"
     },
+    "devServer": {
+      "host": "0.0.0.0",
+      "port": 5173
+    },
     "darkmode": true,
     "themeLocation": "theme.json"
   },
diff --git a/uniapp/youjiala/src/pages.json b/uniapp/youjiala/src/pages.json
index 4b32fc7..026e7fc 100644
--- a/uniapp/youjiala/src/pages.json
+++ b/uniapp/youjiala/src/pages.json
@@ -91,14 +91,8 @@
     {
       "path": "pages/security/help-feature-operation"
     },
-    // 族谱管理（/family-tree-enquiry、/family-tree-operation）：旧 master/FamilyTree 两页迁移，挂安全管理枢纽下
-    {
-      "path": "pages/security/family-tree-enquiry"
-    },
-    {
-      "path": "pages/security/family-tree-operation"
-    },
     // 家族成员（/family-person-enquiry、/family-person-operation）：旧 master/FamilyPerson 两页迁移，含族员选择器
+    // 族谱管理已融合进首页（pages/dashboard/dashboard 两态页），旧 family-tree-* 两页已退役
     {
       "path": "pages/security/family-person-enquiry"
     },
diff --git a/uniapp/youjiala/src/pages/dashboard/dashboard.vue b/uniapp/youjiala/src/pages/dashboard/dashboard.vue
index b7acf5b..773b5fc 100644
--- a/uniapp/youjiala/src/pages/dashboard/dashboard.vue
+++ b/uniapp/youjiala/src/pages/dashboard/dashboard.vue
@@ -1,127 +1,38 @@
 <script setup lang="ts">
 /**
- * 登录后的落地页：后端按用户下发的功能菜单驱动入口网格
- *
- * 数据链路（详见 composables/useAdminMenu.ts）：
- * /SecurityUser/FindMenuByUsername（按用户授权）-> menu-map.ts 白名单 -> canVisitPage 复核。
- * 三层过滤后剩下的才是能点的入口，绝不用 FindMenus 全量表兜底（会列出未授权功能）。
+ * 首页壳页面（H5 `/` 入口 + tab 下标 0）：族谱管理两态页已拆为
+ * components/family-tree-home 组件（easycom 自动注册），本页只做两件事：
+ * 1. 页面级登录守卫（useAuthGuard 依赖 onShow，子组件里不触发，必须留在页面）；
+ * 2. 守卫通过后让组件在列表态重拉数据（详情编辑中不打断，口径由组件 reloadIfList 自定）。
+ * 时序坑：首次进入时 onShow 早于子组件挂载，homeRef 还是 null——直接空调会被
+ * 可选链静默吞掉（表现为空态无数据），故未挂载时排队，等组件 emit ready 再补发。
+ * 后续首页要挂其他内容（功能菜单等），在本页并列追加即可，族谱逻辑不受影响。
  */
-import type { PageName } from "@/router/routes";
-import { useLocale } from "uview-pro";
-import { computed } from "vue";
-import { useAdminMenu, useAuthGuard } from "@/composables";
-import { WebSitePolicy } from "@/policy/custom/webSitePolicy";
-import { pageUrl } from "@/router/routes";
+import { ref } from "vue";
+import { useAuthGuard } from "@/composables";
 
-const { t } = useLocale();
-const menu = useAdminMenu();
+/** 结构类型即可：只用到组件 defineExpose 的 reloadIfList，避免引组件类型造成循环引用 */
+const homeRef = ref<{ reloadIfList: () => void } | null>(null);
+/** 守卫已过但组件尚未挂载：记挂一次首拉，ready 时补发 */
+let pendingReload = false;
 
-/** 可见入口：useAdminMenu 里已做过白名单 + canVisitPage 两道过滤 */
-const items = computed(() => menu.visible.value);
-/** 拉取失败（不是"没权限"就是网络/后端异常）：给出重试入口而不是空一片 */
-const failed = computed(() => !menu.loading.value && Boolean(menu.errorText.value));
-
-function openPage(page: PageName): void {
-  uni.navigateTo({ url: pageUrl(page) });
-}
-
-// 菜单拉取排在登录守卫之后；refresh 自带按账号的模块级缓存，反复 onShow 不会重复打接口
 useAuthGuard(() => {
-  menu.refresh();
+  if (homeRef.value) {
+    homeRef.value.reloadIfList();
+  }
+  else {
+    pendingReload = true;
+  }
 });
+
+function onHomeReady(): void {
+  if (pendingReload) {
+    pendingReload = false;
+    homeRef.value?.reloadIfList();
+  }
+}
 </script>
 
 <template>
-  <app-page :nav-title="WebSitePolicy.Title" :show-nav-back="false" :hide-nav="true" :show-tabbar="true">
-    <view class="dashboard">
-      <view v-if="menu.loading.value" class="dashboard__tip">
-        <text>{{ t("AdminPage.menuLoading") }}</text>
-      </view>
-
-      <view v-else-if="failed" class="dashboard__tip">
-        <text>{{ t("AdminPage.noPermissionText") }}</text>
-        <u-button class="dashboard__retry" shape="circle" size="mini" :text="t('AdminPage.menuRetryBut')"
-          @click="menu.refresh(true)" />
-      </view>
-
-      <scroll-view v-else class="dashboard__scroll" scroll-y :show-scrollbar="false">
-        <view v-if="!items.length" class="dashboard__empty">
-          <u-empty mode="list" :text="t('AdminPage.menuEmptyText')" />
-        </view>
-
-        <view v-else class="grid">
-          <view v-for="item in items" :key="item.function" class="grid-item" @click="openPage(item.page)">
-            <view class="grid-icon">
-              <u-icon :name="item.icon" size="46" color="var(--u-type-primary)" />
-            </view>
-            <text class="grid-title">
-              {{ item.title }}
-            </text>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-  </app-page>
+  <family-tree-home ref="homeRef" @ready="onHomeReady" />
 </template>
-
-<style lang="scss" scoped>
-.dashboard {
-  display: flex;
-  flex-direction: column;
-  min-height: 60vh;
-  padding: 20rpx;
-}
-
-.dashboard__tip {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 80rpx 0;
-  font-size: 26rpx;
-  color: $u-tips-color;
-}
-
-.dashboard__retry {
-  margin-top: 24rpx;
-}
-
-.dashboard__scroll {
-  flex: 1;
-}
-
-.dashboard__empty {
-  padding: 80rpx 0;
-}
-
-.grid {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-
-.grid-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 33.33%;
-  padding: 28rpx 0;
-}
-
-.grid-icon {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 96rpx;
-  height: 96rpx;
-  margin-bottom: 12rpx;
-  background-color: #ffffff;
-  border-radius: 24rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.04);
-}
-
-.grid-title {
-  font-size: 24rpx;
-  color: $u-content-color;
-  text-align: center;
-}
-</style>
diff --git a/uniapp/youjiala/src/pages/security/family-person-enquiry.vue b/uniapp/youjiala/src/pages/security/family-person-enquiry.vue
index 2f18da7..f65c788 100644
--- a/uniapp/youjiala/src/pages/security/family-person-enquiry.vue
+++ b/uniapp/youjiala/src/pages/security/family-person-enquiry.vue
@@ -5,7 +5,7 @@
  * 保留：四条筛选（谱名/常用名/族谱编号 文本包含、性别 单选枚举）、每页 20 条、行点击进详情。
  * 旧页的新增/删除按钮本就被注释禁用，故这里不出新增入口、也不做批量删除，行为对齐。
  *
- * 兼作「族员选择器」：family-tree-operation 的「族员搜索」带 ?channel=person 跳入，
+ * 兼作「族员选择器」：首页 dashboard 详情态的「族员搜索」带 ?channel=person 跳入，
  * 单选回传后调用方按 PersonId 切换当前族员（useAdminPick / useAdminPickTarget 协议）。
  */
 import type { AdminColumn, AdminQuery, AdminRow } from "@/admin/admin-types";
@@ -13,7 +13,7 @@ import { onLoad } from "@dcloudio/uni-app";
 import { useLocale } from "uview-pro";
 import { computed, nextTick, reactive, ref, watch } from "vue";
 import { fillCriteria, makeFilterOption, toSelectOption } from "@/admin/admin-filter";
-import { useAdminList, useAdminPickTarget, useAuthGuard } from "@/composables";
+import { useAdminList, useAdminPickTarget, useAuthGuard, useThemeGradient, useThemeTokens } from "@/composables";
 import { usePolicyOptions } from "@/composables/usePolicyOptions";
 import { FamilyPersonEntity } from "@/data/auto/familyPersonEntity";
 import { FamilyPersonSearchCriteria } from "@/data/auto/familyPersonSearchCriteria";
@@ -26,6 +26,16 @@ const { t, currentLocale } = useLocale();
 const { getPolicyOptions, getPolicyText } = usePolicyOptions();
 const pickTarget = useAdminPickTarget();
 
+// 统一风格接线（与族谱首页/媒体/共享页同套）：主题渐变底 + 强调色 CSS 变量下发
+const { themeBackground } = useThemeGradient();
+const { primary, accentGradient, accentSoft, accentShadow } = useThemeTokens();
+const themeVars = computed(() => ({
+    "--fg-primary": primary.value,
+    "--fg-gradient": accentGradient.value,
+    "--fg-soft": accentSoft.value,
+    "--fg-shadow": accentShadow.value,
+}));
+
 /** 选择器模式：带 channel 进来时点行回传而非跳详情 */
 const isPick = ref(false);
 
@@ -167,7 +177,7 @@ useAuthGuard(() => {
 </script>
 
 <template>
-    <view class="page">
+    <view class="page" :style="[{ background: themeBackground }, themeVars]">
         <admin-list ref="listRef" v-model:keyword="keyword" :nav-title="t('FamilyPersonPage.title')"
             :show-nav-back="!isPick" :columns="columns" :loader="state.query" :row-key="FamilyPersonEntity.PERSON_ID"
             title-key="GenealogyName" :selectable="isPick && pickTarget.multiple.value" :filter-count="filterCount"
@@ -184,9 +194,42 @@ useAuthGuard(() => {
 </template>
 
 <style lang="scss" scoped>
+/* 统一风格：主题渐变底由页面根节点承担，内嵌的 admin-list 透出背景 */
 .page {
     width: 100%;
     height: 100vh;
-    background-color: $u-bg-color;
+}
+
+.page :deep(.admin-list) {
+    background-color: transparent;
+}
+
+/* 工具条与导航融进渐变底，搜索/筛选做成白色圆角件（对齐首页面板观感） */
+.page :deep(.toolbar) {
+    background-color: transparent;
+}
+
+.page :deep(.filter-entry) {
+    background-color: #ffffff;
+    box-shadow: 0 4rpx 12rpx rgba(31, 35, 41, 0.08);
+}
+
+.page :deep(.filter-entry.is-active) {
+    color: var(--fg-primary, #2b8fff);
+    background: var(--fg-soft, #eaf4ff);
+}
+
+/* 卡片选中描边与勾选态跟主题色 */
+.page :deep(.card.is-selected) {
+    box-shadow: inset 0 0 0 2rpx var(--fg-primary, #2b8fff);
+}
+
+.page :deep(.card-check.is-on) {
+    background-color: var(--fg-primary, #2b8fff);
+    border-color: var(--fg-primary, #2b8fff);
+}
+
+.page :deep(.action-toggle) {
+    color: var(--fg-primary, #2b8fff);
 }
 </style>
diff --git a/uniapp/youjiala/src/pages/security/family-tree-enquiry.vue b/uniapp/youjiala/src/pages/security/family-tree-enquiry.vue
deleted file mode 100644
index a30738d..0000000
--- a/uniapp/youjiala/src/pages/security/family-tree-enquiry.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<script setup lang="ts">
-/**
- * 族谱查询（列表页）：旧 WebVue views/master/FamilyTreeEnquiry.vue 的移动端等价物
- *
- * 保留：三条筛选（族谱名称/简介 文本包含、公开? 单选）、每页 20 条、
- * 行点击进详情、多选批量删除（旧页面同样是循环 Delete(TreeId)）。
- * 丢掉：多列网格、列配置、打印。
- *
- * 挂在「安全管理」枢纽下（族谱属 master 域但按产品要求与权限体系同入口），
- * 未登记 PAGE_PERMISSIONS：路由级 fail-open，编辑能力由数据级 IsManager/IsCanAmend 把关。
- */
-import type { AdminColumn, AdminQuery, AdminRow } from "@/admin/admin-types";
-import { onLoad } from "@dcloudio/uni-app";
-import { useLocale } from "uview-pro";
-import { computed, nextTick, reactive, ref, watch } from "vue";
-import { fillCriteria, makeFilterOption } from "@/admin/admin-filter";
-import { useAdminList, useAdminPickTarget, useAuthGuard } from "@/composables";
-import { FamilyTreeSearchCriteria } from "@/data/auto/familyTreeSearchCriteria";
-import { FamilyTreeViewEntity } from "@/data/auto/familyTreeViewEntity";
-import { SearchFilterOperatorPolicy } from "@/data/custom/searchFilterOperatorPolicy";
-import { SearchFilterTypePolicy } from "@/data/custom/searchFilterTypePolicy";
-import { usePagePermission } from "@/permission/permission-context";
-import { pageUrl } from "@/router/routes";
-import familyTreeService from "@/service/master/familyTreeService";
-
-const { t, currentLocale } = useLocale();
-const perm = usePagePermission("familyTreeEnquiry");
-const pickTarget = useAdminPickTarget();
-
-/** 选择器模式：带 channel 进来时点行回传而非跳详情 */
-const isPick = ref(false);
-
-const LABEL_KEYS: Record<string, string> = {
-    [FamilyTreeViewEntity.DB_TREE_NAME]: "FamilyTreePage.treeName",
-    [FamilyTreeViewEntity.DB_BRIEF]: "FamilyTreePage.brief",
-    [FamilyTreeViewEntity.DB_PUBLIC_INDC]: "FamilyTreePage.publicIndc",
-};
-
-function yesNo() {
-    return [
-        { label: t("FamilyTreePage.yes"), value: "Y" },
-        { label: t("FamilyTreePage.no"), value: "N" },
-    ];
-}
-
-const bindOptions = reactive([
-    makeFilterOption(
-        FamilyTreeViewEntity.DB_TREE_NAME,
-        t(LABEL_KEYS[FamilyTreeViewEntity.DB_TREE_NAME]),
-        SearchFilterTypePolicy.TEXT,
-        SearchFilterOperatorPolicy.CONTAIN,
-    ),
-    makeFilterOption(
-        FamilyTreeViewEntity.DB_BRIEF,
-        t(LABEL_KEYS[FamilyTreeViewEntity.DB_BRIEF]),
-        SearchFilterTypePolicy.TEXT,
-        SearchFilterOperatorPolicy.CN_CONTAIN,
-    ),
-    makeFilterOption(
-        FamilyTreeViewEntity.DB_PUBLIC_INDC,
-        t(LABEL_KEYS[FamilyTreeViewEntity.DB_PUBLIC_INDC]),
-        SearchFilterTypePolicy.SINGLE_SELECTION,
-        SearchFilterOperatorPolicy.SINGLE,
-        yesNo(),
-    ),
-]);
-
-async function fetchData(query: AdminQuery) {
-    const criteria = new FamilyTreeSearchCriteria();
-    criteria.GridColumns = [];
-    fillCriteria(criteria, query.filters, query);
-    const data = await familyTreeService.FindBySearchCriteria(criteria);
-    return { rows: data?.Datas ?? [], total: data?.Total ?? 0 };
-}
-
-const state = useAdminList({
-    bindOptions,
-    loader: fetchData,
-    orderby: FamilyTreeViewEntity.DB_TREE_NAME,
-});
-
-const { filterCount, filterVisible, draft, searchToken } = state;
-
-const columns = computed<AdminColumn[]>(() => [
-    {
-        label: t("FamilyTreePage.treeName"),
-        prop: FamilyTreeViewEntity.TREE_NAME,
-    },
-    {
-        label: t("FamilyTreePage.brief"),
-        prop: FamilyTreeViewEntity.BRIEF,
-    },
-    {
-        label: t("FamilyTreePage.publicIndc"),
-        prop: FamilyTreeViewEntity.PUBLIC_INDC,
-        format: (row: AdminRow) => {
-            if (row.PublicIndc === "Y") {
-                return t("FamilyTreePage.yes");
-            }
-            return row.PublicIndc === "N" ? t("FamilyTreePage.no") : "";
-        },
-    },
-    {
-        label: t("FamilyTreePage.ancestorSurname"),
-        prop: FamilyTreeViewEntity.SURNAME,
-    },
-    {
-        label: t("FamilyTreePage.ancestorGenealogyName"),
-        prop: FamilyTreeViewEntity.GENEALOGY_NAME,
-    },
-]);
-
-const keyword = ref("");
-const listRef = ref<any>(null);
-
-function onSearch(): void {
-    const option = bindOptions.find(
-        item => item.BindValue === FamilyTreeViewEntity.DB_TREE_NAME,
-    );
-    if (option) {
-        option.Value = keyword.value;
-    }
-    state.reload();
-}
-
-function onRowTap(row: AdminRow): void {
-    if (isPick.value) {
-        if (pickTarget.multiple.value) {
-            return;
-        }
-        pickTarget.deliverOne(row);
-        return;
-    }
-    uni.navigateTo({
-        url: `${pageUrl("familyTreeOperation")}?id=${row.TreeId}&mode=view`,
-    });
-}
-
-function onCreate(): void {
-    uni.navigateTo({ url: `${pageUrl("familyTreeOperation")}?mode=create` });
-}
-
-function onConfirm(rows: AdminRow[]): void {
-    if (!rows.length) {
-        uni.showToast({ title: t("AdminPage.pickNoneTip"), icon: "none" });
-        return;
-    }
-    pickTarget.deliver(rows);
-}
-
-async function onDelete(rows: AdminRow[]): Promise<void> {
-    if (!rows.length) {
-        uni.showToast({ title: t("AdminPage.pickNoneTip"), icon: "none" });
-        return;
-    }
-    uni.showModal({
-        title: t("AdminPage.confirmDeleteTitle"),
-        success: async (res: any) => {
-            if (!res.confirm) {
-                return;
-            }
-            for (const row of rows) {
-                await familyTreeService.Delete(String(row.TreeId));
-            }
-            listRef.value?.clearSelection();
-            state.reload();
-            uni.showToast({ title: t("AdminPage.deletedTip"), icon: "none" });
-        },
-    });
-}
-
-watch(currentLocale, () => {
-    for (const option of bindOptions) {
-        const key = LABEL_KEYS[option.BindValue];
-        if (key) {
-            option.DisplayName = t(key);
-        }
-    }
-});
-
-onLoad((options) => {
-    pickTarget.readOptions(options);
-    isPick.value = String(options?.channel ?? "").trim().length > 0;
-});
-
-useAuthGuard(() => {
-    // 每次显示都重拉第一页：增/改/删后从详情返回能看到最新数据（navigateBack 不重新挂页面）
-    nextTick(() => listRef.value?.refresh());
-});
-</script>
-
-<template>
-    <view class="page">
-        <admin-list ref="listRef" v-model:keyword="keyword" :nav-title="t('FamilyTreePage.title')"
-            :show-nav-back="!isPick" :columns="columns" :loader="state.query" :row-key="FamilyTreeViewEntity.TREE_ID"
-            title-key="TreeName" :selectable="isPick ? pickTarget.multiple.value : Boolean(perm.canDelete.value)"
-            :filter-count="filterCount" :filter-visible="filterVisible" :filter-items="draft"
-            :search-token="searchToken" :keep-selection-on-reload="isPick" @search="onSearch"
-            @open-filter="state.openFilter()" @close-filter="state.closeFilter()"
-            @apply-filter="state.applyFilter($event)" @clear-filter="state.clearFiltersAndSearch()" @row-tap="onRowTap">
-            <template v-if="!isPick && perm.canCreate.value" #toolbar-actions>
-                <view class="create-entry" @click="onCreate">
-                    <u-icon name="plus" size="40" />
-                </view>
-            </template>
-
-            <template #actions="{ rows }">
-                <u-button v-if="isPick" type="primary" shape="circle" size="mini" :text="t('AdminPage.pickDoneBut')"
-                    @click="onConfirm(rows)" />
-                <u-button v-else-if="perm.canDelete.value" type="error" shape="circle" size="mini"
-                    :text="t('AdminPage.deleteBut')" @click="onDelete(rows)" />
-            </template>
-        </admin-list>
-    </view>
-</template>
-
-<style lang="scss" scoped>
-.page {
-    width: 100%;
-    height: 100vh;
-    background-color: $u-bg-color;
-}
-
-.create-entry {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    width: 64rpx;
-    height: 64rpx;
-    margin-left: 12rpx;
-    color: $u-type-primary;
-    background-color: $u-bg-color;
-    border-radius: 16rpx;
-}
-</style>
diff --git a/uniapp/youjiala/src/pages/security/family-tree-operation.vue b/uniapp/youjiala/src/pages/security/family-tree-operation.vue
deleted file mode 100644
index ef2becf..0000000
--- a/uniapp/youjiala/src/pages/security/family-tree-operation.vue
+++ /dev/null
@@ -1,1071 +0,0 @@
-<script setup lang="ts">
-/**
- * 族谱详情（查看 / 新增 / 修改，全量对齐旧 WebVue views/master/FamilyTreeOperation.vue）
- *
- * - 载入：FindByCurrentPerson({ key: treeId, personId })，首载 personId 传空串（后端回默认族员）；
- *   顶部工具栏可按编号搜索/重置/新增（create 态 resetData 后直接进入编辑）；
- * - 主卡 FamilyTree（admin-form sections）：编号 lock、名称*、简介、封面、公开?、祖先谱名 lock；
- * - 当前族员卡：性别/谱名/常用名 + 族员搜索（跳 family-person-enquiry 单选回传后切换当前族员）、
- *   谱系图（sub 懒加载）、祖谱系图（full 全树）、申请管理；
- * - 关系维护（编辑态）：夫妻表 / 孩子表行内展开编辑 + 上下移动（Orderby 重排）+ 删除，
- *   新增配偶/孩子/祖先走 person-quick-create 弹层（对齐旧 onPersonQuickCreated 回填）；
- * - 权限维护（IsManager 且非编辑态）：待审核 通过/设管理员/拒绝，管理名单 拒绝/移出；
- * - 保存按 FamilyTree.CreatedBy 有无决定 Update / Insert；返回统一 smartBack("mineTab")。
- * 编辑能力不做功能级权限登记：由数据级 IsManager / IsCanAmend 把关（与旧页一致）。
- */
-import type { AdminFormAction, AdminFormField, AdminFormSection } from "@/admin/admin-types";
-import type { LoadedTreeNode } from "@/components/family-tree-chart/types";
-import type { FamilyPersonDisplayData } from "@/data/auto/familyPersonDisplayData";
-import { onLoad } from "@dcloudio/uni-app";
-import { useLocale } from "uview-pro";
-import { computed, ref } from "vue";
-import { useAdminPick, useAuthGuard } from "@/composables";
-import { usePolicyOptions } from "@/composables/usePolicyOptions";
-import { FamilyTreeChildrenMapViewEntity } from "@/data/auto/familyTreeChildrenMapViewEntity";
-import { FamilyTreeData } from "@/data/auto/familyTreeData";
-import { FamilyTreeSpouseMapViewEntity } from "@/data/auto/familyTreeSpouseMapViewEntity";
-import { smartBack } from "@/router/routes";
-import familyTreeService from "@/service/master/familyTreeService";
-
-const { t } = useLocale();
-const { getPolicyOptions, getPolicyText } = usePolicyOptions();
-
-const data = ref<FamilyTreeData>(new FamilyTreeData());
-const tree = computed(() => data.value.FamilyTree);
-const currentPerson = computed(() => data.value.CurrentPerson?.FamilyPerson);
-const spouseMaps = computed(() => data.value.CurrentPerson?.FamilyTreeSpouseMaps ?? []);
-const childMaps = computed(() => data.value.CurrentPerson?.FamilyTreeChildrenMaps ?? []);
-
-const treeId = ref("");
-const treeInput = ref("");
-const loaded = ref(false);
-const isEdit = ref(false);
-const isCreate = ref(false);
-
-/** 谱系图 sub 模式的懒加载缓存（personId -> 子树记录），对齐旧 loadedNodes */
-const loadedNodes = ref<Record<string, LoadedTreeNode>>({});
-const subChartVisible = ref(false);
-const fullChartVisible = ref(false);
-
-/** 快速建员弹层：三种用途共用一个组件实例（对齐旧 quickCreatePurpose） */
-const qcVisible = ref(false);
-const qcPurpose = ref<"spouse" | "child" | "ancestor">("spouse");
-const qcTitle = computed(() => {
-  if (qcPurpose.value === "spouse") {
-    return t("FamilyTreePage.addSpouse");
-  }
-  return qcPurpose.value === "child"
-    ? t("FamilyTreePage.addChild")
-    : t("FamilyTreePage.addAncestor");
-});
-
-/** 关系行的就地展开（编辑表单可见性），key 用配偶/孩子 PersonId */
-const expandedSpouses = ref<Record<string, boolean>>({});
-const expandedChildren = ref<Record<string, boolean>>({});
-
-/** 孩子行的两个枚举编辑器：记住当前操作哪一行（同一时刻只有一个 picker 开着） */
-const relationTarget = ref<FamilyTreeChildrenMapViewEntity | null>(null);
-const relationPickerVisible = ref(false);
-const parentTarget = ref<FamilyTreeChildrenMapViewEntity | null>(null);
-const parentPickerVisible = ref(false);
-
-const relationItems = computed(() => getPolicyOptions("RelationTypePolicy"));
-const spouseOptions = computed(() =>
-  spouseMaps.value
-    .filter(item => item.SpouseId)
-    .map(item => ({
-      key: item.SpouseId,
-      label: `${item.SpouseSurname ?? ""}${item.SpouseGenealogyName ?? ""}`,
-    })),
-);
-
-const pendingPermissions = computed(() =>
-  (data.value.FamilyTreePermissions ?? []).filter(item => item.ValidIndc === "N"),
-);
-const managerPermissions = computed(() =>
-  (data.value.FamilyTreePermissions ?? []).filter(item => item.ValidIndc === "Y"),
-);
-
-const heroTitle = computed(
-  () => String(tree.value.TreeName || treeId.value || ""),
-);
-const heroChips = computed(() => {
-  const chips: string[] = [];
-  if (tree.value.TreeId) {
-    chips.push(`${t("FamilyTreePage.treeId")}: ${tree.value.TreeId}`);
-  }
-  if (tree.value.AncestorPersonGenealogyName) {
-    chips.push(`${t("FamilyTreePage.ancestor")}: ${tree.value.AncestorPersonGenealogyName}`);
-  }
-  return chips;
-});
-
-const sections = computed<AdminFormSection[]>(() => {
-  const fields: AdminFormField[] = [
-    { label: t("FamilyTreePage.treeId"), prop: "TreeId", lock: true },
-    { label: t("FamilyTreePage.treeName"), prop: "TreeName", required: true },
-    { label: t("FamilyTreePage.brief"), prop: "Brief", type: "textarea", maxlength: 1000 },
-    { label: t("FamilyTreePage.treeCover"), prop: "TreeCoverFilename" },
-    {
-      label: t("FamilyTreePage.publicIndc"),
-      prop: "PublicIndc",
-      type: "switch",
-      display: model => (model.PublicIndc === "Y" ? t("FamilyTreePage.yes") : t("FamilyTreePage.no")),
-    },
-    { label: t("FamilyTreePage.ancestor"), prop: "AncestorPersonGenealogyName", lock: true },
-  ];
-  return [{ title: t("FamilyTreePage.infoTitle"), fields }];
-});
-
-const actions = computed<AdminFormAction[]>(() => {
-  const list: AdminFormAction[] = [];
-  list.push({ key: "amend", label: t("AdminPage.amendBut"), when: "view" });
-  // 旧页口径：删除同样只在有修改权限时给出（admin-form 确认弹窗走 confirm）
-  list.push({ key: "delete", label: t("AdminPage.deleteBut"), tone: "error", confirm: true, when: "view" });
-  list.push({ key: "save", label: t("AdminPage.saveBut"), when: "edit" });
-  list.push({ key: "cancel", label: t("AdminPage.cancelBut"), when: "edit" });
-  return list;
-});
-
-function ensureLists(): void {
-  if (!data.value.CurrentPerson) {
-    data.value.CurrentPerson = new FamilyTreeData().CurrentPerson;
-  }
-  if (!data.value.CurrentPerson.FamilyTreeSpouseMaps) {
-    data.value.CurrentPerson.FamilyTreeSpouseMaps = [];
-  }
-  if (!data.value.CurrentPerson.FamilyTreeChildrenMaps) {
-    data.value.CurrentPerson.FamilyTreeChildrenMaps = [];
-  }
-}
-
-function resetData(): void {
-  data.value = new FamilyTreeData();
-  treeId.value = "";
-  treeInput.value = "";
-  loaded.value = false;
-  isCreate.value = false;
-  loadedNodes.value = {};
-  expandedSpouses.value = {};
-  expandedChildren.value = {};
-  ensureLists();
-}
-
-async function load(): Promise<void> {
-  const key = treeId.value.trim();
-  if (!key) {
-    uni.showToast({ title: t("FamilyTreePage.inputTreeIdTip"), icon: "none" });
-    return;
-  }
-  const result = await familyTreeService.FindByCurrentPerson({
-    key,
-    personId: currentPerson.value?.PersonId ?? "",
-  });
-  if (!result || result.FamilyTree == null) {
-    uni.showToast({ title: t("AdminPage.notExistTip"), icon: "none" });
-    loaded.value = false;
-    return;
-  }
-  data.value = result;
-  ensureLists();
-  loaded.value = true;
-  // 无修改权限：强制回到查看模式（旧 onSearch 同款）
-  if (!data.value.IsCanAmend && isEdit.value && !isCreate.value) {
-    isEdit.value = false;
-    uni.showToast({ title: t("FamilyTreePage.noAmendTip"), icon: "none" });
-  }
-}
-
-function onSearch(): void {
-  treeId.value = treeInput.value;
-  loadedNodes.value = {};
-  load();
-}
-
-function onReset(): void {
-  resetData();
-}
-
-function onCreate(): void {
-  resetData();
-  isCreate.value = true;
-  isEdit.value = true;
-}
-
-function onFieldChange(prop: string, value: unknown): void {
-  if (prop === "PublicIndc") {
-    tree.value.PublicIndc = value ? "Y" : "N";
-    return;
-  }
-  (tree.value as Record<string, any>)[prop] = value;
-}
-
-async function onSave(): Promise<void> {
-  if (!String(tree.value.TreeName ?? "").trim()) {
-    uni.showToast({ title: t("FamilyTreePage.treeNameRequired"), icon: "none" });
-    return;
-  }
-  ensureLists();
-  const isUpdate = String(tree.value.CreatedBy ?? "").trim() !== "";
-  const result = await (isUpdate
-    ? familyTreeService.Update(data.value)
-    : familyTreeService.Insert(data.value));
-  if (result?.FamilyTree) {
-    data.value = result;
-    ensureLists();
-    treeId.value = result.FamilyTree.TreeId;
-    treeInput.value = result.FamilyTree.TreeId;
-  }
-  isEdit.value = false;
-  isCreate.value = false;
-  loaded.value = true;
-  uni.showToast({ title: t("AdminPage.savedTip"), icon: "none" });
-}
-
-async function onDelete(): Promise<void> {
-  await familyTreeService.Delete(tree.value.TreeId);
-  uni.showToast({ title: t("AdminPage.deletedTip"), icon: "none" });
-  setTimeout(() => smartBack("mineTab"), 600);
-}
-
-function onAction(action: AdminFormAction): void {
-  switch (action.key) {
-    case "amend":
-      if (!data.value.IsCanAmend) {
-        uni.showToast({ title: t("FamilyTreePage.noAmendTip"), icon: "none" });
-        return;
-      }
-      isEdit.value = true;
-      break;
-    case "save":
-      onSave();
-      break;
-    case "delete":
-      if (!data.value.IsCanAmend) {
-        uni.showToast({ title: t("FamilyTreePage.noAmendTip"), icon: "none" });
-        return;
-      }
-      onDelete();
-      break;
-    case "cancel":
-      if (isCreate.value || !loaded.value) {
-        smartBack("mineTab");
-        return;
-      }
-      isEdit.value = false;
-      load();
-      break;
-    default:
-      break;
-  }
-}
-
-function onBack(): void {
-  smartBack("mineTab");
-}
-
-// ===== 当前族员切换（族员搜索 / 图上点人）=====
-const personPicker = useAdminPick("person");
-
-function pickCurrentPerson(): void {
-  personPicker.open({ page: "familyPersonEnquiry" }, (rows) => {
-    const personId = String(rows[0]?.PersonId ?? "");
-    if (personId) {
-      setCurrentPerson(personId);
-    }
-  });
-}
-
-async function setCurrentPerson(personId: string): Promise<void> {
-  const result = await familyTreeService.FindByCurrentPerson({
-    key: treeId.value.trim(),
-    personId,
-  });
-  if (result?.CurrentPerson?.FamilyPerson?.PersonId) {
-    data.value = result;
-    ensureLists();
-    loaded.value = true;
-  }
-}
-
-// ===== 谱系图（sub 懒加载 / full 全树）=====
-async function onChartSelectChild(personId: string): Promise<void> {
-  if (!personId || !treeId.value || loadedNodes.value[personId]) {
-    return;
-  }
-  try {
-    const result = await familyTreeService.FindByCurrentPerson({
-      key: treeId.value.trim(),
-      personId,
-    });
-    const cp = result?.CurrentPerson;
-    if (cp?.FamilyPerson) {
-      loadedNodes.value = {
-        ...loadedNodes.value,
-        [personId]: {
-          person: cp.FamilyPerson,
-          spouses: cp.FamilyTreeSpouseMaps ?? [],
-          children: cp.FamilyTreeChildrenMaps ?? [],
-        },
-      };
-    }
-  }
-  catch (error) {
-    console.error(error);
-  }
-}
-
-function onChartPickPerson(personId: string): void {
-  setCurrentPerson(personId);
-}
-
-// ===== 夫妻表 =====
-function refreshParentOrderby(): void {
-  spouseMaps.value.forEach((item, idx) => {
-    item.Orderby = idx + 1;
-  });
-}
-
-function pushSpouse(person: FamilyPersonDisplayData): void {
-  ensureLists();
-  const spouse = new FamilyTreeSpouseMapViewEntity();
-  spouse.TreeId = treeId.value;
-  spouse.PersonId = currentPerson.value?.PersonId ?? "";
-  spouse.SpouseId = person.PersonId;
-  spouse.SpouseSurname = person.Surname;
-  spouse.SpouseCommonName = person.CommonName;
-  spouse.SpouseGenealogyName = person.GenealogyName;
-  spouse.Gender = person.Gender;
-  data.value.CurrentPerson.FamilyTreeSpouseMaps.push(spouse);
-  refreshParentOrderby();
-}
-
-function deleteSpouse(spouseId: string): void {
-  data.value.CurrentPerson.FamilyTreeSpouseMaps = spouseMaps.value.filter(
-    item => item.SpouseId !== spouseId,
-  );
-  refreshParentOrderby();
-}
-
-function moveSpouse(index: number, offset: number): void {
-  const list = data.value.CurrentPerson.FamilyTreeSpouseMaps;
-  const target = index + offset;
-  if (target < 0 || target >= list.length) {
-    return;
-  }
-  const item = list.splice(index, 1)[0];
-  list.splice(target, 0, item);
-  refreshParentOrderby();
-}
-
-// ===== 孩子表 =====
-function refreshSonOrderby(): void {
-  childMaps.value.forEach((item, idx) => {
-    item.Orderby = idx + 1;
-  });
-}
-
-function pushChild(person: FamilyPersonDisplayData): void {
-  ensureLists();
-  const child = new FamilyTreeChildrenMapViewEntity();
-  child.TreeId = treeId.value;
-  child.PersonId = currentPerson.value?.PersonId ?? "";
-  child.ChildrenId = person.PersonId;
-  child.ChildrenSurname = person.Surname;
-  child.ChildrenCommonName = person.CommonName;
-  child.ChildrenGenealogyName = person.GenealogyName;
-  child.Gender = person.Gender;
-  data.value.CurrentPerson.FamilyTreeChildrenMaps.push(child);
-  refreshSonOrderby();
-}
-
-function deleteChild(childrenId: string): void {
-  data.value.CurrentPerson.FamilyTreeChildrenMaps = childMaps.value.filter(
-    item => item.ChildrenId !== childrenId,
-  );
-  refreshSonOrderby();
-}
-
-function moveChild(index: number, offset: number): void {
-  const list = data.value.CurrentPerson.FamilyTreeChildrenMaps;
-  const target = index + offset;
-  if (target < 0 || target >= list.length) {
-    return;
-  }
-  const item = list.splice(index, 1)[0];
-  list.splice(target, 0, item);
-  refreshSonOrderby();
-}
-
-// ===== 快速建员回填（对齐旧 onPersonQuickCreated）=====
-function onQuickCreated(person: FamilyPersonDisplayData): void {
-  if (!person || !person.PersonId) {
-    return;
-  }
-  if (qcPurpose.value === "spouse") {
-    pushSpouse(person);
-  }
-  else if (qcPurpose.value === "child") {
-    pushChild(person);
-  }
-  else {
-    tree.value.AncestorPersonId = person.PersonId;
-    tree.value.AncestorPersonGenealogyName = person.GenealogyName;
-  }
-}
-
-function openQuickCreate(purpose: "spouse" | "child" | "ancestor"): void {
-  qcPurpose.value = purpose;
-  qcVisible.value = true;
-}
-
-// 已有成员里选配偶（快速建员之外的入口，对齐计划"选配偶：人员选择器或快速建员"）
-const spousePicker = useAdminPick("spouse");
-
-function pickSpouse(): void {
-  spousePicker.open({ page: "familyPersonEnquiry" }, (rows) => {
-    const row = rows[0];
-    if (!row?.PersonId) {
-      return;
-    }
-    pushSpouse({
-      PersonId: String(row.PersonId),
-      Surname: String(row.Surname ?? ""),
-      GenealogyName: String(row.GenealogyName ?? ""),
-      CommonName: String(row.CommonName ?? ""),
-      Gender: String(row.Gender ?? ""),
-    } as FamilyPersonDisplayData);
-  });
-}
-
-// ===== 孩子行的枚举编辑器 =====
-function openRelationPicker(record: FamilyTreeChildrenMapViewEntity): void {
-  relationTarget.value = record;
-  relationPickerVisible.value = true;
-}
-
-function onRelationConfirm(key: string): void {
-  if (relationTarget.value) {
-    relationTarget.value.RelationType = key;
-  }
-  relationPickerVisible.value = false;
-}
-
-function openParentPicker(record: FamilyTreeChildrenMapViewEntity): void {
-  parentTarget.value = record;
-  parentPickerVisible.value = true;
-}
-
-function onParentConfirm(key: string): void {
-  if (parentTarget.value) {
-    parentTarget.value.SpouseId = key;
-  }
-  parentPickerVisible.value = false;
-}
-
-// ===== 权限维护 =====
-async function requestManager(): Promise<void> {
-  const personId = currentPerson.value?.PersonId ?? "";
-  if (!treeId.value || !personId) {
-    return;
-  }
-  await familyTreeService.RequestFamilyTreePermission({
-    treeId: treeId.value.trim(),
-    currentPersonId: personId,
-  });
-  uni.showToast({ title: t("FamilyTreePage.requestSentTip"), icon: "none" });
-  load();
-}
-
-async function approvePermission(
-  record: { PersonId: string; UserName: string },
-  managerIndc: string,
-): Promise<void> {
-  await familyTreeService.ApproveFamilyTreePermission({
-    treeId: treeId.value,
-    currentPersonId: record.PersonId,
-    userName: record.UserName,
-    managerIndc,
-  });
-  load();
-}
-
-async function rejectPermission(record: { PersonId: string; UserName: string }): Promise<void> {
-  await familyTreeService.RejectFamilyTreePermission({
-    treeId: treeId.value,
-    currentPersonId: record.PersonId,
-    userName: record.UserName,
-  });
-  load();
-}
-
-function genderText(gender?: string): string {
-  return getPolicyText("GenderPolicy", gender ?? "");
-}
-
-/** 孩子行展开态的两个只读文案：母亲（配偶选项）与关系（枚举） */
-function spouseLabel(spouseId?: string): string {
-  if (!spouseId) {
-    return t("AdminPage.notSetTip");
-  }
-  return spouseOptions.value.find(item => item.key === spouseId)?.label ?? spouseId;
-}
-
-function relationLabel(relationType?: string): string {
-  if (!relationType) {
-    return t("AdminPage.notSetTip");
-  }
-  return getPolicyText("RelationTypePolicy", relationType) || relationType;
-}
-
-function datePart(value?: Date | string): string {
-  return String(value ?? "").slice(0, 10);
-}
-
-onLoad((options) => {
-  treeId.value = String(options?.id ?? "");
-  treeInput.value = treeId.value;
-  const mode = String(options?.mode ?? "view");
-  if (mode === "create") {
-    onCreate();
-  }
-  else if (mode === "amend") {
-    isEdit.value = true;
-  }
-});
-
-let booted = false;
-useAuthGuard(() => {
-  if (booted) {
-    return;
-  }
-  booted = true;
-  if (treeId.value) {
-    load();
-  }
-});
-</script>
-
-<template>
-  <admin-form :nav-title="t('FamilyTreePage.detailTitle')" :show-nav-back="true" :hero-title="heroTitle"
-    :hero-chips="heroChips" :sections="sections" :model="tree" :readonly="!isEdit" :actions="actions" @back="onBack"
-    @action="onAction" @field-change="onFieldChange">
-    <template #extra="{ readonly: ro }">
-      <!-- 工具栏：族谱编号搜索 / 查询 / 重置 / 新增（对齐旧页顶部条） -->
-      <view class="group">
-        <view class="group-card toolbar-card">
-          <view class="toolbar-row">
-            <u-input v-model="treeInput" :border="true" :disabled="!ro"
-              :placeholder="t('FamilyTreePage.treeIdPlaceholder')" @confirm="onSearch" />
-          </view>
-          <view class="toolbar-btns">
-            <view class="tool-btn" @tap="onSearch">
-              <u-icon name="search" size="28" color="#059669" />
-              <text class="tool-btn-text">{{ t("FamilyTreePage.searchBut") }}</text>
-            </view>
-            <view class="tool-btn" @tap="onReset">
-              <u-icon name="reload" size="28" color="#059669" />
-              <text class="tool-btn-text">{{ t("FamilyTreePage.resetBut") }}</text>
-            </view>
-            <view class="tool-btn" @tap="onCreate">
-              <u-icon name="plus" size="28" color="#059669" />
-              <text class="tool-btn-text">{{ t("FamilyTreePage.addTreeBut") }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 当前族员卡：性别/谱名/常用名 + 族员搜索 / 谱系图 / 祖谱系图 / 申请管理 -->
-      <view v-if="loaded" class="group">
-        <view class="group-head">
-          <text class="group-title">{{ t("FamilyTreePage.currentPerson") }}</text>
-        </view>
-        <view class="group-card">
-          <view class="info-row">
-            <text class="info-label">{{ t("FamilyTreePage.gender") }}</text>
-            <text class="info-value">{{ genderText(currentPerson?.Gender) || "-" }}</text>
-          </view>
-          <view class="info-row">
-            <text class="info-label">{{ t("FamilyTreePage.genealogyName") }}</text>
-            <text class="info-value">{{ currentPerson?.GenealogyName || "-" }}</text>
-          </view>
-          <view class="info-row">
-            <text class="info-label">{{ t("FamilyTreePage.commonName") }}</text>
-            <text class="info-value">{{ currentPerson?.CommonName || "-" }}</text>
-          </view>
-          <view class="op-btns">
-            <view class="op-btn" @tap="pickCurrentPerson">
-              <u-icon name="search" size="26" color="#2b8fff" />
-              <text class="op-btn-text">{{ t("FamilyTreePage.personSearch") }}</text>
-            </view>
-            <view class="op-btn" @tap="subChartVisible = true">
-              <u-icon name="grid" size="26" color="#2b8fff" />
-              <text class="op-btn-text">{{ t("FamilyTreePage.pedigreeChart") }}</text>
-            </view>
-            <view class="op-btn" @tap="requestManager">
-              <u-icon name="shield" size="26" color="#2b8fff" />
-              <text class="op-btn-text">{{ t("FamilyTreePage.applyManage") }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 祖谱系图（全树）与新增祖先 -->
-      <view v-if="loaded || isCreate" class="group">
-        <view class="group-card">
-          <view v-if="loaded" class="op-line" @tap="fullChartVisible = true">
-            <u-icon name="list" size="26" color="#2b8fff" />
-            <text class="op-btn-text">{{ t("FamilyTreePage.ancestryChart") }}</text>
-          </view>
-          <view v-if="isEdit" class="op-line" @tap="openQuickCreate('ancestor')">
-            <u-icon name="plus-circle" size="26" color="#059669" />
-            <text class="op-btn-text">{{ t("FamilyTreePage.addAncestor") }}</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 夫妻列表（编辑态） -->
-      <view v-if="isEdit" class="group">
-        <view class="group-head">
-          <text class="group-title">{{ t("FamilyTreePage.spouseTitle") }}</text>
-          <view class="head-ops">
-            <view class="head-op" @tap="openQuickCreate('spouse')">
-              <u-icon name="plus" size="24" color="#059669" />
-              <text class="head-op-text">{{ t("FamilyTreePage.addSpouse") }}</text>
-            </view>
-            <view class="head-op" @tap="pickSpouse">
-              <u-icon name="search" size="24" color="#059669" />
-              <text class="head-op-text">{{ t("FamilyTreePage.pickSpouse") }}</text>
-            </view>
-          </view>
-        </view>
-        <view class="group-card">
-          <view v-if="!spouseMaps.length" class="group-empty">
-            <text>{{ t("FamilyTreePage.spouseEmpty") }}</text>
-          </view>
-          <view v-for="(record, index) in spouseMaps" :key="record.SpouseId" class="rel-item">
-            <view class="rel-head" @tap="expandedSpouses[record.SpouseId] = !expandedSpouses[record.SpouseId]">
-              <view class="rel-text">
-                <text class="rel-name">{{ record.SpouseSurname }}{{ record.SpouseGenealogyName }}</text>
-                <text class="rel-sub">{{ genderText(record.Gender) }}</text>
-              </view>
-              <view class="rel-ops">
-                <u-icon name="arrow-up" size="28" :color="index === 0 ? '#e0e0e0' : '#059669'"
-                  @click.stop="moveSpouse(index, -1)" />
-                <u-icon name="arrow-down" size="28" :color="index === spouseMaps.length - 1 ? '#e0e0e0' : '#059669'"
-                  @click.stop="moveSpouse(index, 1)" />
-                <u-icon name="trash" size="32" color="#c4c8cf" @click.stop="deleteSpouse(record.SpouseId)" />
-                <u-icon :name="expandedSpouses[record.SpouseId] ? 'up' : 'down'" size="26" color="#8f959e" />
-              </view>
-            </view>
-            <view v-if="expandedSpouses[record.SpouseId]" class="rel-form">
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.marryDateText") }}</text>
-                <u-input v-model="record.MarryDateText" :border="false" input-align="right" />
-              </view>
-              <picker mode="date" :value="datePart(record.MarryDate)" @change="record.MarryDate = $event.detail.value">
-                <view class="sub-row">
-                  <text class="sub-label">{{ t("FamilyTreePage.marryDate") }}</text>
-                  <view class="sub-picker">
-                    <text class="sub-picker-text">{{ datePart(record.MarryDate) || t("AdminPage.notSetTip") }}</text>
-                    <u-icon name="arrow-right" size="24" color="#c4c8cf" />
-                  </view>
-                </view>
-              </picker>
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.divorceDateText") }}</text>
-                <u-input v-model="record.DivorceDateText" :border="false" input-align="right" />
-              </view>
-              <picker mode="date" :value="datePart(record.DivorceDate)"
-                @change="record.DivorceDate = $event.detail.value">
-                <view class="sub-row">
-                  <text class="sub-label">{{ t("FamilyTreePage.divorceDate") }}</text>
-                  <view class="sub-picker">
-                    <text class="sub-picker-text">{{ datePart(record.DivorceDate) || t("AdminPage.notSetTip") }}</text>
-                    <u-icon name="arrow-right" size="24" color="#c4c8cf" />
-                  </view>
-                </view>
-              </picker>
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.marryType") }}</text>
-                <u-input v-model="record.MarryType" :border="false" input-align="right" />
-              </view>
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.isCurrent") }}</text>
-                <u-switch :model-value="record.IsCurrent === 'Y'" size="40"
-                  @change="record.IsCurrent = $event ? 'Y' : 'N'" />
-              </view>
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
-                <u-input v-model="record.Remark" :border="false" input-align="right" />
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 孩子列表（编辑态） -->
-      <view v-if="isEdit" class="group">
-        <view class="group-head">
-          <text class="group-title">{{ t("FamilyTreePage.childTitle") }}</text>
-          <view class="head-ops">
-            <view class="head-op" @tap="openQuickCreate('child')">
-              <u-icon name="plus" size="24" color="#059669" />
-              <text class="head-op-text">{{ t("FamilyTreePage.addChild") }}</text>
-            </view>
-          </view>
-        </view>
-        <view class="group-card">
-          <view v-if="!childMaps.length" class="group-empty">
-            <text>{{ t("FamilyTreePage.childEmpty") }}</text>
-          </view>
-          <view v-for="(record, index) in childMaps" :key="record.ChildrenId" class="rel-item">
-            <view class="rel-head" @tap="expandedChildren[record.ChildrenId] = !expandedChildren[record.ChildrenId]">
-              <view class="rel-text">
-                <text class="rel-name">{{ record.ChildrenSurname }}{{ record.ChildrenGenealogyName }}</text>
-                <text class="rel-sub">{{ genderText(record.Gender) }}</text>
-              </view>
-              <view class="rel-ops">
-                <u-icon name="arrow-up" size="28" :color="index === 0 ? '#e0e0e0' : '#059669'"
-                  @click.stop="moveChild(index, -1)" />
-                <u-icon name="arrow-down" size="28" :color="index === childMaps.length - 1 ? '#e0e0e0' : '#059669'"
-                  @click.stop="moveChild(index, 1)" />
-                <u-icon name="trash" size="32" color="#c4c8cf" @click.stop="deleteChild(record.ChildrenId)" />
-                <u-icon :name="expandedChildren[record.ChildrenId] ? 'up' : 'down'" size="26" color="#8f959e" />
-              </view>
-            </view>
-            <view v-if="expandedChildren[record.ChildrenId]" class="rel-form">
-              <view class="sub-row" @tap="openParentPicker(record)">
-                <text class="sub-label">{{ t("FamilyTreePage.parent") }}</text>
-                <view class="sub-picker">
-                  <text class="sub-picker-text">{{ spouseLabel(record.SpouseId) }}</text>
-                  <u-icon name="arrow-right" size="24" color="#c4c8cf" />
-                </view>
-              </view>
-              <view class="sub-row" @tap="openRelationPicker(record)">
-                <text class="sub-label">{{ t("FamilyTreePage.relationType") }}</text>
-                <view class="sub-picker">
-                  <text class="sub-picker-text">{{ relationLabel(record.RelationType) }}</text>
-                  <u-icon name="arrow-right" size="24" color="#c4c8cf" />
-                </view>
-              </view>
-              <view class="sub-row">
-                <text class="sub-label">{{ t("FamilyTreePage.remark") }}</text>
-                <u-input v-model="record.Remark" :border="false" input-align="right" />
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 权限维护（仅管理员且非编辑态） -->
-      <view v-if="loaded && data.IsManager && !isEdit" class="group">
-        <view class="group-head">
-          <text class="group-title">{{ t("FamilyTreePage.permTitle") }}</text>
-        </view>
-        <view class="group-card">
-          <text class="perm-section-label">{{ t("FamilyTreePage.permPending") }}</text>
-          <view v-if="!pendingPermissions.length" class="group-empty">
-            <text>{{ t("FamilyTreePage.permEmpty") }}</text>
-          </view>
-          <view v-for="record in pendingPermissions" :key="record.PersonId" class="perm-row">
-            <view class="rel-text">
-              <text class="rel-name">{{ record.UserLocalName || record.UserName }}</text>
-              <text v-if="record.PersonLocalName" class="rel-sub">{{ record.PersonLocalName }}</text>
-            </view>
-            <view class="perm-ops">
-              <view class="perm-op" @tap="approvePermission(record, 'N')">
-                <text class="perm-op-text">{{ t("FamilyTreePage.approve") }}</text>
-              </view>
-              <view class="perm-op" @tap="approvePermission(record, 'Y')">
-                <text class="perm-op-text">{{ t("FamilyTreePage.setManager") }}</text>
-              </view>
-              <view class="perm-op perm-op--danger" @tap="rejectPermission(record)">
-                <text class="perm-op-text perm-op-text--danger">{{ t("FamilyTreePage.reject") }}</text>
-              </view>
-            </view>
-          </view>
-
-          <text class="perm-section-label">{{ t("FamilyTreePage.permManager") }}</text>
-          <view v-if="!managerPermissions.length" class="group-empty">
-            <text>{{ t("FamilyTreePage.permEmpty") }}</text>
-          </view>
-          <view v-for="record in managerPermissions" :key="record.PersonId" class="perm-row">
-            <view class="rel-text">
-              <text class="rel-name">{{ record.UserLocalName || record.UserName }}</text>
-              <text class="rel-sub">{{ record.ManagerIndc === "Y" ? t("FamilyTreePage.managerTag") :
-                t("FamilyTreePage.memberTag") }}</text>
-            </view>
-            <view class="perm-ops">
-              <view class="perm-op perm-op--danger" @tap="rejectPermission(record)">
-                <text class="perm-op-text perm-op-text--danger">{{ t("FamilyTreePage.remove") }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 快速建员 / 谱系图 / 祖谱系图 / 枚举选择器 -->
-      <person-quick-create v-model:visible="qcVisible" :tree-id="treeId" :title="qcTitle" @created="onQuickCreated" />
-      <family-tree-chart v-model:visible="subChartVisible" mode="sub" :root="data" :loaded-nodes="loadedNodes"
-        :title="t('FamilyTreePage.pedigreeChart')" @select-child="onChartSelectChild"
-        @pick-person="onChartPickPerson" />
-      <family-tree-chart v-model:visible="fullChartVisible" mode="full" :tree-id="treeId" :root="data"
-        :title="t('FamilyTreePage.ancestryChart')" />
-      <option-picker :visible="relationPickerVisible" :title="t('FamilyTreePage.relationType')" :items="relationItems"
-        :empty-text="t('FamilyTreePage.relationEmpty')" @close="relationPickerVisible = false"
-        @confirm="onRelationConfirm" />
-      <option-picker :visible="parentPickerVisible" :title="t('FamilyTreePage.parent')" :items="spouseOptions"
-        :empty-text="t('FamilyTreePage.parentEmpty')" @close="parentPickerVisible = false" @confirm="onParentConfirm" />
-    </template>
-  </admin-form>
-</template>
-
-<style lang="scss" scoped>
-.group {
-  margin-bottom: 28rpx;
-}
-
-.group-head {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 12rpx 12rpx;
-}
-
-.group-title {
-  font-size: 24rpx;
-  color: $u-tips-color;
-}
-
-.group-card {
-  padding: 0 28rpx;
-  overflow: hidden;
-  background-color: #ffffff;
-  border-radius: 20rpx;
-}
-
-.group-empty {
-  padding: 32rpx 0;
-  font-size: 24rpx;
-  color: $u-tips-color;
-  text-align: center;
-}
-
-.toolbar-card {
-  padding: 20rpx 28rpx;
-}
-
-.toolbar-row {
-  margin-bottom: 16rpx;
-}
-
-.toolbar-btns {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.tool-btn {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.tool-btn-text {
-  margin-left: 6rpx;
-  font-size: 26rpx;
-  color: $u-content-color;
-}
-
-.info-row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 84rpx;
-  border-bottom: 1rpx solid $u-border-color;
-
-  &:last-of-type {
-    border-bottom: none;
-  }
-}
-
-.info-label {
-  font-size: 26rpx;
-  color: $u-tips-color;
-}
-
-.info-value {
-  font-size: 26rpx;
-  color: $u-main-color;
-}
-
-.op-btns {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-around;
-  padding: 20rpx 0;
-  border-top: 1rpx solid $u-border-color;
-}
-
-.op-btn {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.op-btn-text {
-  margin-left: 6rpx;
-  font-size: 26rpx;
-  color: $u-type-primary;
-}
-
-.op-line {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  min-height: 88rpx;
-}
-
-.head-ops {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 24rpx;
-}
-
-.head-op {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.head-op-text {
-  margin-left: 4rpx;
-  font-size: 24rpx;
-  color: $u-type-primary;
-}
-
-.rel-item {
-  padding: 16rpx 0;
-  border-bottom: 1rpx solid $u-border-color;
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.rel-head {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.rel-text {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-}
-
-.rel-name {
-  font-size: 28rpx;
-  color: $u-main-color;
-}
-
-.rel-sub {
-  margin-top: 4rpx;
-  font-size: 22rpx;
-  color: $u-tips-color;
-}
-
-.rel-ops {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 20rpx;
-}
-
-.rel-form {
-  padding: 8rpx 0 4rpx 24rpx;
-  background-color: $u-bg-color;
-  border-radius: 12rpx;
-}
-
-.sub-row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 80rpx;
-  padding-right: 8rpx;
-}
-
-.sub-label {
-  font-size: 24rpx;
-  color: $u-tips-color;
-}
-
-.sub-picker {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 8rpx;
-}
-
-.sub-picker-text {
-  font-size: 24rpx;
-  color: $u-content-color;
-}
-
-.perm-section-label {
-  display: block;
-  padding: 20rpx 0 4rpx;
-  font-size: 24rpx;
-  color: $u-tips-color;
-}
-
-.perm-row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 92rpx;
-  padding: 12rpx 0;
-  border-bottom: 1rpx solid $u-border-color;
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.perm-ops {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 16rpx;
-}
-
-.perm-op {
-  padding: 8rpx 20rpx;
-  background-color: $u-bg-color;
-  border-radius: 999rpx;
-}
-
-.perm-op--danger {
-  background-color: #fff1f0;
-}
-
-.perm-op-text {
-  font-size: 24rpx;
-  color: $u-type-primary;
-}
-
-.perm-op-text--danger {
-  color: #ff4d4f;
-}
-</style>
diff --git a/uniapp/youjiala/src/pages/tab/media.vue b/uniapp/youjiala/src/pages/tab/media.vue
index 1ed0939..a9c3895 100644
--- a/uniapp/youjiala/src/pages/tab/media.vue
+++ b/uniapp/youjiala/src/pages/tab/media.vue
@@ -257,18 +257,29 @@ async function onDelete(): Promise<void> {
   });
 }
 
-/** 展览：把当前 kind + 专辑编号映射到对应播放器页（mode=view，非 list） */
-function onExhibit(): void {
-  const pageName = kind.value === "photo"
-    ? "photoShow"
-    : kind.value === "audio" ? "audioHall" : "videoHall";
-  const name = album.value?.PublishName || "";
+/** kind -> 展厅页名 */
+function exhibitPageOf(k: PublishKind): "photoShow" | "audioHall" | "videoHall" {
+  return k === "photo" ? "photoShow" : k === "audio" ? "audioHall" : "videoHall";
+}
+
+/** 进对应展厅播放某专辑（mode=view + 专辑编号，非 list） */
+function exhibitAlbum(k: PublishKind, name: string): void {
   uni.navigateTo({
-    url: `${pageUrl(pageName)}?mode=view&key=${encodeURIComponent(name)}`,
+    url: `${pageUrl(exhibitPageOf(k))}?mode=view&key=${encodeURIComponent(name)}`,
     fail: (err: any) => toast(err?.errMsg || t("FilePage.actionFailed")),
   });
 }
 
+/** 展览：把当前 kind + 专辑编号映射到对应播放器页（mode=view，非 list） */
+function onExhibit(): void {
+  exhibitAlbum(kind.value, album.value?.PublishName || "");
+}
+
+/** 列表点卡片图标：不进编辑态，直接进对应展厅播放该专辑（.stop 阻断卡片点击） */
+function onIconExhibit(entity: PublishAlbumEntity): void {
+  exhibitAlbum(kind.value, entity.PublishName || "");
+}
+
 // ===== 明细：上移 / 下移 / 删除 =====
 function onMoveDetail(index: number, dir: -1 | 1): void {
   moveDetail(index, dir);
@@ -346,7 +357,8 @@ function onRemoveGroup(familyName: string): void {
                 <text class="media-page__state-text">{{ t("MediaPage.emptyAlbums") }}</text>
               </view>
               <view v-for="entity in list" :key="entity.PublishName" class="album-card" @tap="onOpenAlbum(entity)">
-                <view class="album-card__avatar">
+                <!-- 图标钮：单击直进展厅播放该专辑，.stop 不触发卡片进详情 -->
+                <view class="album-card__avatar" @tap.stop="onIconExhibit(entity)">
                   <u-icon :name="kindIcon(kind)" size="48" color="#ffffff" />
                 </view>
                 <view class="album-card__main">
diff --git a/uniapp/youjiala/src/pages/tab/mine.vue b/uniapp/youjiala/src/pages/tab/mine.vue
index 650edbc..d1b53c4 100644
--- a/uniapp/youjiala/src/pages/tab/mine.vue
+++ b/uniapp/youjiala/src/pages/tab/mine.vue
@@ -24,12 +24,7 @@ function goSecurity(): void {
   uni.navigateTo({ url: pageUrl("securityPage") });
 }
 
-/** 进入「族谱管理」列表页（/family-tree-enquiry） */
-function goFamilyTree(): void {
-  uni.navigateTo({ url: pageUrl("familyTreeEnquiry") });
-}
-
-/** 进入「家族成员」列表页（/family-person-enquiry） */
+/** 进入「家族成员」列表页（/family-person-enquiry）；族谱管理已升为首页两态页，不再从这里入口 */
 function goFamilyPerson(): void {
   uni.navigateTo({ url: pageUrl("familyPersonEnquiry") });
 }
@@ -54,14 +49,6 @@ function goFamilyPerson(): void {
         <u-icon name="arrow-right" size="32" color="#9aa0a6" />
       </view>
 
-      <!-- 族谱管理：族谱列表与谱系图维护（/family-tree-enquiry） -->
-      <view class="mine-cell" @tap="goFamilyTree">
-        <text class="mine-cell__title">
-          {{ t("MinePage.familyTree") }}
-        </text>
-        <u-icon name="arrow-right" size="32" color="#9aa0a6" />
-      </view>
-
       <!-- 家族成员：族人档案检索（/family-person-enquiry） -->
       <view class="mine-cell" @tap="goFamilyPerson">
         <text class="mine-cell__title">
diff --git a/uniapp/youjiala/src/router/routes.ts b/uniapp/youjiala/src/router/routes.ts
index da5ac8c..811de9a 100644
--- a/uniapp/youjiala/src/router/routes.ts
+++ b/uniapp/youjiala/src/router/routes.ts
@@ -45,9 +45,7 @@ export const PAGE_PATHS = {
   // 帮助特性（短地址 /help-feature-enquiry、/help-feature-operation）：旧 SecurityHelpFeature 两页迁移
   helpFeatureEnquiry: "pages/security/help-feature-enquiry",
   helpFeatureOperation: "pages/security/help-feature-operation",
-  // 族谱管理（短地址 /family-tree-enquiry、/family-tree-operation）：旧 master/FamilyTree 两页迁移，挂安全管理枢纽下
-  familyTreeEnquiry: "pages/security/family-tree-enquiry",
-  familyTreeOperation: "pages/security/family-tree-operation",
+  // 族谱管理已融合进首页 dashboard 两态页，旧 family-tree-enquiry/operation 两页已退役（不在 PAGE_PATHS 登记）
   // 家族成员（短地址 /family-person-enquiry、/family-person-operation）：旧 master/FamilyPerson 两页迁移，含族员选择器
   familyPersonEnquiry: "pages/security/family-person-enquiry",
   familyPersonOperation: "pages/security/family-person-operation",
diff --git a/uniapp/youjiala/vite.config.ts.timestamp-1792135824943-cab450bc2273.mjs b/uniapp/youjiala/vite.config.ts.timestamp-1792135824943-cab450bc2273.mjs
new file mode 100644
index 0000000..432ba10
--- /dev/null
+++ b/uniapp/youjiala/vite.config.ts.timestamp-1792135824943-cab450bc2273.mjs
@@ -0,0 +1,44 @@
+// vite.config.ts
+import { fileURLToPath, URL } from "node:url";
+import Uni from "file:///D:/Docker/uniapp/youjiala/node_modules/@uni-helper/plugin-uni/src/index.js";
+import Components from "file:///D:/Docker/uniapp/youjiala/node_modules/@uni-helper/vite-plugin-uni-components/dist/index.mjs";
+import { uViewProResolver, ZPagingResolver } from "file:///D:/Docker/uniapp/youjiala/node_modules/@uni-helper/vite-plugin-uni-components/dist/resolvers.mjs";
+import UnoCSS from "file:///D:/Docker/uniapp/youjiala/node_modules/unocss/dist/vite.mjs";
+import { UniRoot } from "file:///D:/Docker/uniapp/youjiala/node_modules/uview-pro/plugins/index.mjs";
+import { defineConfig } from "file:///D:/Docker/uniapp/youjiala/node_modules/vite/dist/node/index.js";
+var __vite_injected_original_import_meta_url = "file:///D:/Docker/uniapp/youjiala/vite.config.ts";
+var vite_config_default = defineConfig({
+  resolve: {
+    alias: {
+      "@": fileURLToPath(new URL("./src", __vite_injected_original_import_meta_url))
+    }
+  },
+  plugins: [
+    // https://github.com/anyup/uview-pro
+    UniRoot(),
+    // https://uni-helper.js.org/vite-plugin-uni-components
+    Components({
+      dts: true,
+      resolvers: [ZPagingResolver(), uViewProResolver()]
+    }),
+    // https://uni-helper.js.org/plugin-uni
+    Uni(),
+    UnoCSS()
+  ],
+  css: {
+    preprocessorOptions: {
+      scss: {
+        additionalData: '@import "uview-pro/theme.scss";'
+      }
+    }
+  },
+  optimizeDeps: {
+    // wxmp-rsa: publishes ESM syntax but has no "module" field; explicit include avoids 504 Outdated Optimize Dep on first login page visit
+    include: ["wxmp-rsa"],
+    exclude: process.env.UNI_PLATFORM === "h5" && process.env.NODE_ENV === "development" ? ["uview-pro"] : []
+  }
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJEOlxcXFxEb2NrZXJcXFxcdW5pYXBwXFxcXHlvdWppYWxhXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCJEOlxcXFxEb2NrZXJcXFxcdW5pYXBwXFxcXHlvdWppYWxhXFxcXHZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9EOi9Eb2NrZXIvdW5pYXBwL3lvdWppYWxhL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZmlsZVVSTFRvUGF0aCwgVVJMIH0gZnJvbSAnbm9kZTp1cmwnXHJcblxyXG5pbXBvcnQgVW5pIGZyb20gJ0B1bmktaGVscGVyL3BsdWdpbi11bmknXHJcbmltcG9ydCBDb21wb25lbnRzIGZyb20gJ0B1bmktaGVscGVyL3ZpdGUtcGx1Z2luLXVuaS1jb21wb25lbnRzJ1xyXG5pbXBvcnQgeyB1Vmlld1Byb1Jlc29sdmVyLCBaUGFnaW5nUmVzb2x2ZXIgfSBmcm9tICdAdW5pLWhlbHBlci92aXRlLXBsdWdpbi11bmktY29tcG9uZW50cy9yZXNvbHZlcnMnXHJcbmltcG9ydCBVbm9DU1MgZnJvbSAndW5vY3NzL3ZpdGUnXHJcbmltcG9ydCB7IFVuaVJvb3QgfSBmcm9tICd1dmlldy1wcm8vcGx1Z2lucydcclxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSAndml0ZSdcclxuXHJcbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XHJcbiAgcmVzb2x2ZToge1xyXG4gICAgYWxpYXM6IHtcclxuICAgICAgJ0AnOiBmaWxlVVJMVG9QYXRoKG5ldyBVUkwoJy4vc3JjJywgaW1wb3J0Lm1ldGEudXJsKSksXHJcbiAgICB9LFxyXG4gIH0sXHJcbiAgcGx1Z2luczogW1xyXG4gICAgLy8gaHR0cHM6Ly9naXRodWIuY29tL2FueXVwL3V2aWV3LXByb1xyXG4gICAgVW5pUm9vdCgpLFxyXG4gICAgLy8gaHR0cHM6Ly91bmktaGVscGVyLmpzLm9yZy92aXRlLXBsdWdpbi11bmktY29tcG9uZW50c1xyXG4gICAgQ29tcG9uZW50cyh7XHJcbiAgICAgIGR0czogdHJ1ZSxcclxuICAgICAgcmVzb2x2ZXJzOiBbWlBhZ2luZ1Jlc29sdmVyKCksIHVWaWV3UHJvUmVzb2x2ZXIoKV0sXHJcbiAgICB9KSxcclxuICAgIC8vIGh0dHBzOi8vdW5pLWhlbHBlci5qcy5vcmcvcGx1Z2luLXVuaVxyXG4gICAgVW5pKCksXHJcbiAgICBVbm9DU1MoKSxcclxuICBdLFxyXG4gIGNzczoge1xyXG4gICAgcHJlcHJvY2Vzc29yT3B0aW9uczoge1xyXG4gICAgICBzY3NzOiB7XHJcbiAgICAgICAgYWRkaXRpb25hbERhdGE6ICdAaW1wb3J0IFwidXZpZXctcHJvL3RoZW1lLnNjc3NcIjsnLFxyXG4gICAgICB9LFxyXG4gICAgfSxcclxuICB9LFxyXG4gIG9wdGltaXplRGVwczoge1xyXG4gICAgLy8gd3htcC1yc2E6IHB1Ymxpc2hlcyBFU00gc3ludGF4IGJ1dCBoYXMgbm8gXCJtb2R1bGVcIiBmaWVsZDsgZXhwbGljaXQgaW5jbHVkZSBhdm9pZHMgNTA0IE91dGRhdGVkIE9wdGltaXplIERlcCBvbiBmaXJzdCBsb2dpbiBwYWdlIHZpc2l0XHJcbiAgICBpbmNsdWRlOiBbJ3d4bXAtcnNhJ10sXHJcbiAgICBleGNsdWRlOiBwcm9jZXNzLmVudi5VTklfUExBVEZPUk0gPT09ICdoNScgJiYgcHJvY2Vzcy5lbnYuTk9ERV9FTlYgPT09ICdkZXZlbG9wbWVudCcgPyBbJ3V2aWV3LXBybyddIDogW10sXHJcbiAgfSxcclxufSlcclxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFxUSxTQUFTLGVBQWUsV0FBVztBQUV4UyxPQUFPLFNBQVM7QUFDaEIsT0FBTyxnQkFBZ0I7QUFDdkIsU0FBUyxrQkFBa0IsdUJBQXVCO0FBQ2xELE9BQU8sWUFBWTtBQUNuQixTQUFTLGVBQWU7QUFDeEIsU0FBUyxvQkFBb0I7QUFQb0ksSUFBTSwyQ0FBMkM7QUFTbE4sSUFBTyxzQkFBUSxhQUFhO0FBQUEsRUFDMUIsU0FBUztBQUFBLElBQ1AsT0FBTztBQUFBLE1BQ0wsS0FBSyxjQUFjLElBQUksSUFBSSxTQUFTLHdDQUFlLENBQUM7QUFBQSxJQUN0RDtBQUFBLEVBQ0Y7QUFBQSxFQUNBLFNBQVM7QUFBQTtBQUFBLElBRVAsUUFBUTtBQUFBO0FBQUEsSUFFUixXQUFXO0FBQUEsTUFDVCxLQUFLO0FBQUEsTUFDTCxXQUFXLENBQUMsZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUM7QUFBQSxJQUNuRCxDQUFDO0FBQUE7QUFBQSxJQUVELElBQUk7QUFBQSxJQUNKLE9BQU87QUFBQSxFQUNUO0FBQUEsRUFDQSxLQUFLO0FBQUEsSUFDSCxxQkFBcUI7QUFBQSxNQUNuQixNQUFNO0FBQUEsUUFDSixnQkFBZ0I7QUFBQSxNQUNsQjtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQUEsRUFDQSxjQUFjO0FBQUE7QUFBQSxJQUVaLFNBQVMsQ0FBQyxVQUFVO0FBQUEsSUFDcEIsU0FBUyxRQUFRLElBQUksaUJBQWlCLFFBQVEsUUFBUSxJQUFJLGFBQWEsZ0JBQWdCLENBQUMsV0FBVyxJQUFJLENBQUM7QUFBQSxFQUMxRztBQUNGLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==