Skip to content

Commit

Permalink
fix: [harmony-hybrid] 解决冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
kongxiaojun committed Jul 10, 2024
1 parent fecd648 commit 00b646c
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Taro from '@tarojs/api'
import { navigateTo as navigateToH5 } from '@tarojs/taro-h5'
import native from '../NativeApi'
import { navigateBack as navigateBackH5, navigateTo as navigateToH5 } from '@tarojs/taro-h5'

import native from '../NativeApi'

function getFromParameter (from: string|undefined): number {
let number: number = -1
if (from) {
Expand Down Expand Up @@ -45,7 +45,8 @@ export function exitMiniProgram (option?: any) {
native.exitMiniProgram(option)
}

* 关闭当前页面,返回上一页面或多级页面。
/**
* 关闭当前页面,返回上一页面或多级页面。
*
* @canUse navigateBack
* @__object [delta]
Expand Down

0 comments on commit 00b646c

Please sign in to comment.