diff --git a/examples/mini-program-example/src/pages/api/redirection/index.tsx b/examples/mini-program-example/src/pages/api/redirection/index.tsx index 38adb33d94c4..d9b32456a96a 100644 --- a/examples/mini-program-example/src/pages/api/redirection/index.tsx +++ b/examples/mini-program-example/src/pages/api/redirection/index.tsx @@ -1,7 +1,5 @@ import React from 'react' -import Taro from '@tarojs/taro' -import { View, Text } from '@tarojs/components' -import { TestConsole } from '@/util/util' +import { View } from '@tarojs/components' import ButtonList from '@/components/buttonList' import './index.scss' @@ -22,30 +20,8 @@ export default class Index extends React.Component { func: null, }, { - id: 'navigateToMiniProgram', - inputData: { - appId: 'com.advanced.temp1', - path: 'EntryAbility:///pages/api/framework/index?paramA=good', - extraData: { - paramB: 'morning', - paramC: 'erveryone', - }, - }, - func: (apiIndex, data) => { - TestConsole.consoleTest('Taro.navigateToMiniProgram') - Taro.navigateToMiniProgram({ - ...data, - success: (res) => { - TestConsole.consoleSuccess.call(this, res, apiIndex) - }, - fail: (res) => { - TestConsole.consoleFail.call(this, res, apiIndex) - }, - complete: (res) => { - TestConsole.consoleComplete.call(this, res, apiIndex) - }, - }) - }, + id: 'navigateToMiniProgram暂不支持', + func: null, }, { id: 'navigateBackMiniProgram', diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts index 9a60063f8232..444dadf64df2 100644 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts +++ b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts @@ -58,12 +58,6 @@ export class NativeApi { @(syncAndRelease) getAppAuthorizeSetting (): any {} - // @ts-ignore - @(syncAndRelease) - navigateToMiniProgram (options: any) { - return options - } - // @ts-ignore @(syncAndRelease) setNavigationBarColor (options: any) { diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts deleted file mode 100644 index 9a61ce43fb12..000000000000 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts +++ /dev/null @@ -1,67 +0,0 @@ -import Taro from '@tarojs/api' -import { navigateTo as navigateToH5, showModal } from '@tarojs/taro-h5' - -import native from '../NativeApi' -import { shouldBeObject } from '../utils' -import { MethodHandler } from '../utils/handler' - -/** - * 打开另一个小程序 - * - * @canUse navigateToMiniProgram - * @__object [appId, path, extraData] - */ -export const navigateToMiniProgram: typeof Taro.navigateToMiniProgram = (options) => { - const apiName = 'navigateToMiniProgram' - // options must be an Object - const isObject = shouldBeObject(options) - if (!isObject.flag) { - const res = { errMsg: `${apiName}:fail ${isObject.msg}` } - return Promise.reject(res) - } - return new Promise((resolve, reject) => { - const { success, fail, complete } = options as Exclude - const handle = new MethodHandler({ name: apiName, success, fail, complete }) - - showModal({ - content: `即将打开${options.appId}应用`, - showCancel: true, - cancelText: '取消', - cancelColor: '#000', - confirmText: '允许', - confirmColor: '#0000ff', - fail: () => { - handle.fail({ errMsg: 'showModal error' }, { resolve, reject }) - }, - success: (res) => { - if (res.confirm) { - native.navigateToMiniProgram(options) - } else { - handle.fail({ errMsg: 'cancel' }, { resolve, reject }) - } - }, - }) - }) -} - -const delay = 300 -let lastExecuteTime = 0 -let lastUrl - -/** - * 保留当前页面,跳转到应用内的某个页面。 - * 重复点击时 navigateTo 会重复跳转,因此进行限制。 - * - * @canUse navigateTo - * @__object [url, events] - */ -export function navigateTo (option: Taro.navigateTo.Option) { - const targetUrl = option.url - const executeTime = new Date().getTime() - if (executeTime - lastExecuteTime < delay && lastUrl === targetUrl) { - return Promise.resolve({ errMsg: 'navigateTo调用频率太高' }) - } - lastExecuteTime = executeTime - lastUrl = targetUrl - return navigateToH5(option) -}