From 06ad609e1f16600d89de0f9eaada081da6d0d446 Mon Sep 17 00:00:00 2001
From: lyf <2514544224@qq.com>
Date: Tue, 28 Jul 2026 14:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=AE=B2=E8=A7=A3=E5=86=85=E9=83=A8=E8=BF=94=E5=9B=9E=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/explain/ExplainGuideStopCatalog.vue | 14 ++++++++------
 src/pages/exhibit/detail.vue                       |  5 ++++-
 src/pages/explain/guide-stop-list.vue              |  1 +
 tests/unit/ExhibitDetailAudioFirst.spec.ts         |  4 +++-
 tests/unit/ExplainGuideStopListNavigation.spec.ts  |  4 +++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/explain/ExplainGuideStopCatalog.vue b/src/components/explain/ExplainGuideStopCatalog.vue
index 639259f..fda056b 100644
--- a/src/components/explain/ExplainGuideStopCatalog.vue
+++ b/src/components/explain/ExplainGuideStopCatalog.vue
@@ -1,11 +1,11 @@
 <template>
-  <view class="guide-stop-catalog" :class="{ 'host-navigation': shouldUseHostNavigation }">
-    <view v-if="showInternalHeader" class="catalog-header">
-      <view class="header-back" @tap="emit('back')">
+  <view class="guide-stop-catalog" :class="{ 'host-navigation': shouldUseHostNavigation, 'has-embedded-back': showEmbeddedBack }">
+    <view v-if="showInternalHeader || showEmbeddedBack" class="catalog-header">
+      <view v-if="showInternalBack" class="header-back" @tap="emit('back')">
         <text class="header-back-icon" />
         <text class="header-back-text">返回</text>
       </view>
-      <text class="header-title">{{ selectedHallName || '讲解对象' }}</text>
+      <text v-if="showInternalHeader" class="header-title">{{ selectedHallName || '讲解对象' }}</text>
     </view>
 
     <scroll-view class="explain-scroll" scroll-y :show-scrollbar="false" @scroll="handleScroll" @scrolltolower="requestMore">
@@ -71,16 +71,18 @@ export interface ExplainGuideStopCatalogItem {
 const props = withDefaults(defineProps<{
   guideStops?: ExplainGuideStopCatalogItem[]
   selectedHallName?: string
+  showEmbeddedBack?: boolean
   loading?: boolean
   loadingMore?: boolean
   hasMore?: boolean
   error?: string
   loadMoreError?: string
-}>(), { guideStops: () => [], selectedHallName: '', loading: false, loadingMore: false, hasMore: false, error: '', loadMoreError: '' })
+}>(), { guideStops: () => [], selectedHallName: '', showEmbeddedBack: false, loading: false, loadingMore: false, hasMore: false, error: '', loadMoreError: '' })
 
 const emit = defineEmits<{ guideStopClick: [stop: ExplainGuideStopCatalogItem], back: [], retry: [], retryMore: [] }>()
 const shouldUseHostNavigation = computed(() => isEmbeddedInWechatMiniProgram())
 const showInternalHeader = computed(() => !shouldUseHostNavigation.value)
+const showInternalBack = computed(() => !shouldUseHostNavigation.value || props.showEmbeddedBack)
 const failedImageIds = ref(new Set<string>())
 const visibleCoverIds = ref(new Set<string>())
 const coverSlots = new Map<string, Element>()
