Skip to content

Commit 1210ede

Browse files
authored
Merge pull request #15872 from licunhao1/main
feat: 删除navigateToMiniProgram相关实现
2 parents 7212f9d + 4da04e0 commit 1210ede

File tree

3 files changed

+4
-77
lines changed

3 files changed

+4
-77
lines changed

examples/mini-program-example/src/pages/api/redirection/index.tsx

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import React from 'react'
2-
import Taro from '@tarojs/taro'
3-
import { View, Text } from '@tarojs/components'
4-
import { TestConsole } from '@/util/util'
2+
import { View } from '@tarojs/components'
53
import ButtonList from '@/components/buttonList'
64
import './index.scss'
75

@@ -22,30 +20,8 @@ export default class Index extends React.Component {
2220
func: null,
2321
},
2422
{
25-
id: 'navigateToMiniProgram',
26-
inputData: {
27-
appId: 'com.advanced.temp1',
28-
path: 'EntryAbility:///pages/api/framework/index?paramA=good',
29-
extraData: {
30-
paramB: 'morning',
31-
paramC: 'erveryone',
32-
},
33-
},
34-
func: (apiIndex, data) => {
35-
TestConsole.consoleTest('Taro.navigateToMiniProgram')
36-
Taro.navigateToMiniProgram({
37-
...data,
38-
success: (res) => {
39-
TestConsole.consoleSuccess.call(this, res, apiIndex)
40-
},
41-
fail: (res) => {
42-
TestConsole.consoleFail.call(this, res, apiIndex)
43-
},
44-
complete: (res) => {
45-
TestConsole.consoleComplete.call(this, res, apiIndex)
46-
},
47-
})
48-
},
23+
id: 'navigateToMiniProgram暂不支持',
24+
func: null,
4925
},
5026
{
5127
id: 'navigateBackMiniProgram',

packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ export class NativeApi {
3939
@(syncAndRelease)
4040
getAppAuthorizeSetting (): any {}
4141

42-
// @ts-ignore
43-
@(syncAndRelease)
44-
navigateToMiniProgram (options: any) {
45-
return options
46-
}
47-
4842
// @ts-ignore
4943
@(syncAndRelease)
5044
setNavigationBarColor (options: any) {

packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,5 @@
11
import Taro from '@tarojs/api'
2-
import { navigateTo as navigateToH5, showModal } from '@tarojs/taro-h5'
3-
4-
import native from '../NativeApi'
5-
import { shouldBeObject } from '../utils'
6-
import { MethodHandler } from '../utils/handler'
7-
8-
/**
9-
* 打开另一个小程序
10-
*
11-
* @canUse navigateToMiniProgram
12-
* @__object [appId, path, extraData]
13-
*/
14-
export const navigateToMiniProgram: typeof Taro.navigateToMiniProgram = (options) => {
15-
const apiName = 'navigateToMiniProgram'
16-
// options must be an Object
17-
const isObject = shouldBeObject(options)
18-
if (!isObject.flag) {
19-
const res = { errMsg: `${apiName}:fail ${isObject.msg}` }
20-
return Promise.reject(res)
21-
}
22-
return new Promise((resolve, reject) => {
23-
const { success, fail, complete } = options as Exclude<typeof options, undefined>
24-
const handle = new MethodHandler({ name: apiName, success, fail, complete })
25-
26-
showModal({
27-
content: `即将打开${options.appId}应用`,
28-
showCancel: true,
29-
cancelText: '取消',
30-
cancelColor: '#000',
31-
confirmText: '允许',
32-
confirmColor: '#0000ff',
33-
fail: () => {
34-
handle.fail({ errMsg: 'showModal error' }, { resolve, reject })
35-
},
36-
success: (res) => {
37-
if (res.confirm) {
38-
native.navigateToMiniProgram(options)
39-
} else {
40-
handle.fail({ errMsg: 'cancel' }, { resolve, reject })
41-
}
42-
},
43-
})
44-
})
45-
}
2+
import { navigateTo as navigateToH5 } from '@tarojs/taro-h5'
463

474
const delay = 300
485
let lastExecuteTime = 0

0 commit comments

Comments
 (0)