@@ -159,7 +159,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, ref, watch } from 'vue'
|
||||
import { onHide, onLoad, onUnload } from '@dcloudio/uni-app'
|
||||
import { onBackPress, onHide, onLoad, onUnload } from '@dcloudio/uni-app'
|
||||
import GuidePageFrame from '@/components/navigation/GuidePageFrame.vue'
|
||||
import GuideFeedbackState from '@/components/navigation/GuideFeedbackState.vue'
|
||||
import GuideLoadingState from '@/components/navigation/GuideLoadingState.vue'
|
||||
@@ -188,6 +188,7 @@ import {
|
||||
} from '@/utils/placeholders'
|
||||
import { normalizeSameOriginPublicUrl } from '@/utils/publicUrl'
|
||||
import { isEmbeddedInWechatMiniProgram } from '@/utils/hostEnvironment'
|
||||
import { returnToWechatMiniProgram } from '@/services/WechatMiniProgramBridgeService'
|
||||
import { normalizeGuideAudioLanguage } from '@/data/adapters/guideStopInfoAdapter'
|
||||
import { explainGuideStopListUrl } from '@/utils/explainNavigation'
|
||||
import {
|
||||
@@ -355,6 +356,7 @@ const isCurrentDetailAudioTarget = computed(() => {
|
||||
)
|
||||
})
|
||||
let detailAudioClosedOnExit = false
|
||||
let returningToMiniProgram = false
|
||||
|
||||
const closeDetailAudioOnExit = () => {
|
||||
if (detailAudioClosedOnExit || !isCurrentDetailAudioTarget.value) return
|
||||
@@ -945,15 +947,42 @@ const fallbackToExplainObjectList = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const returnToExplainObjectList = () => {
|
||||
closeDetailAudioOnExit()
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
fail: fallbackToExplainObjectList
|
||||
})
|
||||
const cameFromExplainObjectList = () => {
|
||||
const pages = getCurrentPages()
|
||||
const previousPage = pages[pages.length - 2] as { route?: string } | undefined
|
||||
return previousPage?.route === 'pages/explain/guide-stop-list'
|
||||
}
|
||||
|
||||
const handleBack = returnToExplainObjectList
|
||||
const returnToExplainObjectList = async () => {
|
||||
closeDetailAudioOnExit()
|
||||
if (cameFromExplainObjectList()) {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
fail: fallbackToExplainObjectList
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (isEmbeddedInWechatMiniProgram()) {
|
||||
if (returningToMiniProgram) return
|
||||
returningToMiniProgram = true
|
||||
const result = await returnToWechatMiniProgram()
|
||||
if (result.status === 'returned') return
|
||||
|
||||
returningToMiniProgram = false
|
||||
uni.showToast({ title: '返回小程序失败,请重试', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
fallbackToExplainObjectList()
|
||||
}
|
||||
|
||||
const handleBack = () => { void returnToExplainObjectList() }
|
||||
|
||||
onBackPress(() => {
|
||||
void returnToExplainObjectList()
|
||||
return true
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
@@ -20,13 +20,15 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onUnmounted, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { onBackPress, onLoad } from '@dcloudio/uni-app'
|
||||
import GuidePageFrame from '@/components/navigation/GuidePageFrame.vue'
|
||||
import ExplainGuideStopCatalog, { type ExplainGuideStopCatalogItem } from '@/components/explain/ExplainGuideStopCatalog.vue'
|
||||
import { explainUseCase } from '@/usecases/explainUseCase'
|
||||
import type { ExplainGuideStop } from '@/domain/museum'
|
||||
import { normalizeExplainDetailTargetFromGuideStop } from '@/domain/explainDetailTarget'
|
||||
import { navigateToGuideTopTab, type GuideTopTab } from '@/utils/guideTopTabs'
|
||||
import { isEmbeddedInWechatMiniProgram } from '@/utils/hostEnvironment'
|
||||
import { returnToWechatMiniProgram } from '@/services/WechatMiniProgramBridgeService'
|
||||
|
||||
const PAGE_SIZE = 20
|
||||
const selectedExplainHallId = ref('')
|
||||
@@ -40,6 +42,7 @@ const hasMore = ref(false)
|
||||
const nextPageNo = ref(1)
|
||||
let requestVersion = 0
|
||||
let disposed = false
|
||||
let returningToMiniProgram = false
|
||||
|
||||
const toGuideStopItems = (stops: ExplainGuideStop[]): ExplainGuideStopCatalogItem[] => stops.map((stop) => ({
|
||||
id: stop.id,
|
||||
@@ -153,7 +156,7 @@ type ExplainPageStackEntry = {
|
||||
}
|
||||
}
|
||||
|
||||
const returnToHallList = () => {
|
||||
const returnToHallList = async () => {
|
||||
const pages = getCurrentPages()
|
||||
const previousPage = pages[pages.length - 2] as ExplainPageStackEntry | undefined
|
||||
const previousRoute = previousPage?.route
|
||||
@@ -170,11 +173,27 @@ const returnToHallList = () => {
|
||||
return
|
||||
}
|
||||
|
||||
if (isEmbeddedInWechatMiniProgram()) {
|
||||
if (returningToMiniProgram) return
|
||||
returningToMiniProgram = true
|
||||
const result = await returnToWechatMiniProgram()
|
||||
if (result.status === 'returned') return
|
||||
|
||||
returningToMiniProgram = false
|
||||
uni.showToast({ title: '返回小程序失败,请重试', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
fallbackToHallList()
|
||||
}
|
||||
|
||||
const handleBack = returnToHallList
|
||||
const handleBack = () => { void returnToHallList() }
|
||||
const handleTopTabChange = (tab: GuideTopTab) => navigateToGuideTopTab(tab)
|
||||
|
||||
onBackPress(() => {
|
||||
void returnToHallList()
|
||||
return true
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
@@ -39,9 +39,9 @@ import {
|
||||
type GuideTopTab
|
||||
} from '@/utils/guideTopTabs'
|
||||
import {
|
||||
isEmbeddedInWechatMiniProgram,
|
||||
navigateBackToWechatMiniProgram
|
||||
isEmbeddedInWechatMiniProgram
|
||||
} from '@/utils/hostEnvironment'
|
||||
import { returnToWechatMiniProgram } from '@/services/WechatMiniProgramBridgeService'
|
||||
import { syncHostNavigationTitle } from '@/utils/hostNavigationTitle'
|
||||
import { explainGuideStopListUrl } from '@/utils/explainNavigation'
|
||||
|
||||
@@ -162,9 +162,10 @@ const returnToProjectExplainHome = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const returnFromStandaloneMiniProgramEntry = () => {
|
||||
const returnFromStandaloneMiniProgramEntry = async () => {
|
||||
isReturningFromExplainList = true
|
||||
if (navigateBackToWechatMiniProgram()) return
|
||||
const result = await returnToWechatMiniProgram()
|
||||
if (result.status === 'returned') return
|
||||
|
||||
isReturningFromExplainList = false
|
||||
uni.showToast({
|
||||
@@ -184,7 +185,7 @@ const returnToGuideHome = () => {
|
||||
}
|
||||
|
||||
if (shouldUseHostNavigation.value) {
|
||||
returnFromStandaloneMiniProgramEntry()
|
||||
void returnFromStandaloneMiniProgramEntry()
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@ import {
|
||||
interface MiniProgramBridge {
|
||||
getEnv?: (callback: (result: { miniprogram?: boolean }) => void) => void
|
||||
navigateTo?: (options: { url: string; success?: () => void; fail?: (error: { errMsg?: string }) => void }) => void
|
||||
navigateBack?: (options: { delta: number; success?: () => void; fail?: (error: { errMsg?: string }) => void }) => void
|
||||
postMessage?: (options: { data: { type: string } }) => void
|
||||
}
|
||||
|
||||
export type WechatMiniProgramBridgeResult =
|
||||
@@ -15,13 +17,20 @@ export type WechatMiniProgramBridgeResult =
|
||||
| { status: 'not-embedded' }
|
||||
| { status: 'failed'; reason: 'invalid-target' | 'bridge-unavailable' | 'not-in-mini-program' | 'navigation-failed' | 'page-not-found' | 'timeout' }
|
||||
|
||||
export type WechatMiniProgramReturnResult =
|
||||
| { status: 'returned' }
|
||||
| { status: 'not-embedded' }
|
||||
| { status: 'failed'; reason: 'bridge-unavailable' | 'not-in-mini-program' | 'navigation-failed' | 'timeout' }
|
||||
|
||||
const SDK_URL = 'https://res.wx.qq.com/open/js/jweixin-1.3.2.js'
|
||||
export const MINI_PROGRAM_RETURN_MESSAGE = 'museum-guide:return'
|
||||
const BRIDGE_WAIT_TIMEOUT = 2500
|
||||
const BRIDGE_POLL_INTERVAL = 50
|
||||
const GET_ENV_TIMEOUT = 1500
|
||||
const NAVIGATION_TIMEOUT = 3000
|
||||
|
||||
let pendingNavigation: Promise<WechatMiniProgramBridgeResult> | null = null
|
||||
let pendingReturn: Promise<WechatMiniProgramReturnResult> | null = null
|
||||
let sdkLoadPromise: Promise<void> | null = null
|
||||
|
||||
const getBridge = (): MiniProgramBridge | null => {
|
||||
@@ -108,6 +117,45 @@ const navigateToHostLocationPage = (bridge: MiniProgramBridge, target: WechatOpe
|
||||
}
|
||||
})
|
||||
|
||||
const requestHostReturnFallback = (bridge: MiniProgramBridge) => {
|
||||
if (!bridge.postMessage) return false
|
||||
|
||||
try {
|
||||
bridge.postMessage({ data: { type: MINI_PROGRAM_RETURN_MESSAGE } })
|
||||
return true
|
||||
} catch (error) {
|
||||
console.error('请求宿主小程序安全返回失败:', error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
const navigateBackToHost = (bridge: MiniProgramBridge) => new Promise<WechatMiniProgramReturnResult>((resolve) => {
|
||||
if (!bridge.navigateBack) return resolve({ status: 'failed', reason: 'bridge-unavailable' })
|
||||
|
||||
let settled = false
|
||||
const finish = (result: WechatMiniProgramReturnResult) => {
|
||||
if (settled) return
|
||||
settled = true
|
||||
clearTimeout(timeout)
|
||||
resolve(result)
|
||||
}
|
||||
const timeout = setTimeout(() => finish({ status: 'failed', reason: 'timeout' }), NAVIGATION_TIMEOUT)
|
||||
|
||||
try {
|
||||
bridge.navigateBack({
|
||||
delta: 1,
|
||||
success: () => finish({ status: 'returned' }),
|
||||
fail: (error) => {
|
||||
console.error('返回宿主小程序失败:', error)
|
||||
finish({ status: 'failed', reason: 'navigation-failed' })
|
||||
}
|
||||
})
|
||||
} catch (error) {
|
||||
console.error('调用宿主小程序返回桥接失败:', error)
|
||||
finish({ status: 'failed', reason: 'navigation-failed' })
|
||||
}
|
||||
})
|
||||
|
||||
const openOnce = async (target: WechatOpenLocationTarget): Promise<WechatMiniProgramBridgeResult> => {
|
||||
const validation = validateWechatOpenLocationTarget(target)
|
||||
if (!validation.ok) return { status: 'failed', reason: 'invalid-target' }
|
||||
@@ -123,3 +171,24 @@ export const openWechatMiniProgramLocation = (target: WechatOpenLocationTarget)
|
||||
pendingNavigation = openOnce(target).finally(() => { pendingNavigation = null })
|
||||
return pendingNavigation
|
||||
}
|
||||
|
||||
const returnOnce = async (): Promise<WechatMiniProgramReturnResult> => {
|
||||
if (!isEmbeddedInWechatMiniProgram()) return { status: 'not-embedded' }
|
||||
|
||||
const bridge = await waitForBridge()
|
||||
if (!bridge) return { status: 'failed', reason: 'bridge-unavailable' }
|
||||
if (!await isMiniProgramWebView(bridge)) return { status: 'failed', reason: 'not-in-mini-program' }
|
||||
|
||||
const result = await navigateBackToHost(bridge)
|
||||
if (result.status === 'returned') return result
|
||||
|
||||
// 宿主页可能由分享或冷启动直接打开,页面栈没有上一页时改由宿主执行安全回退。
|
||||
if (requestHostReturnFallback(bridge)) return { status: 'returned' }
|
||||
return result
|
||||
}
|
||||
|
||||
export const returnToWechatMiniProgram = () => {
|
||||
if (pendingReturn) return pendingReturn
|
||||
pendingReturn = returnOnce().finally(() => { pendingReturn = null })
|
||||
return pendingReturn
|
||||
}
|
||||
|
||||
@@ -43,28 +43,6 @@ export const isEmbeddedInWechatMiniProgram = () => {
|
||||
return /miniProgram/i.test(window.navigator?.userAgent || '')
|
||||
}
|
||||
|
||||
type WechatMiniProgramNavigationBridge = {
|
||||
navigateBack?: (options: { delta: number }) => void
|
||||
}
|
||||
|
||||
export const navigateBackToWechatMiniProgram = () => {
|
||||
if (!isEmbeddedInWechatMiniProgram() || typeof window === 'undefined') return false
|
||||
|
||||
const bridge = (window as Window & {
|
||||
wx?: { miniProgram?: WechatMiniProgramNavigationBridge }
|
||||
}).wx?.miniProgram
|
||||
|
||||
if (typeof bridge?.navigateBack !== 'function') return false
|
||||
|
||||
try {
|
||||
bridge.navigateBack({ delta: 1 })
|
||||
return true
|
||||
} catch (error) {
|
||||
console.error('返回小程序失败:', error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export const isWechatMiniProgramRuntime = () => (
|
||||
isNativeWechatMiniProgram() || isEmbeddedInWechatMiniProgram()
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user