修复微信内嵌点位搜索导航
Some checks failed
CI / verify (push) Has been cancelled

This commit is contained in:
lyf
2026-07-14 10:19:22 +08:00
parent ef59570b0e
commit 267b415673
4 changed files with 95 additions and 2 deletions

View File

@@ -14,7 +14,7 @@
@mouseup="handlePanelMouseEnd" @mouseup="handlePanelMouseEnd"
@mouseleave="resetPanelMouse" @mouseleave="resetPanelMouse"
> >
<view v-if="variant === 'home' && showSearchContent" class="home-fullscreen-nav"> <view v-if="showHomeFullscreenNav" class="home-fullscreen-nav">
<view class="home-back-button" data-testid="poi-search-cancel" @tap.stop="handleCancel"> <view class="home-back-button" data-testid="poi-search-cancel" @tap.stop="handleCancel">
<text class="home-back-icon"></text> <text class="home-back-icon"></text>
</view> </view>
@@ -245,6 +245,7 @@ import type {
PoiCategoryResultState, PoiCategoryResultState,
PoiSearchContext PoiSearchContext
} from '@/domain/poiSearch' } from '@/domain/poiSearch'
import { isEmbeddedInWechatMiniProgram } from '@/utils/hostEnvironment'
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
initialKeyword?: string initialKeyword?: string
@@ -308,6 +309,12 @@ let searchRequestSeq = 0
const collapseDragThreshold = 48 const collapseDragThreshold = 48
const homeExpandTapGuardMs = 360 const homeExpandTapGuardMs = 360
const showSearchContent = computed(() => props.variant === 'page' || homeExpanded.value) const showSearchContent = computed(() => props.variant === 'page' || homeExpanded.value)
const shouldUseHostNavigation = computed(() => isEmbeddedInWechatMiniProgram())
const showHomeFullscreenNav = computed(() => (
props.variant === 'home'
&& showSearchContent.value
&& !shouldUseHostNavigation.value
))
const isHomeCategoryMode = computed(() => ( const isHomeCategoryMode = computed(() => (
props.variant === 'home' && homeCategoryMode.value && !homeExpanded.value props.variant === 'home' && homeCategoryMode.value && !homeExpanded.value
)) ))

View File