@@ -155,7 +157,7 @@ const handleScroll = (event: Event) => { const target = event.target as HTMLElem
 .catalog-header { position: absolute; z-index: 2; top: 0; left: 0; right: 0; height: 64px; display: flex; align-items: center; justify-content: center; background: #f7f9f2; }
 .header-back { position: absolute; left: 12px; top: 10px; width: 44px; height: 44px; display: flex; align-items: center; }.header-back-icon { width: 20px; height: 20px; position: relative; } .header-back-icon::before { content: ''; position: absolute; left: 3px; top: 4px; width: 10px; height: 10px; border-left: 1.5px solid #262421; border-bottom: 1.5px solid #262421; transform: rotate(45deg); }
 .header-back-text { display: none; }.header-title { max-width: calc(100% - 152px); padding: 0 8px; font-size: 18px; line-height: 26px; font-weight: 700; color: #262421; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.explain-scroll { height: 100%; padding: 80px 16px calc(16px + env(safe-area-inset-bottom)); box-sizing: border-box; background: #f7f9f2; }.host-navigation .explain-scroll { padding-top: 16px; }
+.explain-scroll { height: 100%; padding: 80px 16px calc(16px + env(safe-area-inset-bottom)); box-sizing: border-box; background: #f7f9f2; }.host-navigation .explain-scroll { padding-top: 16px; }.host-navigation.has-embedded-back .explain-scroll { padding-top: 80px; }
 .stop-list { display: flex; width: 100%; min-width: 0; flex-direction: column; gap: 4px; }.stop-card { width: 100%; min-width: 0; height: 80px; padding: 8px 0; display: flex; align-items: center; gap: 12px; box-sizing: border-box; overflow: hidden; border: 0; border-bottom: 1px solid #dbded4; border-radius: 0; background: transparent; }.stop-card:active { background: rgba(227, 235, 201, 0.4); }.stop-cover { flex: 0 0 64px; width: 64px; height: 64px; overflow: hidden; border-radius: 6px; background: #f5f5ed; }.stop-cover-fallback { font-size: 22px; line-height: 28px; color: #a9b29b; }.stop-copy { min-width: 0; display: flex; flex: 1; overflow: hidden; }.stop-name { display: -webkit-box; max-height: 40px; font-size: 14px; line-height: 20px; font-weight: 700; color: #262421; overflow: hidden; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }.stop-status { flex: 0 0 44px; width: 44px; height: 24px; display: flex; align-items: center; justify-content: center; border-radius: 12px; background: #e3ebc9; }.stop-status-text { font-size: 11px; line-height: 16px; color: #262421; white-space: nowrap; }
 .state-block { margin: 34px 0; padding: 22px 16px; box-sizing: border-box; text-align: center; border: 1px solid #e4e6df; border-radius: 8px; background: #fff; }.state-block.error { border-color: #e5c2c2; background: #fff7f7; }.state-title,.state-desc { display: block; }.state-title { font-size: 15px; line-height: 21px; font-weight: 700; color: #141412; }.state-desc { margin-top: 6px; font-size: 12px; line-height: 18px; color: #68725d; }.state-retry { margin-top: 12px; padding: 0 14px; font-size: 13px; line-height: 32px; color: #141412; background: #e0df00; border: 0; border-radius: 6px; }.load-more-state { min-height: 52px; padding: 12px 16px calc(12px + env(safe-area-inset-bottom)); text-align: center; }
 </style>
diff --git a/src/pages/exhibit/detail.vue b/src/pages/exhibit/detail.vue
index 9120af1..b9c60ae 100644
--- a/src/pages/exhibit/detail.vue
+++ b/src/pages/exhibit/detail.vue
@@ -35,7 +35,7 @@
         />
         <view class="hero-image-shade"></view>
         <button
-          v-if="!shouldUseHostNavigation"
+          v-if="shouldShowDetailBack"
           class="hero-back"
           aria-label="返回上级"
           @tap.stop="handleBack"
@@ -253,6 +253,9 @@ const detailTextLoadedByLanguage = ref<Record<AudioLanguage, boolean>>({
   'en-US': false
 })
 const shouldUseHostNavigation = computed(() => isEmbeddedInWechatMiniProgram())
+const shouldShowDetailBack = computed(() => (
+  !shouldUseHostNavigation.value || detailEntryRequest.value?.returnToGuideStopList === true
+))
 
 const isAudioLanguage = (value: unknown): value is AudioLanguage => (
   value === 'zh-CN' || value === 'yue-HK' || value === 'en-US'
diff --git a/src/pages/explain/guide-stop-list.vue b/src/pages/explain/guide-stop-list.vue
index d8992ad..94a7964 100644
--- a/src/pages/explain/guide-stop-list.vue
+++ b/src/pages/explain/guide-stop-list.vue
@@ -4,6 +4,7 @@
       <ExplainGuideStopCatalog
         :guide-stops="explainGuideStopItems"
         :selected-hall-name="selectedExplainHallName"
+        :show-embedded-back="shouldReturnToHallList"
         :loading="explainLoading"
         :loading-more="loadingMore"
         :has-more="hasMore"
diff --git a/tests/unit/ExhibitDetailAudioFirst.spec.ts b/tests/unit/ExhibitDetailAudioFirst.spec.ts
index 4c6813b..a424446 100644
--- a/tests/unit/ExhibitDetailAudioFirst.spec.ts
+++ b/tests/unit/ExhibitDetailAudioFirst.spec.ts
@@ -403,6 +403,7 @@ describe('讲解详情音频优先布局', () => {
       hallId: 'hall-1',
       hallName: '恐龙厅'
     })
+    expect(wrapper.find('.hero-back').exists()).toBe(false)
     wrapper.getComponent(GuidePageFrameStub).vm.$emit('back')
     await flushPromises()
 
@@ -427,7 +428,8 @@ describe('讲解详情音频优先布局', () => {
       returnToGuideStopList: '1',
       returnToHallList: '1'
     })
-    wrapper.getComponent(GuidePageFrameStub).vm.$emit('back')
+    expect(wrapper.find('.hero-back').exists()).toBe(true)
+    await wrapper.get('.hero-back').trigger('tap')
     await flushPromises()
 
     const url = vi.mocked(uni.redirectTo).mock.calls[0]?.[0]?.url || ''
diff --git a/tests/unit/ExplainGuideStopListNavigation.spec.ts b/tests/unit/ExplainGuideStopListNavigation.spec.ts
index 9a45d7f..11b5ef8 100644
--- a/tests/unit/ExplainGuideStopListNavigation.spec.ts
+++ b/tests/unit/ExplainGuideStopListNavigation.spec.ts
@@ -52,7 +52,7 @@ const GuidePageFrameStub = defineComponent({
 
 const ExplainGuideStopCatalogStub = defineComponent({
   name: 'ExplainGuideStopCatalog',
-  props: ['guideStops', 'selectedHallName', 'loading', 'loadingMore', 'hasMore', 'error', 'loadMoreError'],
+  props: ['guideStops', 'selectedHallName', 'showEmbeddedBack', 'loading', 'loadingMore', 'hasMore', 'error', 'loadMoreError'],
   emits: ['back', 'retry', 'retryMore', 'guideStopClick'],
   setup(_, { emit }) {
     return {
@@ -200,6 +200,8 @@ describe('讲解对象列表返回', () => {
     testState.onLoadHandler?.({ hallId: 'hall-1', hallName: '恐龙厅', returnToHallList: '1' })
     await flushPromises()
 
+    expect(wrapper.getComponent(ExplainGuideStopCatalogStub).props('showEmbeddedBack')).toBe(true)
+
     await wrapper.get('[data-testid="detail-click"]').trigger('click')
     const detailUrl = vi.mocked(uni.navigateTo).mock.calls[0]?.[0]?.url || ''
     expect(new URLSearchParams(detailUrl.split('?')[1]).get('returnToHallList')).toBe('1')