From 4e860800a79bf5d9a717bfe60c9165a0eb3dc8f5 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Sun, 20 Sep 2026 21:58:27 +0800
Subject: [PATCH] refactor PageTransition and PullDownRefresh

---
 pnpm-lock.yaml                                |   9 +-
 src/assets/styles/global.less                 |   6 +-
 src/components/AppPullDownRefresh.vue         | 152 ++++++++++++++++++
 src/components/CachedRoutePage.vue            |  17 ++
 src/components/CustomerSelector.vue           |   4 +-
 src/components/PageTransition.vue             |  65 ++++----
 src/components/RoutePage.vue                  |  28 ++++
 src/pages/customer/CustomerInviteRank.vue     |   4 +-
 src/pages/customer/CustomerList.vue           |   4 +-
 src/pages/event/EventList.vue                 |   4 +-
 src/pages/event/EventRecordList.vue           |   4 +-
 src/pages/event/EventRecordRank.vue           |   4 +-
 .../followUpReminder/FollowUpReminderList.vue |   4 +-
 .../fulfillment/OrderFulfillmentCreate.vue    |   1 -
 .../fulfillment/OrderFulfillmentList.vue      |   4 +-
 src/pages/notify/NotifyList.vue               |   4 +-
 src/pages/notify/UserNotifyList.vue           |   4 +-
 src/pages/package/PackageConfigList.vue       |   4 +-
 src/pages/package/PackageOrderConfigList.vue  |   4 +-
 src/pages/permission/PermissionList.vue       |   4 +-
 src/pages/permission/RoleList.vue             |   4 +-
 src/pages/point/PointAccountList.vue          |   4 +-
 src/pages/point/PointLedgerList.vue           |   4 +-
 src/pages/point/PointRedeemSkuList.vue        |   4 +-
 src/pages/point/PointRedemptionList.vue       |   4 +-
 src/pages/point/PointRuleList.vue             |   4 +-
 src/pages/product/ProductCategoryList.vue     |   4 +-
 src/pages/product/ProductList.vue             |  64 +++++++-
 src/pages/product/ProductStockList.vue        |  52 +++++-
 src/pages/product/ProductStockRecordList.vue  |   4 +-
 src/pages/product/ProductStockSkuList.vue     |   4 +-
 .../salesOrder/ConsumptionRecordList.vue      |   4 +-
 src/pages/salesOrder/FundRecordList.vue       |   4 +-
 src/pages/salesOrder/SalesOrderDetail.vue     |   3 +-
 src/pages/salesOrder/SalesOrderList.vue       | 111 ++++++++++++-
 src/pages/store/StoreDiaryList.vue            |   4 +-
 src/pages/store/StoreList.vue                 |   4 +-
 src/pages/tabs/SettingTab.vue                 |   2 +-
 src/pages/tag/TagList.vue                     |   4 +-
 src/pages/user/UserList.vue                   |   4 +-
 40 files changed, 506 insertions(+), 116 deletions(-)
 create mode 100644 src/components/AppPullDownRefresh.vue
 create mode 100644 src/components/CachedRoutePage.vue
 create mode 100644 src/components/RoutePage.vue

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e8bda09..ffe1618 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,11 +4,6 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-patchedDependencies:
-  tdesign-mobile-vue@1.16.0:
-    hash: zwjpdqqohmbknbgri7osfh6nzy
-    path: patches/tdesign-mobile-vue@1.16.0.patch
-
 importers:
 
   .:
@@ -36,7 +31,7 @@ importers:
         version: 3.0.4(typescript@5.8.3)(vue@3.5.40(typescript@5.8.3))
       tdesign-mobile-vue:
         specifier: ^1.16.0
-        version: 1.16.0(patch_hash=zwjpdqqohmbknbgri7osfh6nzy)(vue@3.5.40(typescript@5.8.3))
+        version: 1.16.0(vue@3.5.40(typescript@5.8.3))
       timi-tdesign-mobile:
         specifier: link:E:/WebProject/timi-tdesign-mobile
         version: link:../timi-tdesign-mobile
@@ -3661,7 +3656,7 @@ snapshots:
       '@babel/runtime': 7.29.7
       vue: 3.5.40(typescript@5.8.3)
 
-  tdesign-mobile-vue@1.16.0(patch_hash=zwjpdqqohmbknbgri7osfh6nzy)(vue@3.5.40(typescript@5.8.3)):
+  tdesign-mobile-vue@1.16.0(vue@3.5.40(typescript@5.8.3)):
     dependencies:
       '@babel/runtime': 7.29.7
       '@use-gesture/vanilla': 10.3.1
diff --git a/src/assets/styles/global.less b/src/assets/styles/global.less
index 24f4291..dc721b6 100644
--- a/src/assets/styles/global.less
+++ b/src/assets/styles/global.less
@@ -95,9 +95,9 @@ html.theme-dark body {
 	gap: 1rem;
 }
 
