1
1
import { h , defineComponent , computed , mergeProps , PropType } from 'vue'
2
2
import { Button , View , Form } from '@tarojs/components'
3
- import { CommonEventFunction } from "@tarojs/components/types/common"
4
- import { ButtonProps } from "@tarojs/components/types/Button"
5
3
import { AtButtonProps } from "types/button"
6
4
import AtLoading from '../loading/index'
7
5
import { getEnvs } from '../../utils/common'
@@ -164,18 +162,19 @@ const AtButton = defineComponent({
164
162
}
165
163
166
164
interface miniAppEventHandleProps {
167
- error ?: typeof props . onError
165
+ onError ?: typeof props . onError
168
166
onContact ?: typeof props . onContact
169
167
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
172
171
onLaunchapp ?: typeof props . onLaunchapp
173
172
}
174
173
175
174
function getWxButtonProps ( ) : miniAppEventHandleProps {
176
175
if ( ! props . openType ) return { }
177
176
178
- const wxButtonProps : miniAppEventHandleProps = { error : handleError }
177
+ const wxButtonProps : miniAppEventHandleProps = { }
179
178
180
179
switch ( props . openType ) {
181
180
case 'contact' :
@@ -185,12 +184,18 @@ const AtButton = defineComponent({
185
184
wxButtonProps . onOpenSetting = handleOpenSetting
186
185
break
187
186
case 'getPhoneNumber' :
188
- wxButtonProps . getphonenumber = handleGetPhoneNumber
187
+ wxButtonProps . onGetPhoneNumber = handleGetPhoneNumber
189
188
break
190
189
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
192
198
break
193
- case 'launchApp' : wxButtonProps . onLaunchapp = handleLaunchapp
194
199
default :
195
200
break
196
201
}
@@ -215,7 +220,7 @@ const AtButton = defineComponent({
215
220
sendMessageImg : props . sendMessageImg ,
216
221
showMessageCard : props . showMessageCard ,
217
222
appParameter : props . appParameter ,
218
- ...{ on : getWxButtonProps ( ) }
223
+ ...getWxButtonProps ( )
219
224
} )
220
225
221
226
return ( ) => (
0 commit comments