@@ -715,7 +715,11 @@ const syncTopTabToUrl = (tabId: GuideTopTab) => {
if (typeof window === 'undefined') return if (typeof window === 'undefined') return
if (!isIndexHashRoute()) return if (!isIndexHashRoute()) return
const url = `#/pages/index/index?tab=${tabId}` const currentHash = window.location.hash || ''
const queryStart = currentHash.indexOf('?')
const params = new URLSearchParams(queryStart >= 0 ? currentHash.slice(queryStart + 1) : '')
params.set('tab', tabId)
const url = `#/pages/index/index?${params.toString()}`
if (window.location.hash !== url) { if (window.location.hash !== url) {
window.history.replaceState(window.history.state, '', url) window.history.replaceState(window.history.state, '', url)
} }

View File

@@ -172,6 +172,14 @@ afterEach(() => {
}) })
describe('首页搜索与地图闭环', () => { describe('首页搜索与地图闭环', () => {
it('同步首页标签时保留内嵌宿主参数', async () => {
window.location.hash = '#/pages/index/index?tab=guide&embedded=wechat-mini-program'
await mountIndex()
expect(window.location.hash).toBe('#/pages/index/index?tab=guide&embedded=wechat-mini-program')
})
it('首页暂不展示来馆入口及其到馆面板', async () => { it('首页暂不展示来馆入口及其到馆面板', async () => {
const wrapper = await mountIndex() const wrapper = await mountIndex()

View File

@@ -11,10 +11,18 @@ const guideMocks = vi.hoisted(() => ({
searchPois: vi.fn() searchPois: vi.fn()
})) }))
const hostEnvironmentMocks = vi.hoisted(() => ({
embeddedInWechatMiniProgram: false
}))
vi.mock('@/usecases/guideUseCase', () => ({ vi.mock('@/usecases/guideUseCase', () => ({
guideUseCase: guideMocks guideUseCase: guideMocks
})) }))
vi.mock('@/utils/hostEnvironment', () => ({
isEmbeddedInWechatMiniProgram: () => hostEnvironmentMocks.embeddedInWechatMiniProgram
}))
const floors: MuseumFloor[] = [ const floors: MuseumFloor[] = [
{ id: 'floor-1', label: '1F', order: 1 }, { id: 'floor-1', label: '1F', order: 1 },
{ id: 'floor-2', label: '2F', order: 2 } { id: 'floor-2', label: '2F', order: 2 }
@@ -67,6 +75,7 @@ const createDeferred = <T>() => {
} }
beforeEach(() => { beforeEach(() => {
hostEnvironmentMocks.embeddedInWechatMiniProgram = false
guideMocks.getFloors.mockResolvedValue(floors) guideMocks.getFloors.mockResolvedValue(floors)
guideMocks.getInitialSearchSpacePoints.mockResolvedValue(poiPool) guideMocks.getInitialSearchSpacePoints.mockResolvedValue(poiPool)
guideMocks.searchPois.mockImplementation(async (keyword = '') => ( guideMocks.searchPois.mockImplementation(async (keyword = '') => (
@@ -130,6 +139,71 @@ describe('POI 搜索面板实际渲染与状态闭环', () => {
pageWrapper.unmount() pageWrapper.unmount()
}) })
it('普通 H5 展开时保留内部标题与返回,并可分类和收起', async () => {
const wrapper = mount(PoiSearchPanel, {
props: {
variant: 'home',
currentFloorId: 'floor-1',
currentFloorLabel: '1F'
}
})
await flushMountedSearch()
await wrapper.get('.search-box').trigger('tap')
await flushMountedSearch()
expect(wrapper.get('.home-fullscreen-nav').text()).toContain('点位搜索')
expect(wrapper.find('[data-testid="poi-search-cancel"]').exists()).toBe(true)
await wrapper.get('[data-testid="poi-category-restroom"]').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('[data-testid="poi-home-category-results"]').exists()).toBe(true)
await wrapper.get('[data-testid="poi-category-cancel"]').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('.home-category-strip').exists()).toBe(true)
await wrapper.get('.search-box').trigger('tap')
await flushMountedSearch()
await wrapper.get('[data-testid="poi-search-cancel"]').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('.home-category-strip').exists()).toBe(true)
wrapper.unmount()
})
it('内嵌微信小程序展开时不渲染内部标题与返回,并可分类和收起', async () => {
hostEnvironmentMocks.embeddedInWechatMiniProgram = true
const wrapper = mount(PoiSearchPanel, {
props: {
variant: 'home',
currentFloorId: 'floor-1',
currentFloorLabel: '1F'
}
})
await flushMountedSearch()
await wrapper.get('.search-box').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('.home-fullscreen-nav').exists()).toBe(false)
expect(wrapper.find('[data-testid="poi-search-cancel"]').exists()).toBe(false)
expect(wrapper.get('.poi-search-panel').element.firstElementChild?.classList.contains('search-box'))
.toBe(true)
await wrapper.get('[data-testid="poi-category-restroom"]').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('[data-testid="poi-home-category-results"]').exists()).toBe(true)
await wrapper.get('[data-testid="poi-category-cancel"]').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('.home-category-strip').exists()).toBe(true)
await wrapper.get('.search-box').trigger('tap')
await flushMountedSearch()
await wrapper.get('.home-collapse-handle').trigger('tap')
await flushMountedSearch()
expect(wrapper.find('.home-category-strip').exists()).toBe(true)
wrapper.unmount()
})
it('展开态快捷入口退出全屏并进入当前楼层的分类结果', async () => { it('展开态快捷入口退出全屏并进入当前楼层的分类结果', async () => {
const wrapper = mount(PoiSearchPanel, { const wrapper = mount(PoiSearchPanel, {
props: { props: {