Skip to content
This repository was archived by the owner on Dec 6, 2021. It is now read-only.

Commit fcefbbf

Browse files
committed
fix(button): #56 miniapp event handles failed
1 parent e4271f2 commit fcefbbf

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/components/button/index.ts

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { h, defineComponent, computed, mergeProps, PropType } from 'vue'
22
import { Button, View, Form } from '@tarojs/components'
3-
import { CommonEventFunction } from "@tarojs/components/types/common"
4-
import { ButtonProps } from "@tarojs/components/types/Button"
53
import { AtButtonProps } from "types/button"
64
import AtLoading from '../loading/index'
75
import { getEnvs } from '../../utils/common'
@@ -164,18 +162,19 @@ const AtButton = defineComponent({
164162
}
165163

166164
interface miniAppEventHandleProps {
167-
error?: typeof props.onError
165+
onError?: typeof props.onError
168166
onContact?: typeof props.onContact
169167
onOpenSetting?: typeof props.onOpenSetting
170-
getphonenumber?: typeof props.onGetPhoneNumber
171-
getuserinfo?: typeof props.onGetUserInfo
168+
onGetPhoneNumber?: typeof props.onGetPhoneNumber
169+
onGetUserInfo?: typeof props.onGetUserInfo
170+
onGetAuthorize?: typeof props.onGetAuthorize
172171
onLaunchapp?: typeof props.onLaunchapp
173172
}
174173

175174
function getWxButtonProps(): miniAppEventHandleProps {
176175
if (!props.openType) return {}
177176

178-
const wxButtonProps: miniAppEventHandleProps = { error: handleError }
177+
const wxButtonProps: miniAppEventHandleProps = {}
179178

180179
switch (props.openType) {
181180
case 'contact':
@@ -185,12 +184,18 @@ const AtButton = defineComponent({
185184
wxButtonProps.onOpenSetting = handleOpenSetting
186185
break
187186
case 'getPhoneNumber':
188-
wxButtonProps.getphonenumber = handleGetPhoneNumber
187+
wxButtonProps.onGetPhoneNumber = handleGetPhoneNumber
189188
break
190189
case 'getUserInfo':
191-
wxButtonProps.getuserinfo = handleGetUserInfo
190+
wxButtonProps.onGetUserInfo = handleGetUserInfo
191+
break
192+
case 'getAuthorize':
193+
wxButtonProps.onGetAuthorize = handleGetAuthorize
194+
break
195+
case 'launchApp':
196+
wxButtonProps.onLaunchapp = handleLaunchapp
197+
wxButtonProps.onError = handleError
192198
break
193-
case 'launchApp': wxButtonProps.onLaunchapp = handleLaunchapp
194199
default:
195200
break
196201
}
@@ -215,7 +220,7 @@ const AtButton = defineComponent({
215220
sendMessageImg: props.sendMessageImg,
216221
showMessageCard: props.showMessageCard,
217222
appParameter: props.appParameter,
218-
...{ on: getWxButtonProps() }
223+
...getWxButtonProps()
219224
})
220225

221226
return () => (

0 commit comments

Comments
 (0)