修正讲解列表入口返回规则

tests/unit/ExplainListNavigation.spec.ts

@@ -6,7 +6,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import ExplainListPage from '@/pages/explain/list.vue'
 
 const hostEnvironmentMocks = vi.hoisted(() => ({
-  embeddedInWechatMiniProgram: false
+  embeddedInWechatMiniProgram: false,
+  navigateBackToWechatMiniProgram: vi.fn(() => false)
 }))
 
 const testState = vi.hoisted(() => ({
@@ -24,7 +25,8 @@ vi.mock('@dcloudio/uni-app', () => ({
 }))
 
 vi.mock('@/utils/hostEnvironment', () => ({
-  isEmbeddedInWechatMiniProgram: () => hostEnvironmentMocks.embeddedInWechatMiniProgram
+  isEmbeddedInWechatMiniProgram: () => hostEnvironmentMocks.embeddedInWechatMiniProgram,
+  navigateBackToWechatMiniProgram: () => hostEnvironmentMocks.navigateBackToWechatMiniProgram()
 }))
 
 vi.mock('@/usecases/explainUseCase', () => ({
@@ -60,6 +62,8 @@ const mountExplainList = () => mount(ExplainListPage, {
 
 beforeEach(() => {
   hostEnvironmentMocks.embeddedInWechatMiniProgram = false
+  hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReset()
+  hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReturnValue(false)
   testState.onLoadHandler = null
   testState.onBackPressHandler = null
   window.location.hash = '#/pages/explain/list'
@@ -78,9 +82,9 @@ afterEach(() => {
 })
 
 describe('讲解展厅列表返回', () => {
-  it('首页通过内部页面栈进入时，顶部返回使用 navigateBack 回到导览首页', async () => {
+  it('首页讲解 Tab 进入时，顶部返回使用 navigateBack 回到项目首页', async () => {
     vi.stubGlobal('getCurrentPages', vi.fn(() => [
-      { route: 'pages/index/index', options: { tab: 'guide' } },
+      { route: 'pages/index/index', options: { tab: 'explain' } },
       { route: 'pages/explain/list', options: {} }
     ]))
     const wrapper = mountExplainList()
@@ -94,6 +98,22 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
+  it('小程序中的首页讲解 Tab 进入时仍优先回到项目首页', async () => {
+    hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReturnValue(true)
+    vi.stubGlobal('getCurrentPages', vi.fn(() => [
+      { route: 'pages/index/index', options: { tab: 'explain' } },
+      { route: 'pages/explain/list', options: {} }
+    ]))
+    const wrapper = mountExplainList()
+
+    await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
+
+    expect(uni.navigateBack).toHaveBeenCalledWith(expect.objectContaining({ delta: 1 }))
+    expect(hostEnvironmentMocks.navigateBackToWechatMiniProgram).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
   it('页面栈只有展厅列表时使用 reLaunch 回到导览首页', async () => {
     const wrapper = mountExplainList()
 
@@ -106,8 +126,9 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('独立页在微信嵌入态强制提供 H5 返回，并保留宿主识别参数', async () => {
+  it('小程序直达独立入口时返回小程序，而不是重启项目首页', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReturnValue(true)
     window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program&weapp=1'
     window.history.replaceState({}, '', window.location.href)
     const wrapper = mountExplainList()
@@ -116,14 +137,14 @@ describe('讲解展厅列表返回', () => {
     await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
 
     expect(uni.navigateBack).not.toHaveBeenCalled()
-    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=guide&embedded=wechat-mini-program&weapp=1'
-    }))
+    expect(hostEnvironmentMocks.navigateBackToWechatMiniProgram).toHaveBeenCalledTimes(1)
+    expect(uni.reLaunch).not.toHaveBeenCalled()
     wrapper.unmount()
   })
 
-  it('微信嵌入态即使前置页是导览首页也不调用宿主返回', async () => {
+  it('微信嵌入态从非讲解首页进入时返回小程序', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReturnValue(true)
     window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program'
     window.history.replaceState({}, '', window.location.href)
     vi.stubGlobal('getCurrentPages', vi.fn(() => [
@@ -135,9 +156,8 @@ describe('讲解展厅列表返回', () => {
     await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
 
     expect(uni.navigateBack).not.toHaveBeenCalled()
-    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=guide&embedded=wechat-mini-program'
-    }))
+    expect(hostEnvironmentMocks.navigateBackToWechatMiniProgram).toHaveBeenCalledTimes(1)
+    expect(uni.reLaunch).not.toHaveBeenCalled()
     wrapper.unmount()
   })
 
@@ -157,27 +177,11 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('上一页是首页但不是导览 Tab 时重启到导览首页', async () => {
+  it('首页讲解 Tab 返回失败后重启到项目首页讲解 Tab', async () => {
     vi.stubGlobal('getCurrentPages', vi.fn(() => [
       { route: 'pages/index/index', options: { tab: 'explain' } },
       { route: 'pages/explain/list', options: {} }
     ]))
-    const wrapper = mountExplainList()
-
-    await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
-
-    expect(uni.navigateBack).not.toHaveBeenCalled()
-    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=guide'
-    }))
-    wrapper.unmount()
-  })
-
-  it('navigateBack 失败后重启到导览首页', async () => {
-    vi.stubGlobal('getCurrentPages', vi.fn(() => [
-      { route: 'pages/index/index', options: { tab: 'guide' } },
-      { route: 'pages/explain/list', options: {} }
-    ]))
     vi.stubGlobal('uni', {
       navigateBack: vi.fn((options: { fail?: () => void }) => options.fail?.()),
       reLaunch: vi.fn(),
@@ -188,7 +192,7 @@ describe('讲解展厅列表返回', () => {
     await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
 
     expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=guide'
+      url: '/pages/index/index?tab=explain'
     }))
     wrapper.unmount()
   })
@@ -210,8 +214,9 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('根栈只创建一条历史标记，浏览器返回会回到导览首页', async () => {
+  it('小程序直达入口的浏览器返回会委托给小程序宿主', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    hostEnvironmentMocks.navigateBackToWechatMiniProgram.mockReturnValue(true)
     window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program&weapp=1'
     window.history.replaceState({}, '', window.location.href)
     const wrapper = mountExplainList()
@@ -225,12 +230,8 @@ describe('讲解展厅列表返回', () => {
 
     expect(uni.navigateBack).not.toHaveBeenCalled()
     expect(pushState).toHaveBeenCalledTimes(1)
-    const url = vi.mocked(uni.reLaunch).mock.calls[0]?.[0]?.url || ''
-    const query = new URLSearchParams(url.split('?')[1])
-    expect(url.split('?')[0]).toBe('/pages/index/index')
-    expect(query.get('tab')).toBe('guide')
-    expect(query.get('embedded')).toBe('wechat-mini-program')
-    expect(query.get('weapp')).toBe('1')
+    expect(hostEnvironmentMocks.navigateBackToWechatMiniProgram).toHaveBeenCalledTimes(1)
+    expect(uni.reLaunch).not.toHaveBeenCalled()
     wrapper.unmount()
   })
 

tests/unit/hostEnvironment.spec.ts

@@ -1,5 +1,8 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { isEmbeddedInWechatMiniProgram } from '@/utils/hostEnvironment'
+import {
+  isEmbeddedInWechatMiniProgram,
+  navigateBackToWechatMiniProgram
+} from '@/utils/hostEnvironment'
 
 const createWindow = (overrides: Record<string, unknown> = {}) => ({
   location: { search: '', hash: '' },
@@ -47,3 +50,24 @@ describe('微信小程序宿主环境识别', () => {
     expect(isEmbeddedInWechatMiniProgram()).toBe(false)
   })
 })
+
+describe('小程序宿主返回', () => {
+  it('嵌入态调用小程序 navigateBack', () => {
+    const navigateBack = vi.fn()
+    vi.stubGlobal('window', createWindow({
+      __wxjs_environment: 'miniprogram',
+      wx: { miniProgram: { navigateBack } }
+    }))
+
+    expect(navigateBackToWechatMiniProgram()).toBe(true)
+    expect(navigateBack).toHaveBeenCalledWith({ delta: 1 })
+  })
+
+  it('非嵌入态不会调用小程序返回桥接', () => {
+    const navigateBack = vi.fn()
+    vi.stubGlobal('window', createWindow({ wx: { miniProgram: { navigateBack } } }))
+
+    expect(navigateBackToWechatMiniProgram()).toBe(false)
+    expect(navigateBack).not.toHaveBeenCalled()
+  })
+})