同步移动端源码并修复小程序嵌入标题

tests/unit/ExplainListNavigation.spec.ts

@@ -9,10 +9,6 @@ const hostEnvironmentMocks = vi.hoisted(() => ({
   embeddedInWechatMiniProgram: false
 }))
 
-const miniProgramReturnMocks = vi.hoisted(() => ({
-  returnToWechatMiniProgram: vi.fn(() => Promise.resolve({ status: 'failed' as const, reason: 'bridge-unavailable' as const }))
-}))
-
 const testState = vi.hoisted(() => ({
   onLoadHandler: null as null | (() => void),
   onBackPressHandler: null as null | (() => boolean)
@@ -31,10 +27,6 @@ vi.mock('@/utils/hostEnvironment', () => ({
   isEmbeddedInWechatMiniProgram: () => hostEnvironmentMocks.embeddedInWechatMiniProgram
 }))
 
-vi.mock('@/services/WechatMiniProgramBridgeService', () => ({
-  returnToWechatMiniProgram: () => miniProgramReturnMocks.returnToWechatMiniProgram()
-}))
-
 vi.mock('@/usecases/explainUseCase', () => ({
   explainUseCase: {
     loadExplainHalls: async () => [],
@@ -68,8 +60,6 @@ const mountExplainList = () => mount(ExplainListPage, {
 
 beforeEach(() => {
   hostEnvironmentMocks.embeddedInWechatMiniProgram = false
-  miniProgramReturnMocks.returnToWechatMiniProgram.mockReset()
-  miniProgramReturnMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'failed', reason: 'bridge-unavailable' })
   testState.onLoadHandler = null
   testState.onBackPressHandler = null
   window.location.hash = '#/pages/explain/list'
@@ -88,9 +78,9 @@ afterEach(() => {
 })
 
 describe('讲解展厅列表返回', () => {
-  it('首页讲解 Tab 进入时，顶部返回使用 navigateBack 回到项目首页', async () => {
+  it('首页通过内部页面栈进入时，顶部返回使用 navigateBack 回到导览首页', async () => {
     vi.stubGlobal('getCurrentPages', vi.fn(() => [
-      { route: 'pages/index/index', options: { tab: 'explain' } },
+      { route: 'pages/index/index', options: { tab: 'guide' } },
       { route: 'pages/explain/list', options: {} }
     ]))
     const wrapper = mountExplainList()
@@ -104,22 +94,6 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('小程序中的首页讲解 Tab 进入时仍优先回到项目首页', async () => {
-    hostEnvironmentMocks.embeddedInWechatMiniProgram = true
-    miniProgramReturnMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'returned' })
-    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(miniProgramReturnMocks.returnToWechatMiniProgram).not.toHaveBeenCalled()
-    wrapper.unmount()
-  })
-
   it('页面栈只有展厅列表时使用 reLaunch 回到导览首页', async () => {
     const wrapper = mountExplainList()
 
@@ -132,26 +106,24 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('小程序直达独立入口时返回小程序，而不是重启项目首页', async () => {
+  it('微信嵌入态不强制渲染 H5 页头，并保留宿主识别参数', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
-    miniProgramReturnMocks.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(miniProgramReturnMocks.returnToWechatMiniProgram).toHaveBeenCalledTimes(1)
-    expect(uni.reLaunch).not.toHaveBeenCalled()
+    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
+      url: '/pages/index/index?tab=guide&embedded=wechat-mini-program&weapp=1'
+    }))
     wrapper.unmount()
   })
 
-  it('微信嵌入态从非讲解首页进入时返回小程序', async () => {
+  it('微信嵌入态即使前置页是导览首页也不调用宿主返回', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
-    miniProgramReturnMocks.returnToWechatMiniProgram.mockResolvedValue({ status: 'returned' })
     window.location.hash = '#/pages/explain/list?embedded=wechat-mini-program'
     window.history.replaceState({}, '', window.location.href)
     vi.stubGlobal('getCurrentPages', vi.fn(() => [
@@ -161,11 +133,11 @@ describe('讲解展厅列表返回', () => {
     const wrapper = mountExplainList()
 
     await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
-    await flushPromises()
 
     expect(uni.navigateBack).not.toHaveBeenCalled()
-    expect(miniProgramReturnMocks.returnToWechatMiniProgram).toHaveBeenCalledTimes(1)
-    expect(uni.reLaunch).not.toHaveBeenCalled()
+    expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
+      url: '/pages/index/index?tab=guide&embedded=wechat-mini-program'
+    }))
     wrapper.unmount()
   })
 
@@ -185,11 +157,27 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('首页讲解 Tab 返回失败后重启到项目首页讲解 Tab', async () => {
+  it('上一页是首页但不是导览 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(),
@@ -200,7 +188,7 @@ describe('讲解展厅列表返回', () => {
     await wrapper.get('[data-testid="explain-list-back"]').trigger('click')
 
     expect(uni.reLaunch).toHaveBeenCalledWith(expect.objectContaining({
-      url: '/pages/index/index?tab=explain'
+      url: '/pages/index/index?tab=guide'
     }))
     wrapper.unmount()
   })
@@ -222,9 +210,8 @@ describe('讲解展厅列表返回', () => {
     wrapper.unmount()
   })
 
-  it('小程序直达入口的浏览器返回会委托给小程序宿主', async () => {
+  it('根栈只创建一条历史标记，浏览器返回会回到导览首页', async () => {
     hostEnvironmentMocks.embeddedInWechatMiniProgram = true
-    miniProgramReturnMocks.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()
@@ -238,8 +225,12 @@ describe('讲解展厅列表返回', () => {
 
     expect(uni.navigateBack).not.toHaveBeenCalled()
     expect(pushState).toHaveBeenCalledTimes(1)
-    expect(miniProgramReturnMocks.returnToWechatMiniProgram).toHaveBeenCalledTimes(1)
-    expect(uni.reLaunch).not.toHaveBeenCalled()
+    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')
     wrapper.unmount()
   })