完成全项目响应式审核与换机交接

pages/genealogy/g03-create-genealogy.vue

@@ -235,8 +235,8 @@
 </template>
 
 <script setup>
-import { computed, onMounted, onUnmounted, reactive, ref } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { computed, onUnmounted, reactive, ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import GenealogyPageBackground from "@/components/GenealogyPageBackground.vue";
 import PageHeader from "@/components/PageHeader.vue";
 
@@ -287,48 +287,20 @@ const changeAncestorBirthDate = (event) => {
 
 const isAncestorStep = computed(() => currentStep.value === "ancestor");
 
-const getFlowQuery = () => {
-  if (typeof location !== "undefined") {
-    return new URLSearchParams(location.hash.split("?")[1] || "");
-  }
-
-  const pages = getCurrentPages();
-  const currentPage = pages[pages.length - 1];
-  return currentPage?.options || {};
-};
-
-const syncFlowFromRoute = () => {
-  const query = getFlowQuery();
-  const isAncestorRoute = query.get
-    ? query.get("step") === "ancestor"
-    : query.step === "ancestor";
-  const routeGenealogyId = query.get
-    ? query.get("genealogyId")
-    : query.genealogyId;
+const syncFlowFromRoute = (query = {}) => {
+  const isAncestorRoute = query?.step === "ancestor";
+  const routeGenealogyId = query?.genealogyId || "";
   currentStep.value = isAncestorRoute ? "ancestor" : "create";
   genealogyId.value =
     routeGenealogyId || (isAncestorStep.value ? "local-created-genealogy" : "");
 };
 
-onLoad(() => {
-  syncFlowFromRoute();
-});
-
-onShow(() => {
-  syncFlowFromRoute();
-});
-
-onMounted(() => {
-  if (typeof window !== "undefined") {
-    window.addEventListener("hashchange", syncFlowFromRoute);
-  }
+onLoad((query) => {
+  syncFlowFromRoute(query);
 });
 
 onUnmounted(() => {
   if (submitTimer) clearTimeout(submitTimer);
-  if (typeof window !== "undefined") {
-    window.removeEventListener("hashchange", syncFlowFromRoute);
-  }
 });
 
 const goBack = () => {