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

pages/genealogy/g01-my-genealogies.vue

@@ -340,7 +340,7 @@
 
 <script setup>
 import { computed, nextTick, ref } from "vue";
-import { onBackPress, onLoad, onShow } from "@dcloudio/uni-app";
+import { onBackPress, onLoad } from "@dcloudio/uni-app";
 import AppLoading from "@/components/AppLoading.vue";
 import AppTabbar from "@/components/AppTabbar.vue";
 import AppButton from "@/components/AppButton.vue";
@@ -365,19 +365,12 @@ const selectedGenealogyId = ref(
 const listScrollCommand = ref(0);
 const currentListScrollTop = ref(0);
 
-const readPresentationState = () => {
-  if (typeof location !== "undefined") {
-    const query = new URLSearchParams(location.hash.split("?")[1] || "");
-    return query.get("state") || "default";
-  }
-
-  const pages = getCurrentPages();
-  const currentPage = pages[pages.length - 1];
-  return currentPage?.options?.state || "default";
-};
-
-const syncEmptyStateFromRoute = () => {
-  const presentationState = readPresentationState();
+const syncEmptyStateFromRoute = (query = {}) => {
+  const presentationState = ["empty", "loading", "error"].includes(
+    query?.state,
+  )
+    ? query.state
+    : "default";
   forceEmptyState.value = presentationState === "empty";
   isLoading.value = presentationState === "loading";
   hasError.value = presentationState === "error";
@@ -391,11 +384,7 @@ onLoad((query) => {
   } else if (selectedGenealogyId.value) {
     genealogyContext.setCurrentGenealogyId(selectedGenealogyId.value);
   }
-  syncEmptyStateFromRoute();
-});
-
-onShow(() => {
-  syncEmptyStateFromRoute();
+  syncEmptyStateFromRoute(query);
 });
 
 const unreadCount = computed(

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 = () => {

pages/genealogy/g06-search-genealogies.vue

@@ -222,7 +222,7 @@
 
 <script setup>
 import { computed, ref } from "vue";
-import { onLoad, onUnload, onShow } from "@dcloudio/uni-app";
+import { onLoad, onUnload } from "@dcloudio/uni-app";
 import AppLoading from "@/components/AppLoading.vue";
 import GenealogyPageBackground from "@/components/GenealogyPageBackground.vue";
 import PageHeader from "@/components/PageHeader.vue";
@@ -332,26 +332,13 @@ const resultFixtures = [
 
 const inviteTarget = computed(() => resultFixtures[0]);
 
-const syncModeFromRoute = () => {
-  let requestedMode = "search";
-  let requestedState = "";
-  if (typeof location !== "undefined") {
-    const routeParams = new URLSearchParams(location.hash.split("?")[1] || "");
-    requestedMode = routeParams.get("mode") || "search";
-    requestedState = routeParams.get("state") || "";
-  } else {
-    const pages = getCurrentPages();
-    const routeOptions = pages[pages.length - 1]?.options || {};
-    requestedMode = routeOptions.mode || "search";
-    requestedState = routeOptions.state || "";
-  }
-  mode.value = requestedMode === "invite" ? "invite" : "search";
-  if (mode.value === "search" && requestedState === "loading")
+const syncModeFromRoute = (query = {}) => {
+  mode.value = query?.mode === "invite" ? "invite" : "search";
+  if (mode.value === "search" && query?.state === "loading")
     searchState.value = "loading";
 };
 
-onLoad(syncModeFromRoute);
-onShow(syncModeFromRoute);
+onLoad((query) => syncModeFromRoute(query));
 onUnload(() => {
   if (searchTimer) clearTimeout(searchTimer);
 });

pages/genealogy/g10-application-review.vue

@@ -112,15 +112,23 @@
       <view v-if="confirmation && !confirmation.approved" class="rejection-field">
         <text>拒绝原因</text>
         <textarea
+          id="g10-rejection-reason"
           v-model="rejectionReason"
           auto-height
           maxlength="120"
           placeholder="请说明需要补充或核实的信息"
-          @input="rejectionError = ''"
+          :aria-invalid="!!rejectionError"
+          aria-describedby="g10-rejection-error"
+          :focus="rejectionFocused"
+          @input="clearRejectionError"
         />
-        <text v-if="rejectionError" class="rejection-field__error">{{
-          rejectionError
-        }}</text>
+        <text
+          v-if="rejectionError"
+          id="g10-rejection-error"
+          class="rejection-field__error"
+          role="alert"
+          >{{ rejectionError }}</text
+        >
       </view>
     </AppDialog>
 
@@ -131,7 +139,7 @@
 </template>
 
 <script setup>
-import { computed, ref } from "vue";
+import { computed, nextTick, ref } from "vue";
 import { onLoad, onUnload } from "@dcloudio/uni-app";
 import AppDialog from "@/components/AppDialog.vue";
 import AppButton from "@/components/AppButton.vue";
@@ -165,6 +173,7 @@ const errorMessage = ref("");
 const confirmation = ref(null);
 const rejectionReason = ref("");
 const rejectionError = ref("");
+const rejectionFocused = ref(false);
 const helpVisible = ref(false);
 const feedbackVisible = ref(false);
 const feedbackMessage = ref("");
@@ -225,12 +234,14 @@ onLoad(loadApplications);
 const confirmAudit = (item, approved) => {
   rejectionReason.value = "";
   rejectionError.value = "";
+  rejectionFocused.value = false;
   confirmation.value = { item, approved };
 };
 const closeDialog = () => {
   confirmation.value = null;
   rejectionReason.value = "";
   rejectionError.value = "";
+  rejectionFocused.value = false;
   helpVisible.value = false;
 };
 const showFeedback = (message) => {
@@ -242,11 +253,17 @@ const showFeedback = (message) => {
     feedbackTimer = null;
   }, 1800);
 };
-const applyAudit = () => {
+const clearRejectionError = () => {
+  rejectionError.value = "";
+};
+const applyAudit = async () => {
   const current = confirmation.value;
   if (!current) return;
   if (!current.approved && !rejectionReason.value.trim()) {
     rejectionError.value = "请填写拒绝原因，方便申请人补充资料";
+    rejectionFocused.value = false;
+    await nextTick();
+    rejectionFocused.value = true;
     return;
   }
   current.item.status = current.approved ? "APPROVED" : "REJECTED";

pages/genealogy/g11-genealogy-settings.vue

@@ -223,7 +223,6 @@ const saveSettings = () => {
   @include adaptive.adaptive-genealogy-state-panel;
   z-index: 2;
   width: calc(100% - 32rpx);
-  min-height: min(620px, calc((100vw - 16px) * 1.43));
   margin: 18rpx auto 0;
   padding: 70rpx 8%;
   box-sizing: border-box;

pages/genealogy/g12-generation-poems.vue

@@ -251,7 +251,6 @@ const savePoems = () => {
   @include adaptive.adaptive-genealogy-state-panel;
   z-index: 2;
   width: calc(100% - 32rpx);
-  min-height: min(650px, calc((100vw - 16px) * 1.5));
   margin: 18rpx auto 0;
   padding: 76rpx 8%;
   box-sizing: border-box;