修复讲解列表返回分流

2026-07-25 02:28:38 +08:00
parent 5d73848739
commit d94d689b40
5 changed files with 140 additions and 48 deletions
--- a/tests/unit/ExplainListNavigation.spec.ts
+++ b/tests/unit/ExplainListNavigation.spec.ts
@@ -9,6 +9,10 @@ const hostEnvironmentMocks = vi.hoisted(() => ({
  embeddedInWechatMiniProgram: false
 }))

+const miniProgramBridgeMocks = vi.hoisted(() => ({
+  returnToWechatMiniProgram: vi.fn()
+}))
+
 const testState = vi.hoisted(() => ({
  onLoadHandler: null as null | (() => void),
  onBackPressHandler: null as null | (() => boolean)
@@ -27,6 +31,10 @@ vi.mock('@/utils/hostEnvironment', () => ({
  isEmbeddedInWechatMiniProgram: () => hostEnvironmentMocks.embeddedInWechatMiniProgram
 }))

+vi.mock('@/services/WechatMiniProgramBridgeService', () => ({
+  returnToWechatMiniProgram: miniProgramBridgeMocks.returnToWechatMiniProgram
+}))
+
 vi.mock('@/usecases/explainUseCase', () => ({
  explainUseCase: {
    loadExplainHalls: async () => [],
@@ -60,6 +68,7 @@ const mountExplainList = () => mount(ExplainListPage, {

 beforeEach(() => {
  hostEnvironmentMocks.embeddedInWechatMiniProgram = false
+  miniProgramBridgeMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'not-embedded' })
  testState.onLoadHandler = null
  testState.onBackPressHandler = null
  window.location.hash = '#/pages/explain/list'
@@ -78,9 +87,9 @@ afterEach(() => {
 })

 describe('讲解展厅列表返回', () => {
-  it('首页通过内部页面栈进入时，顶部返回使用 navigateBack 回到导览首页', async () => {
+  it('首页讲解 Tab 进入时，顶部返回使用 navigateBack 保留讲解 Tab', 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()
@@ -91,6 +100,7 @@ describe('讲解展厅列表返回', () => {

    expect(uni.navigateBack).toHaveBeenCalledWith(expect.objectContaining({ delta: 1 }))
    expect(uni.reLaunch).not.toHaveBeenCalled()
+    expect(miniProgramBridgeMocks.returnToWechatMiniProgram).not.toHaveBeenCalled()
    wrapper.unmount()
  })

@@ -106,38 +116,38 @@ describe('讲解展厅列表返回', () => {
    wrapper.unmount()
  })

-  it('微信嵌入态由宿主导航提供标题与返回，不渲染重复的 H5 页头', async () => {
+  it('微信嵌入态直达页面由宿主提供标题与返回，并返回小程序', async () => {
    hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    miniProgramBridgeMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'returned' })
    window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program&weapp=1'
    window.history.replaceState({}, '', window.location.href)
    const wrapper = mountExplainList()

    expect(wrapper.getComponent(ExplainHallSelectStub).props('forceInternalHeader')).toBe(false)
    await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
+    await flushPromises()

    expect(uni.navigateBack).not.toHaveBeenCalled()
-    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=guide&embedded=wechat-mini-program&weapp=1'
-    }))
+    expect(uni.reLaunch).not.toHaveBeenCalled()
+    expect(miniProgramBridgeMocks.returnToWechatMiniProgram).toHaveBeenCalledTimes(1)
    wrapper.unmount()
  })

-  it('微信嵌入态即使前置页是导览首页也不调用宿主返回', async () => {
+  it('微信嵌入态从本项目首页进入时仍返回本项目首页', async () => {
    hostEnvironmentMocks.embeddedInWechatMiniProgram = true
    window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program'
    window.history.replaceState({}, '', window.location.href)
    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()

    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(uni.navigateBack).toHaveBeenCalledWith(expect.objectContaining({ delta: 1 }))
+    expect(uni.reLaunch).not.toHaveBeenCalled()
+    expect(miniProgramBridgeMocks.returnToWechatMiniProgram).not.toHaveBeenCalled()
    wrapper.unmount()
  })

@@ -157,23 +167,27 @@ describe('讲解展厅列表返回', () => {
    wrapper.unmount()
  })

-  it('上一页是首页但不是导览 Tab 时重启到导览首页', async () => {
+  it('首页返回失败时重启到原讲解 Tab', async () => {
    vi.stubGlobal('getCurrentPages', vi.fn(() => [
      { route: 'pages/index/index', options: { tab: 'explain' } },
      { route: 'pages/explain/list', options: {} }
    ]))
+    vi.stubGlobal('uni', {
+      navigateBack: vi.fn((options: { fail?: () => void }) => options.fail?.()),
+      reLaunch: vi.fn(),
+      showToast: vi.fn()
+    })
    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'
+      url: '/pages/index/index?tab=explain'
    }))
    wrapper.unmount()
  })

-  it('navigateBack 失败后重启到导览首页', async () => {
+  it('导览首页返回失败后重启到原导览 Tab', async () => {
    vi.stubGlobal('getCurrentPages', vi.fn(() => [
      { route: 'pages/index/index', options: { tab: 'guide' } },
      { route: 'pages/explain/list', options: {} }
@@ -210,8 +224,9 @@ describe('讲解展厅列表返回', () => {
    wrapper.unmount()
  })

-  it('根栈只创建一条历史标记，浏览器返回会回到导览首页', async () => {
+  it('微信嵌入态根栈不创建 H5 history 标记，平台返回交给宿主', async () => {
    hostEnvironmentMocks.embeddedInWechatMiniProgram = true
+    miniProgramBridgeMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'returned' })
    window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program&weapp=1'
    window.history.replaceState({}, '', window.location.href)
    const wrapper = mountExplainList()
@@ -220,17 +235,13 @@ describe('讲解展厅列表返回', () => {
    testState.onLoadHandler?.()
    await flushPromises()

-    window.dispatchEvent(new PopStateEvent('popstate', { state: {} }))
-    await flushPromises()
+    expect(pushState).not.toHaveBeenCalled()

    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(uni.reLaunch).not.toHaveBeenCalled()
+    expect(testState.onBackPressHandler?.()).toBe(true)
+    await flushPromises()
+    expect(miniProgramBridgeMocks.returnToWechatMiniProgram).toHaveBeenCalledTimes(1)
    wrapper.unmount()
  })

--- a/tests/unit/WechatMiniProgramBridgeService.spec.ts
+++ b/tests/unit/WechatMiniProgramBridgeService.spec.ts
@@ -31,6 +31,27 @@ describe('微信小程序 web-view 桥接', () => {
    expect(document.querySelector('[data-wechat-js-sdk="true"]')).toBeNull()
  })

+  it('嵌入小程序时通过 navigateBack 返回宿主页', async () => {
+    setEmbeddedRuntime()
+    const { returnToWechatMiniProgram } = await loadService()
+    const navigateBack = vi.fn(({ success }) => success())
+    Object.assign(window, {
+      wx: {
+        miniProgram: {
+          getEnv: (done: (value: { miniprogram: boolean }) => void) => done({ miniprogram: true }),
+          navigateBack
+        }
+      }
+    })
+
+    await expect(returnToWechatMiniProgram()).resolves.toEqual({ status: 'returned' })
+    expect(navigateBack).toHaveBeenCalledWith({
+      delta: 1,
+      success: expect.any(Function),
+      fail: expect.any(Function)
+    })
+  })
+
  it('等待延迟注入的 bridge 后导航到编码后的宿主页', async () => {
    setEmbeddedRuntime()
    const { openWechatMiniProgramLocation } = await loadService()