-.t-pull-down-refresh {
-	overflow-x: hidden;
-	overflow-y: auto;
+.app-pull-down-refresh {
+	height: auto;
+	overflow: visible;
 }
 
 .t-dropdown-menu {
diff --git a/src/components/AppPullDownRefresh.vue b/src/components/AppPullDownRefresh.vue
new file mode 100644
index 0000000..620b6f5
--- /dev/null
+++ b/src/components/AppPullDownRefresh.vue
@@ -0,0 +1,152 @@
+<template>
+	<t-pull-down-refresh
+		ref="rootRef"
+		class="app-pull-down-refresh"
+		v-bind="forwardedAttrs"
+		@touchstart.capture="guardTouch"
+		@touchmove.capture="guardTouch"
+		@touchend.capture="guardTouch"
+		@touchcancel.capture="guardTouch"
+	>
+		<slot />
+	</t-pull-down-refresh>
+</template>
+
+<script setup lang="ts">
+import type { ComponentPublicInstance } from "vue";
+
+defineOptions({
+	name: "AppPullDownRefresh",
+	inheritAttrs: false
+});
+
+type EventListener = (...args: unknown[]) => unknown;
+type ScrollTarget = HTMLElement | Window;
+
+const scrollToLowerThreshold = 20;
+const attrs = useAttrs();
+const rootRef = ref<ComponentPublicInstance | null>(null);
+const forwardedAttrs = computed(() => Object.fromEntries(
+	Object.entries(attrs).filter(([key]) => key !== "onScrolltolower")
+));
+let rootElement: HTMLElement | null = null;
+let scrollFrame = 0;
+let isScrollListenerBound = false;
+
+function isScrollable(element: HTMLElement): boolean {
+	const overflowY = window.getComputedStyle(element).overflowY;
+	return /auto|scroll/i.test(overflowY) && element.clientHeight < element.scrollHeight;
+}
+
+function getScrollParents(target: EventTarget | null): HTMLElement[] {
+	let current = target instanceof HTMLElement
+		? target
+		: target instanceof Element ? target.parentElement : null;
+	const parents: HTMLElement[] = [];
+	while (current) {
+		if (isScrollable(current)) {
+			parents.push(current);
+		}
+		current = current.parentElement;
+	}
+	return parents;
+}
+
+function getWindowScrollTop(): number {
+	return window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+}
+
+function isAtTop(target: EventTarget | null): boolean {
+	if (getScrollParents(target).some(parent => 0 < parent.scrollTop)) {
+		return false;
+	}
+	return getWindowScrollTop() < 1;
+}
+
+function guardTouch(event: TouchEvent): void {
+	if (isAtTop(event.target)) {
+		return;
+	}
+	event.stopImmediatePropagation();
+}
+
+function getScrollTarget(event: Event): ScrollTarget {
+	return getScrollParents(event.target)[0] || window;
+}
+
+function isReachBottom(target: ScrollTarget): boolean {
+	if (target === window) {
+		const documentElement = document.documentElement;
+		const scrollHeight = Math.max(documentElement.scrollHeight, document.body.scrollHeight);
+		const clientHeight = window.innerHeight || documentElement.clientHeight;
+		return clientHeight < scrollHeight && scrollHeight - scrollToLowerThreshold < getWindowScrollTop() + clientHeight;
+	}
+
+	if (!(target instanceof HTMLElement)) {
+		return false;
+	}
+	return target.clientHeight < target.scrollHeight
+		&& target.scrollHeight - scrollToLowerThreshold < target.scrollTop + target.clientHeight;
+}
+
+function invokeListener(listener: unknown): void {
+	if (Array.isArray(listener)) {
+		for (const item of listener) {
+			invokeListener(item);
+		}
+		return;
+	}
+	if (typeof listener === "function") {
+		(listener as EventListener)();
+	}
+}
+
+function handleScroll(event: Event): void {
+	const target = getScrollTarget(event);
+	if (scrollFrame || !isReachBottom(target)) {
+		return;
+	}
+
+	scrollFrame = requestAnimationFrame(() => {
+		scrollFrame = 0;
+		if (isReachBottom(target)) {
+			invokeListener(attrs.onScrolltolower);
+		}
+	});
+}
+
+function bindScrollListeners(): void {
+	if (isScrollListenerBound) {
+		return;
+	}
+
+	const element = rootRef.value?.$el;
+	if (!(element instanceof HTMLElement)) {
+		return;
+	}
+
+	rootElement = element;
+	rootElement.addEventListener("scroll", handleScroll, true);
+	window.addEventListener("scroll", handleScroll, { passive: true });
+	isScrollListenerBound = true;
+}
+
+function unbindScrollListeners(): void {
+	if (!isScrollListenerBound) {
+		return;
+	}
+
+	rootElement?.removeEventListener("scroll", handleScroll, true);
+	window.removeEventListener("scroll", handleScroll);
+	isScrollListenerBound = false;
+	if (scrollFrame) {
+		cancelAnimationFrame(scrollFrame);
+		scrollFrame = 0;
+	}
+}
+
+onMounted(bindScrollListeners);
+onActivated(bindScrollListeners);
+onDeactivated(unbindScrollListeners);
+onUnmounted(unbindScrollListeners);
+</script>
diff --git a/src/components/CachedRoutePage.vue b/src/components/CachedRoutePage.vue
new file mode 100644
index 0000000..c06c7d0
--- /dev/null
+++ b/src/components/CachedRoutePage.vue
@@ -0,0 +1,17 @@
+<template>
+	<route-page :background="background" :component="component" />
+</template>
+
+<script setup lang="ts">
+import type { Component } from "vue";
+import RoutePage from "@/components/RoutePage.vue";
+
+defineOptions({
+	name: "CachedRoutePage"
+});
+
+defineProps<{
+	background: string;
+	component: Component;
+}>();
+</script>
diff --git a/src/components/CustomerSelector.vue b/src/components/CustomerSelector.vue
index b91717b..713ed70 100644
--- a/src/components/CustomerSelector.vue
+++ b/src/components/CustomerSelector.vue
@@ -38,7 +38,7 @@
 					@status-change="handleScanStatusChange"
 				/>
 			</div>
-			<t-pull-down-refresh
+			<app-pull-down-refresh
 				class="result-list"
 				v-model="isRefreshing"
 				:refresh-timeout="30000"
@@ -52,7 +52,7 @@
 					:empty-text="loading ? '正在加载客户' : '未找到匹配客户'"
 					@select="toggleCustomer"
 				/>
-			</t-pull-down-refresh>
+			</app-pull-down-refresh>
 		</div>
 	</bottom-popup>
 </template>
diff --git a/src/components/PageTransition.vue b/src/components/PageTransition.vue
index 2bd5072..f366f06 100644
--- a/src/components/PageTransition.vue
+++ b/src/components/PageTransition.vue
@@ -2,9 +2,14 @@
 	<div class="page-transition">
 		<router-view v-slot="{ Component }">
 			<transition :name="transitionName">
-				<div :key="route.path" class="pages">
-					<component :is="Component" />
-				</div>
+				<keep-alive :include="keepAlivePageNames">
+					<component
+						:is="isCachedPage ? CachedRoutePage : RoutePage"
+						:key="route.path"
+						:background="pageBackground"
+						:component="Component"
+					/>
+				</keep-alive>
 			</transition>
 		</router-view>
 	</div>
@@ -12,15 +17,21 @@
 
 <script setup lang="ts">
 import type { RouteLocationNormalized } from "vue-router";
+import CachedRoutePage from "@/components/CachedRoutePage.vue";
+import RoutePage from "@/components/RoutePage.vue";
 import { useGlobalUIStore } from "@/store/globalUI";
 
 defineOptions({
 	name: "PageTransition"
 });
 
-const router = useRouter();
 const route = useRoute();
+const router = useRouter();
 const globalUIStore = useGlobalUIStore();
+// KeepAlive 直接缓存的是单根路由边界，列表页面位于该边界子树中，仍会收到 activated / deactivated 生命周期。
+const keepAlivePageNames = ["CachedRoutePage"];
+const cachedPageRouteNameSet = new Set(["SalesOrderList", "ProductList", "ProductStockList"]);
+const isCachedPage = computed(() => cachedPageRouteNameSet.has(String(route.name)));
 
 const transitionName = ref("push-left");
 const pageBackground = computed(() => globalUIStore.bodyBackground);
@@ -46,7 +57,7 @@ function calcDepth(sourceRoute: RouteLocationNormalized): number {
 	}
 
 	const baseDepth = Number(sourceRoute.meta.baseDepth ?? 0);
-	const pathSegments = fullPath.split("?")[0].split("/").filter((pathSegment) => pathSegment !== "");
+	const pathSegments = fullPath.split("?")[0].split("/").filter(pathSegment => pathSegment !== "");
 	const depth = baseDepth + (pathSegments.length - 1);
 	pathCache.set(fullPath, depth);
 	return depth;
@@ -103,23 +114,15 @@ onUnmounted(() => {
 	width: 100%;
 	height: 100%;
 	position: relative;
-	overflow-x: hidden;
-
-	// 此 wrapper 必须独立，不可将 class=pages 直接加在 <component> 上：
-	// 否则页面 root element 与动画容器同为一个 DOM 节点，
-	// 页面自身的 padding 会使 position:fixed; width:100% 的盒子溢出视口。
-	.pages {
-		height: 100%;
-		background: v-bind(pageBackground);
-		overflow-x: hidden;
-	}
+	overflow-x: clip;
+	z-index: 0;
 
 	// ---------- push-left / push-right 公共激活状态 ----------
 
-	.push-left-enter-active,
-	.push-left-leave-active,
-	.push-right-enter-active,
-	.push-right-leave-active {
+	:deep(.push-left-enter-active),
+	:deep(.push-left-leave-active),
+	:deep(.push-right-enter-active),
+	:deep(.push-right-leave-active) {
 		width: 100%;
 		height: 100%;
 		position: fixed;
@@ -127,51 +130,51 @@ onUnmounted(() => {
 		backface-visibility: hidden;
 	}
 
-	// ---------- 前进：下一页从右滑入，当前页缩退到左侧 ----------
+	// ---------- push-left：下一页从右滑入，当前页缩退到左侧 ----------
 
-	.push-left-enter-from {
+	:deep(.push-left-enter-from) {
 		transform: translate3d(100%, 0, 0);
 		box-shadow: -4px 0 16px rgba(0, 0, 0, @shadow-intensity);
 	}
 
-	.push-left-enter-to {
+	:deep(.push-left-enter-to) {
 		transform: translate3d(0, 0, 0);
 	}
 
-	.push-left-leave-active {
+	:deep(.push-left-leave-active) {
 		transition: all @duration @easing, filter .3s;
 	}
 
-	.push-left-leave-to {
+	:deep(.push-left-leave-to) {
 		filter: brightness(@brightness);
 		transform: translate3d(-@page-offset, 0, 0);
 	}
 
-	// ---------- 返回：当前页从右滑出，上一页从左侧复位 ----------
+	// ---------- push-right：当前页从右滑出，上一页从左侧复位 ----------
 
-	.push-right-enter-active {
+	:deep(.push-right-enter-active) {
 		z-index: 0;
 		transition: transform @duration @easing, opacity .3s;
 	}
 
-	.push-right-enter-from {
+	:deep(.push-right-enter-from) {
 		transform: translate3d(-@page-offset, 0, 0);
 	}
 
-	.push-right-enter-to {
+	:deep(.push-right-enter-to) {
 		transform: translate3d(0, 0, 0);
 	}
 
-	.push-right-leave-active {
+	:deep(.push-right-leave-active) {
 		z-index: 1;
 		transition: transform @duration @easing, box-shadow .3s;
 	}
 
-	.push-right-leave-from {
+	:deep(.push-right-leave-from) {
 		transform: translate3d(0, 0, 0);
 	}
 
-	.push-right-leave-to {
+	:deep(.push-right-leave-to) {
 		transform: translate3d(105%, 0, 0);
 		box-shadow: 4px 0 16px rgba(0, 0, 0, @shadow-intensity);
 	}
diff --git a/src/components/RoutePage.vue b/src/components/RoutePage.vue
new file mode 100644
index 0000000..43aec64
--- /dev/null
+++ b/src/components/RoutePage.vue
@@ -0,0 +1,28 @@
+<template>
+	<div class="page">
+		<component :is="component" />
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Component } from "vue";
+
+defineOptions({
+	name: "RoutePage"
+});
+
+defineProps<{
+	component: Component;
+	background: string;
+}>();
+</script>
+
+<style scoped lang="less">
+.page {
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+	overflow-x: clip;
+	background: v-bind(background);
+}
+</style>
diff --git a/src/pages/customer/CustomerInviteRank.vue b/src/pages/customer/CustomerInviteRank.vue
index 2ca0b8c..bbbd002 100644
--- a/src/pages/customer/CustomerInviteRank.vue
+++ b/src/pages/customer/CustomerInviteRank.vue
@@ -3,7 +3,7 @@
 		v-can="permissionCodes.customer.read"
 		class="customer-invite-rank"
 	>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -46,7 +46,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyText" />
 			<div v-if="rankedCustomerList.length" class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/customer/CustomerList.vue b/src/pages/customer/CustomerList.vue
index b00c8a1..6b9758f 100644
--- a/src/pages/customer/CustomerList.vue
+++ b/src/pages/customer/CustomerList.vue
@@ -54,7 +54,7 @@
 			/>
 			<t-button size="extra-small" variant="text" @click="clearTagFilter">清空</t-button>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="fix-last-cell-line"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -113,7 +113,7 @@
 				<div v-if="!pageResult.list.length" class="center-tips" v-text="isLoading ? '正在加载客户' : '暂无客户数据'" />
 				<div v-if="pageResult.list.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 		<tag-selector
 			v-model="selectedTagIdList"
 			v-model:visible="tagSelectorVisible"
diff --git a/src/pages/event/EventList.vue b/src/pages/event/EventList.vue
index a9bd10f..058994c 100644
--- a/src/pages/event/EventList.vue
+++ b/src/pages/event/EventList.vue
@@ -3,7 +3,7 @@
 		v-can="{ value: [permissionCodes.event.read, permissionCodes.user.read], mode: 'and' }"
 		class="registration-event-list"
 	>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -71,7 +71,7 @@
 				</t-cell-group>
 			<div v-if="!visibleEventList.length" class="empty-block" v-text="emptyText" />
 			<div v-if="visibleEventList.length" class="center-tips" v-text="isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu v-if="canShowActionMenu" :actions="actionList" />
 	<event-remove-dialog
diff --git a/src/pages/event/EventRecordList.vue b/src/pages/event/EventRecordList.vue
index dba82b6..272143e 100644
--- a/src/pages/event/EventRecordList.vue
+++ b/src/pages/event/EventRecordList.vue
@@ -51,7 +51,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="reloadRecords"
@@ -101,7 +101,7 @@
 				<div v-else class="center-tips" v-text="isLoading ? '正在加载登记事件记录' : '暂无登记事件记录'" />
 				<div v-if="pageResult.list.length" class="center-tips" v-text="loadStateText" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu v-if="canShowActionMenu" :actions="actionList" />
 	<customer-selector
diff --git a/src/pages/event/EventRecordRank.vue b/src/pages/event/EventRecordRank.vue
index 9cc9afd..6785f51 100644
--- a/src/pages/event/EventRecordRank.vue
+++ b/src/pages/event/EventRecordRank.vue
@@ -35,7 +35,7 @@
 				@click="endVisible = true"
 			/>
 		</t-cell-group>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -100,7 +100,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyStateText" />
 			<div v-if="pageResult.list.length" class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<t-popup v-model="startVisible" placement="bottom">
 		<t-date-time-picker
diff --git a/src/pages/followUpReminder/FollowUpReminderList.vue b/src/pages/followUpReminder/FollowUpReminderList.vue
index df116bb..85caf6f 100644
--- a/src/pages/followUpReminder/FollowUpReminderList.vue
+++ b/src/pages/followUpReminder/FollowUpReminderList.vue
@@ -40,7 +40,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrap"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -149,7 +149,7 @@
 				</t-swipe-cell>
 			</t-cell-group>
 			<div class="center-tips" v-text="isLoading ? '正在加载提醒' : pageResult.list.length ? (isNoMore ? '已经到底了' : '上拉加载更多') : '暂无跟进提醒'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 		<customer-selector
 			v-model="selectedCustomerId"
 			v-model:visible="customerSelectorVisible"
diff --git a/src/pages/fulfillment/OrderFulfillmentCreate.vue b/src/pages/fulfillment/OrderFulfillmentCreate.vue
index 289cd0c..c3b3f50 100644
--- a/src/pages/fulfillment/OrderFulfillmentCreate.vue
+++ b/src/pages/fulfillment/OrderFulfillmentCreate.vue
@@ -46,7 +46,6 @@
 									:product-name="item.productNameSnapshot"
 									:snapshot="item.skuSpecSnapshot"
 									:fallback="item.specSummarySnapshot || item.skuNameSnapshot"
-									:unit="item.unitSnapshot"
 								/>
 							</div>
 							<t-input
diff --git a/src/pages/fulfillment/OrderFulfillmentList.vue b/src/pages/fulfillment/OrderFulfillmentList.vue
index 8c5404c..521d147 100644
--- a/src/pages/fulfillment/OrderFulfillmentList.vue
+++ b/src/pages/fulfillment/OrderFulfillmentList.vue
@@ -46,7 +46,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="refreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -93,7 +93,7 @@
 				<div v-else class="center-tips" v-text="loading ? '正在加载履约单' : '暂无履约单'" />
 				<div class="center-tips" v-text="loading ? '正在加载' : noMore ? '已经到底了' : '上拉加载更多'" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu v-if="canCreate" :actions="actions" />
 	<customer-selector
diff --git a/src/pages/notify/NotifyList.vue b/src/pages/notify/NotifyList.vue
index f0315d7..ee12584 100644
--- a/src/pages/notify/NotifyList.vue
+++ b/src/pages/notify/NotifyList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-can="corePermissionCodes.notify.read" class="notify-management">
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -54,7 +54,7 @@
 			</t-cell-group>
 			<t-empty v-else-if="!isLoading" description="暂无已发送通知" />
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/notify/UserNotifyList.vue b/src/pages/notify/UserNotifyList.vue
index 19fa76e..0edd200 100644
--- a/src/pages/notify/UserNotifyList.vue
+++ b/src/pages/notify/UserNotifyList.vue
@@ -8,7 +8,7 @@
 			@change="switchFilter"
 			v-entrance-transition
 		/>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -61,7 +61,7 @@
 				description="暂无站内通知"
 			/>
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/package/PackageConfigList.vue b/src/pages/package/PackageConfigList.vue
index 0a11b7a..4e4d736 100644
--- a/src/pages/package/PackageConfigList.vue
+++ b/src/pages/package/PackageConfigList.vue
@@ -17,7 +17,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="reload"
@@ -73,7 +73,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="loading ? '正在加载套餐配置' : '暂无套餐配置'" />
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu v-if="canCreate" :actions="actionList" />
 </template>
diff --git a/src/pages/package/PackageOrderConfigList.vue b/src/pages/package/PackageOrderConfigList.vue
index 1e42f38..79f470e 100644
--- a/src/pages/package/PackageOrderConfigList.vue
+++ b/src/pages/package/PackageOrderConfigList.vue
@@ -17,7 +17,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="refreshing"
 			:refresh-timeout="30000"
 			@refresh="reload"
@@ -64,7 +64,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="loading ? '正在加载套餐' : '暂无套餐'" />
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/permission/PermissionList.vue b/src/pages/permission/PermissionList.vue
index 3e1cf19..4499d35 100644
--- a/src/pages/permission/PermissionList.vue
+++ b/src/pages/permission/PermissionList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-can="{ value: [corePermissionCodes.role.read, corePermissionCodes.permission.read], mode: 'and' }" class="permission-list">
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -27,7 +27,7 @@
 				</t-cell-group>
 				<t-empty v-if="!permissionStore.loading && !isSourceLoading" description="暂无权限" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/permission/RoleList.vue b/src/pages/permission/RoleList.vue
index 463f351..0e7146e 100644
--- a/src/pages/permission/RoleList.vue
+++ b/src/pages/permission/RoleList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-can="{ value: [corePermissionCodes.role.read, corePermissionCodes.permission.read], mode: 'and' }" class="role-list">
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -30,7 +30,7 @@
 					</t-swipe-cell>
 			</t-cell-group>
 			<t-empty v-else-if="!permissionStore.loading" description="暂无角色" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/point/PointAccountList.vue b/src/pages/point/PointAccountList.vue
index ef06909..e4a6e9a 100644
--- a/src/pages/point/PointAccountList.vue
+++ b/src/pages/point/PointAccountList.vue
@@ -18,7 +18,7 @@
 				</template>
 			</t-input>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="reload"
@@ -47,7 +47,7 @@
 				</t-cell-group>
 				<div class="center-tips" v-text="loadStateText" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 		<customer-selector
 			v-model="selectedCustomerId"
 			v-model:visible="customerSelectorVisible"
diff --git a/src/pages/point/PointLedgerList.vue b/src/pages/point/PointLedgerList.vue
index ba51abe..92dcb47 100644
--- a/src/pages/point/PointLedgerList.vue
+++ b/src/pages/point/PointLedgerList.vue
@@ -36,7 +36,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="reload"
@@ -107,7 +107,7 @@
 				</t-cell-group>
 				<div class="center-tips" v-text="loadStateText" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<customer-selector
 		v-model="selectedCustomerId"
diff --git a/src/pages/point/PointRedeemSkuList.vue b/src/pages/point/PointRedeemSkuList.vue
index f93a993..621688e 100644
--- a/src/pages/point/PointRedeemSkuList.vue
+++ b/src/pages/point/PointRedeemSkuList.vue
@@ -10,7 +10,7 @@
 				placeholder="搜索产品名称、编码或 SKU"
 			/>
 		</div>
-		<t-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="reload" @scrolltolower="load">
+		<app-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="reload" @scrolltolower="load">
 			<t-cell-group v-if="result.list.length" theme="card">
 				<t-cell
 					v-for="(item, index) in result.list"
@@ -56,7 +56,7 @@
 			</t-cell-group>
 			<t-empty v-else :description="isLoading ? '正在加载兑换配置' : '暂无兑换配置'" />
 			<div class="tips" v-text="isNoMore ? `共 ${result.total} 条配置` : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu
 		v-can="permissionCodes.pointRedeemSku.manage"
diff --git a/src/pages/point/PointRedemptionList.vue b/src/pages/point/PointRedemptionList.vue
index 17503b6..95dba52 100644
--- a/src/pages/point/PointRedemptionList.vue
+++ b/src/pages/point/PointRedemptionList.vue
@@ -40,7 +40,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="refreshing"
 			:refresh-timeout="30000"
 			@refresh="reload"
@@ -112,7 +112,7 @@
 					:description="loading ? '正在加载兑换记录' : hasFilter ? '未找到匹配的兑换记录' : '暂无兑换记录'"
 				/>
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<customer-selector
 		v-model="customerId"
diff --git a/src/pages/point/PointRuleList.vue b/src/pages/point/PointRuleList.vue
index 70c7104..5b4666f 100644
--- a/src/pages/point/PointRuleList.vue
+++ b/src/pages/point/PointRuleList.vue
@@ -10,7 +10,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -56,7 +56,7 @@
 				</t-cell>
 			</t-cell-group>
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu v-if="canShowActionMenu" :actions="actionList" />
 </template>
diff --git a/src/pages/product/ProductCategoryList.vue b/src/pages/product/ProductCategoryList.vue
index bf31f0f..1ac207e 100644
--- a/src/pages/product/ProductCategoryList.vue
+++ b/src/pages/product/ProductCategoryList.vue
@@ -17,7 +17,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="refresh" @scrolltolower="loadMore">
+		<app-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="refresh" @scrolltolower="loadMore">
 			<t-cell-group v-if="categoryList.length" theme="card" class="list fix-last-cell-line">
 				<t-swipe-cell v-for="(item, index) in categoryList" :key="item.id" class="item" v-entrance-transition="index * 30">
 					<t-cell arrow hover @click="openEditDialog(item)">
@@ -37,7 +37,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyText" />
 			<div v-if="categoryList.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<t-dialog
 		v-model:visible="editDialogVisible"
diff --git a/src/pages/product/ProductList.vue b/src/pages/product/ProductList.vue
index 7a2aca8..ac619d6 100644
--- a/src/pages/product/ProductList.vue
+++ b/src/pages/product/ProductList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-can="permissionCodes.product.read" class="product-list">
+	<div ref="productListRef" v-can="permissionCodes.product.read" class="product-list">
 		<div class="filters bg-white">
 			<t-input
 				v-model="keyword"
@@ -34,7 +34,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="refresh" @scrolltolower="loadMore">
+		<app-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="refresh" @scrolltolower="loadMore">
 			<t-cell-group
 				v-if="productList.length"
 				class="list fix-last-cell-line empty-cell-title-margin"
@@ -84,14 +84,15 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyText" />
 			<div v-if="productList.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
-	<nav-bar-action-menu v-if="canCreate" :actions="actionList" />
+	<nav-bar-action-menu v-if="route.name === 'ProductList' && canCreate" :actions="actionList" />
 </template>
 
 <script setup lang="ts">
 import { type DropdownValue } from "tdesign-mobile-vue";
 import { useUserStore } from "timi-web-api";
+import { onBeforeRouteLeave } from "vue-router";
 import ProductAPI from "@/api/ProductAPI";
 import NavBarActionMenu from "@/components/NavBarActionMenu.vue";
 import { useNavBarStore } from "@/store/navBarStore";
@@ -105,6 +106,8 @@ import { permissionCodes } from "@/utils/permission";
 defineOptions({ name: "ProductList" });
 
 const router = useRouter();
+const route = useRoute();
+const productListRef = ref<HTMLElement | null>(null);
 const navBarStore = useNavBarStore();
 const userStore = useUserStore();
 const canCreate = computed(() => userStore.hasPermissions(permissionCodes.product.create));
@@ -129,6 +132,42 @@ const isRefreshing = ref(false);
 const isNoMore = ref(false);
 let keywordTimer: number | undefined;
 let requestToken = 0;
+let savedPageScrollTop: number | undefined;
+
+function getProductListPage(): HTMLElement | null {
+	return productListRef.value?.closest<HTMLElement>(".page") || null;
+}
+
+function savePageScrollPosition(): void {
+	const page = getProductListPage();
+	if (!page) {
+		return;
+	}
+
+	savedPageScrollTop = page.scrollTop;
+}
+
+function restorePageScrollPosition(): void {
+	if (savedPageScrollTop === undefined) {
+		return;
+	}
+
+	const scrollTop = savedPageScrollTop;
+	requestAnimationFrame(() => {
+		const page = getProductListPage();
+		if (!page) {
+			return;
+		}
+
+		page.scrollTop = scrollTop;
+		savedPageScrollTop = undefined;
+	});
+}
+
+function syncNavBar(): void {
+	navBarStore.clearRight();
+	navBarStore.setCustomRightVisible(route.name === "ProductList" && canCreate.value);
+}
 
 const statusOptions = [
 	{ label: "全部状态", value: "ALL" },
@@ -265,8 +304,7 @@ async function toDetail(item: Product): Promise<void> {
 }
 
 onMounted(async () => {
-	navBarStore.clearRight();
-	navBarStore.setCustomRightVisible(canCreate.value);
+	syncNavBar();
 	try {
 		await Promise.all([loadCategories(), fetch(true)]);
 	} catch (error) {
@@ -274,6 +312,15 @@ onMounted(async () => {
 	}
 });
 
+onActivated(() => {
+	restorePageScrollPosition();
+	syncNavBar();
+});
+
+onDeactivated(() => {
+	savePageScrollPosition();
+});
+
 watch(keyword, () => {
 	window.clearTimeout(keywordTimer);
 	keywordTimer = window.setTimeout(async () => {
@@ -285,6 +332,11 @@ watch(keyword, () => {
 	}, 300);
 });
 
+onBeforeRouteLeave(() => {
+	savePageScrollPosition();
+	navBarStore.clearRight();
+});
+
 onUnmounted(() => {
 	navBarStore.clearRight();
 	window.clearTimeout(keywordTimer);
diff --git a/src/pages/product/ProductStockList.vue b/src/pages/product/ProductStockList.vue
index d2fe77a..2a3148b 100644
--- a/src/pages/product/ProductStockList.vue
+++ b/src/pages/product/ProductStockList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-can="permissionCodes.productStock.read" class="product-stock-list">
+	<div ref="productStockListRef" v-can="permissionCodes.productStock.read" class="product-stock-list">
 		<div class="search bg-white">
 			<t-input
 				v-model="keyword"
@@ -11,7 +11,7 @@
 			/>
 		</div>
 
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrap empty-cell-title-margin"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -64,12 +64,13 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyText" />
 			<div v-if="productList.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { useUserStore } from "timi-web-api";
+import { onBeforeRouteLeave } from "vue-router";
 import ProductAPI from "@/api/ProductAPI";
 import { useNavBarStore } from "@/store/navBarStore";
 import type { ProductStockProduct } from "@/types/Product";
@@ -82,6 +83,7 @@ defineOptions({ name: "ProductStockList" });
 
 const router = useRouter();
 const route = useRoute();
+const productStockListRef = ref<HTMLElement | null>(null);
 const navBarStore = useNavBarStore();
 const userStore = useUserStore();
 const keyword = ref("");
@@ -93,6 +95,37 @@ const isRefreshing = ref(false);
 const isNoMore = ref(false);
 let keywordTimer: number | undefined;
 let requestToken = 0;
+let savedPageScrollTop: number | undefined;
+
+function getProductStockListPage(): HTMLElement | null {
+	return productStockListRef.value?.closest<HTMLElement>(".page") || null;
+}
+
+function savePageScrollPosition(): void {
+	const page = getProductStockListPage();
+	if (!page) {
+		return;
+	}
+
+	savedPageScrollTop = page.scrollTop;
+}
+
+function restorePageScrollPosition(): void {
+	if (savedPageScrollTop === undefined) {
+		return;
+	}
+
+	const scrollTop = savedPageScrollTop;
+	requestAnimationFrame(() => {
+		const page = getProductStockListPage();
+		if (!page) {
+			return;
+		}
+
+		page.scrollTop = scrollTop;
+		savedPageScrollTop = undefined;
+	});
+}
 
 const emptyText = computed(() => isLoading.value ? "正在加载产品" : keyword.value ? "未找到匹配产品" : "暂无启用库存管理的产品");
 
@@ -175,6 +208,14 @@ onMounted(async () => {
 	}
 });
 
+onActivated(() => {
+	restorePageScrollPosition();
+});
+
+onDeactivated(() => {
+	savePageScrollPosition();
+});
+
 watch(keyword, () => {
 	window.clearTimeout(keywordTimer);
 	keywordTimer = window.setTimeout(async () => {
@@ -186,6 +227,11 @@ watch(keyword, () => {
 	}, 300);
 });
 
+onBeforeRouteLeave(() => {
+	savePageScrollPosition();
+	navBarStore.clearRight();
+});
+
 onUnmounted(() => {
 	navBarStore.clearRight();
 	window.clearTimeout(keywordTimer);
diff --git a/src/pages/product/ProductStockRecordList.vue b/src/pages/product/ProductStockRecordList.vue
index 505d6c7..e1af225 100644
--- a/src/pages/product/ProductStockRecordList.vue
+++ b/src/pages/product/ProductStockRecordList.vue
@@ -14,7 +14,7 @@
 				<t-dropdown-item v-model="direction" label="出入库" :options="directionOptions" @change="selectDirection" />
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -84,7 +84,7 @@
 			</t-cell-group>
 			<div v-else class="center-tips" v-text="emptyText" />
 			<div v-if="recordList.length" class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/product/ProductStockSkuList.vue b/src/pages/product/ProductStockSkuList.vue
index d07d762..195108b 100644
--- a/src/pages/product/ProductStockSkuList.vue
+++ b/src/pages/product/ProductStockSkuList.vue
@@ -10,7 +10,7 @@
 				placeholder="搜索 SKU 名称、编码或规格"
 			/>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrap empty-cell-title-margin"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -68,7 +68,7 @@
 				<div v-else class="center-tips" v-text="emptyText" />
 				<div v-if="skuStockList.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 </template>
 
diff --git a/src/pages/salesOrder/ConsumptionRecordList.vue b/src/pages/salesOrder/ConsumptionRecordList.vue
index 9bbe71b..99192c8 100644
--- a/src/pages/salesOrder/ConsumptionRecordList.vue
+++ b/src/pages/salesOrder/ConsumptionRecordList.vue
@@ -53,7 +53,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="reloadRecords"
@@ -137,7 +137,7 @@
 				<div v-else class="center-tips" v-text="isLoading ? '正在加载消费记录' : '暂无消费记录'" />
 				<div v-if="recordList.length" class="center-tips" v-text="loadStateText" />
 			</div>
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 		<customer-selector
 			v-model="customerId"
 			v-model:visible="customerSelectorVisible"
diff --git a/src/pages/salesOrder/FundRecordList.vue b/src/pages/salesOrder/FundRecordList.vue
index dd895a8..3feb4f4 100644
--- a/src/pages/salesOrder/FundRecordList.vue
+++ b/src/pages/salesOrder/FundRecordList.vue
@@ -47,7 +47,7 @@
 				/>
 			</t-dropdown-menu>
 		</div>
-		<t-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="reload" @scrolltolower="loadMore">
+		<app-pull-down-refresh v-model="isRefreshing" :refresh-timeout="30000" @refresh="reload" @scrolltolower="loadMore">
 			<t-cell-group v-if="recordList.length" class="empty-cell-title-margin" theme="card">
 				<t-cell
 					class="item"
@@ -117,7 +117,7 @@
 			</t-cell-group>
 			<div v-else class="empty" v-text="loading ? '正在加载资金流水' : '暂无资金流水'" />
 			<div class="center-tips" v-text="loadStateText" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<customer-selector
 		v-model="customerId"
diff --git a/src/pages/salesOrder/SalesOrderDetail.vue b/src/pages/salesOrder/SalesOrderDetail.vue
index a1382b6..d34881d 100644
--- a/src/pages/salesOrder/SalesOrderDetail.vue
+++ b/src/pages/salesOrder/SalesOrderDetail.vue
@@ -28,7 +28,7 @@
 					<span v-else v-text="Text.display(order.remark)" />
 				</t-form-item>
 				<t-form-item label-width="0">
-					<div class="photo-wrap">
+					<div class="photo-wrap" v-entrance-transition="105">
 						<media-selector
 							:model-value="photoURLList"
 							v-model:photo-items="photoItems"
@@ -38,7 +38,6 @@
 							:show-viewer-actions="isEditing"
 							:upload="isEditing ? uploadPhotoList : undefined"
 							title="订单照片"
-							v-entrance-transition="105"
 						/>
 					</div>
 				</t-form-item>
diff --git a/src/pages/salesOrder/SalesOrderList.vue b/src/pages/salesOrder/SalesOrderList.vue
index 9ac4552..2bd6d97 100644
--- a/src/pages/salesOrder/SalesOrderList.vue
+++ b/src/pages/salesOrder/SalesOrderList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-can="permissionCodes.salesOrder.read" class="sales-order-list">
+	<div ref="salesOrderListRef" v-can="permissionCodes.salesOrder.read" class="sales-order-list">
 		<div class="filters">
 			<div class="search-row">
 				<t-input
@@ -35,7 +35,7 @@
 				</t-button>
 			</div>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrap"
 			v-model="refreshing"
 			:refresh-timeout="30000"
@@ -82,9 +82,9 @@
 				<div v-if="!list.length" class="empty" v-text="loading ? '正在加载销售订单' : '暂无销售订单'" />
 			</div>
 			<div class="center-tips" v-text="loading ? '正在加载' : noMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
-	<nav-bar-action-menu v-if="actions.length" :actions="actions" />
+	<nav-bar-action-menu v-if="route.name === 'SalesOrderList' && actions.length" :actions="actions" />
 	<customer-selector
 		v-model="customerId"
 		v-model:visible="customerSelectorVisible"
@@ -101,6 +101,7 @@
 <script setup lang="ts">
 import { Toolkit } from "timi-web";
 import { useUserStore } from "timi-web-api";
+import { onBeforeRouteLeave } from "vue-router";
 import CustomerAPI from "@/api/CustomerAPI";
 import PackageAPI from "@/api/PackageAPI";
 import SalesOrderAPI from "@/api/SalesOrderAPI";
@@ -139,6 +140,7 @@ defineOptions({ name: "SalesOrderList" });
 const SALES_ORDER_FILTER_STORAGE_KEY = "gao-customer-h5:sales-order-filter";
 const route = useRoute();
 const router = useRouter();
+const salesOrderListRef = ref<HTMLElement | null>(null);
 const currentStoreStore = useCurrentStoreStore();
 const navBarStore = useNavBarStore();
 const userStore = useUserStore();
@@ -149,6 +151,38 @@ const canCreateFulfillment = computed(() => userStore.hasPermissions(permissionC
 const canCancel = computed(() => userStore.hasPermissions(permissionCodes.salesOrder.cancel));
 const canRefund = computed(() => userStore.hasPermissions(permissionCodes.fund.refund));
 const canStoreManager = computed(() => userStore.hasRoles(gaoRoleCodes.storeManager));
+let savedPageScrollTop: number | undefined;
+let shouldReloadOnActivate = false;
+
+function getSalesOrderPage(): HTMLElement | null {
+	return salesOrderListRef.value?.closest<HTMLElement>(".page") || null;
+}
+
+function savePageScrollPosition(): void {
+	const page = getSalesOrderPage();
+	if (!page) {
+		return;
+	}
+
+	savedPageScrollTop = page.scrollTop;
+}
+
+function restorePageScrollPosition(): void {
+	if (savedPageScrollTop === undefined) {
+		return;
+	}
+
+	const scrollTop = savedPageScrollTop;
+	requestAnimationFrame(() => {
+		const page = getSalesOrderPage();
+		if (!page) {
+			return;
+		}
+
+		page.scrollTop = scrollTop;
+		savedPageScrollTop = undefined;
+	});
+}
 const actions = computed(() => [
 	...(canCreate.value ? [{
 		key: "create",
@@ -214,6 +248,7 @@ const loading = ref(false);
 const refreshing = ref(false);
 const noMore = ref(false);
 const pageSize = 15;
+let listRequestId = 0;
 
 // ---------- 路由和持久化 ----------
 
@@ -328,6 +363,35 @@ async function loadRouteCustomer(): Promise<void> {
 	setCustomerKeyword(selectedCustomer.value);
 }
 
+function clearSelectedCustomer(): void {
+	customerId.value = "";
+	selectedCustomer.value = undefined;
+	customerKeyword = "";
+	keyword.value = "";
+}
+
+function resetForProductTab(): void {
+	search.cancel();
+	listRequestId += 1;
+	filterVisible.value = false;
+	customerSelectorVisible.value = false;
+	appliedFilter.value = createDefaultSalesOrderFilter();
+	clearSelectedCustomer();
+	selectedPackage.value = undefined;
+	list.value = [];
+	pageIndex.value = 0;
+	total.value = 0;
+	loading.value = false;
+	refreshing.value = false;
+	noMore.value = false;
+	savedPageScrollTop = undefined;
+	localStorage.removeItem(filterStorageKey.value);
+	const page = getSalesOrderPage();
+	if (page) {
+		page.scrollTop = 0;
+	}
+}
+
 // ---------- 请求筛选 ----------
 
 function getEffectiveList<T>(value: T[], allValues: T[]): T[] | undefined {
@@ -369,16 +433,22 @@ async function fetchList(reset: boolean): Promise<void> {
 		noMore.value = false;
 		list.value = [];
 	}
+	const requestId = ++listRequestId;
 	loading.value = true;
 	try {
 		const result = await SalesOrderAPI.list(buildPageFilter());
+		if (requestId !== listRequestId) {
+			return;
+		}
 		const rows = result.list || [];
 		list.value = reset ? rows : list.value.concat(rows);
 		total.value = result.total || 0;
 		pageIndex.value += 1;
 		noMore.value = rows.length < pageSize || total.value <= list.value.length;
 	} finally {
-		loading.value = false;
+		if (requestId === listRequestId) {
+			loading.value = false;
+		}
 	}
 }
 
@@ -461,6 +531,9 @@ const search = Toolkit.debounce(async () => {
 }, false);
 
 watch(keyword, async () => {
+	if (route.name !== "SalesOrderList") {
+		return;
+	}
 	const isCustomerKeyword = !!customerId.value && keyword.value.trim() === customerKeyword;
 	customerKeyword = "";
 	if (isCustomerKeyword) {
@@ -515,16 +588,42 @@ onMounted(async () => {
 	}
 });
 
-onActivated(() => {
+onActivated(async () => {
+	if (shouldReloadOnActivate) {
+		shouldReloadOnActivate = false;
+		applyRouteFilters();
+		lastAppliedRouteFilterKey = routeFilterKey.value;
+		try {
+			await loadRouteCustomer();
+			await loadRoutePackage();
+			await fetchList(true);
+		} catch (error) {
+			Message.error(getErrorMessage(error, "销售订单加载失败"));
+		}
+	} else {
+		restorePageScrollPosition();
+	}
 	navBarStore.clearRight();
 	navBarStore.setCustomRightVisible(!!actions.value.length);
 });
 
 onDeactivated(() => {
+	if (!shouldReloadOnActivate && savedPageScrollTop === undefined) {
+		savePageScrollPosition();
+	}
 	filterVisible.value = false;
 	navBarStore.clearRight();
 });
 
+onBeforeRouteLeave(to => {
+	if (to.name === "ProductTab") {
+		shouldReloadOnActivate = true;
+		resetForProductTab();
+		return;
+	}
+	savePageScrollPosition();
+});
+
 onUnmounted(() => {
 	navBarStore.clearRight();
 	search.cancel();
diff --git a/src/pages/store/StoreDiaryList.vue b/src/pages/store/StoreDiaryList.vue
index ca3db9e..fa9d823 100644
--- a/src/pages/store/StoreDiaryList.vue
+++ b/src/pages/store/StoreDiaryList.vue
@@ -1,5 +1,5 @@
 <template>
-	<t-pull-down-refresh
+	<app-pull-down-refresh
 		v-can="permissionCodes.storeDiary.read"
 		class="store-diary-list"
 		v-model="isRefreshing"
@@ -52,7 +52,7 @@
 			</t-cell-group>
 			<div class="center-tips" v-text="loadStateText" />
 		</div>
-	</t-pull-down-refresh>
+	</app-pull-down-refresh>
 	<nav-bar-action-menu v-if="canShowActionMenu" :actions="actionList" />
 	<bottom-popup
 		v-model="diaryPopupVisible"
diff --git a/src/pages/store/StoreList.vue b/src/pages/store/StoreList.vue
index de7290f..f0ba968 100644
--- a/src/pages/store/StoreList.vue
+++ b/src/pages/store/StoreList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-can="permissionCodes.store.read" class="store-list">
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			class="list-wrapper"
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
@@ -46,7 +46,7 @@
 			</t-cell-group>
 			<div v-if="!pageResult.list.length" class="center-tips" v-text="isLoading ? '正在加载门店' : '暂无门店'" />
 			<div v-if="pageResult.list.length" class="center-tips" v-text="isNoMore ? '已加载全部门店' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<store-remove-dialog
 		v-model:visible="removeDialogVisible"
diff --git a/src/pages/tabs/SettingTab.vue b/src/pages/tabs/SettingTab.vue
index 107bc3c..a32fb56 100644
--- a/src/pages/tabs/SettingTab.vue
+++ b/src/pages/tabs/SettingTab.vue
@@ -99,7 +99,7 @@ const route = useRoute();
 const userStore = useUserStore();
 
 function getSettingTabPage(): HTMLElement | undefined {
-	return Array.from(document.querySelectorAll<HTMLElement>(".page-transition .pages"))
+	return Array.from(document.querySelectorAll<HTMLElement>(".page-transition .page"))
 		.find(element => !!element.querySelector(".management-tab"));
 }
 
diff --git a/src/pages/tag/TagList.vue b/src/pages/tag/TagList.vue
index 648d3a9..4126b8f 100644
--- a/src/pages/tag/TagList.vue
+++ b/src/pages/tag/TagList.vue
@@ -9,7 +9,7 @@
 				placeholder="搜索标签"
 			/>
 		</div>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -36,7 +36,7 @@
 			</div>
 			<div v-if="!tagList.length" class="empty" v-text="emptyText" />
 			<div v-if="tagList.length" class="center-tips" v-text="isLoading ? '正在加载更多' : isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<t-dialog
 		v-model:visible="editDialogVisible"
diff --git a/src/pages/user/UserList.vue b/src/pages/user/UserList.vue
index cb5b805..6f6861b 100644
--- a/src/pages/user/UserList.vue
+++ b/src/pages/user/UserList.vue
@@ -3,7 +3,7 @@
 		v-can="permissionCodes.user.read"
 		class="user-list"
 	>
-		<t-pull-down-refresh
+		<app-pull-down-refresh
 			v-model="isRefreshing"
 			:refresh-timeout="30000"
 			@refresh="refresh"
@@ -44,7 +44,7 @@
 			</t-cell-group>
 			<div v-if="!pageResult.list.length" class="center-tips" v-text="isLoading ? '正在加载用户' : '暂无用户'" />
 			<div v-if="pageResult.list.length" class="center-tips" v-text="isNoMore ? '已经到底了' : '上拉加载更多'" />
-		</t-pull-down-refresh>
+		</app-pull-down-refresh>
 	</div>
 	<nav-bar-action-menu
 		v-if="canCreateUser"