更新 uni.requestMerchantTransfer 插件

uni_modules/uni-requestMerchantTransfer/utssdk/app-android/index.uts

 
-import { RequestMerchantTransfer, RequestMerchantTransferOption, RequestMerchantTransferGeneralCallbackResult } from '../interface.uts';
+import { RequestMerchantTransfer, RequestMerchantTransferOptions, RequestMerchantTransferGeneralCallbackResult } from '../interface.uts';
 import WXAPIFactory from 'com.tencent.mm.opensdk.openapi.WXAPIFactory'
 import URLEncoder from 'java.net.URLEncoder'
 import StandardCharsets from 'java.nio.charset.StandardCharsets'
 import WXOpenBusinessView from 'com.tencent.mm.opensdk.modelbiz.WXOpenBusinessView'
 import Build from 'com.tencent.mm.opensdk.constants.Build'
-export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOption) {
+export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOptions) {
 	var appId = options.appId
 	var api = WXAPIFactory.createWXAPI(UTSAndroid.getAppContext(), appId, false)
 	var wxSdkVersion = api.wxAppSupportAPI
@@ -33,19 +33,24 @@ export const requestMerchantTransfer : RequestMerchantTransfer = function (optio
 		req.query = query
 		// 发送请求并检查返回值
 		var ret = api.sendReq(req)
-		var result : RequestMerchantTransferGeneralCallbackResult = {
-			errMsg: 'ok'
-		}
-		console.log(query)
-		if (!ret) {
+		if (ret) {
+			var result : RequestMerchantTransferGeneralCallbackResult = {
+				errMsg: 'ok'
+			}
 			options.success?.(result)
 			options.complete?.(result)
+		}else{
+			var result : RequestMerchantTransferGeneralCallbackResult = {
+				errMsg: 'fail'
+			}
+			options.fail?.(result)
+			options.complete?.(result)
 		}
 	} else {
 		var result : RequestMerchantTransferGeneralCallbackResult = {
 			errMsg: '当前微信版本过低，请升级微信以使用该功能'
 		}
-		options.success?.(result)
+		options.fail?.(result)
 		options.complete?.(result)
 	}
 }

uni_modules/uni-requestMerchantTransfer/utssdk/app-ios/index.uts

 import { UIApplication } from "UIKit";
 import { URL, NSUserActivity, Bundle, URLComponents, URLQueryItem, Script } from "Foundation";
-import { RequestMerchantTransfer, RequestMerchantTransferOption, RequestMerchantTransferGeneralCallbackResult } from '../interface.uts';
+import { RequestMerchantTransfer, RequestMerchantTransferOptions, RequestMerchantTransferGeneralCallbackResult } from '../interface.uts';
 
-export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOption) {
+export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOptions) {
 	WxpayManager.requestMerchantTransfer(options)
 }
 
@@ -28,7 +28,7 @@ export class WxpayManagerHookProxy implements UTSiOSHookProxy {
 
 class WxpayManager implements WXApiDelegate {
 	private static shared = new WxpayManager()
-	private static options ?: RequestMerchantTransferOption
+	private static options ?: RequestMerchantTransferOptions
 
 	@UTSiOS.keyword("fileprivate")
 	static registerApp() {
@@ -60,7 +60,7 @@ class WxpayManager implements WXApiDelegate {
 				scheme = wechat!['appid'] as string | null
 			}
 		}
-
+		
 		return scheme
 	}
 
@@ -96,7 +96,7 @@ class WxpayManager implements WXApiDelegate {
 		return components.percentEncodedQuery
 	}
 
-	static requestMerchantTransfer(options : RequestMerchantTransferOption) {
+	static requestMerchantTransfer(options : RequestMerchantTransferOptions) {
 		WxpayManager.options = options
 		if (WxpayManager.isWXAppInstalled() == false) {
 			var res : RequestMerchantTransferGeneralCallbackResult = {
@@ -178,4 +178,4 @@ class WxpayManager implements WXApiDelegate {
 			WxpayManager.options?.complete?.(res)
 		}
 	}
-}
+}
\ No newline at end of file

uni_modules/uni-requestMerchantTransfer/utssdk/interface.uts

@@ -60,18 +60,18 @@ export interface Uni {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
 		}
 	*/
-	requestMerchantTransfer(options : RequestMerchantTransferOption) : void;
+	requestMerchantTransfer(options : RequestMerchantTransferOptions) : void;
 }
 
-export type RequestMerchantTransfer = (options : RequestMerchantTransferOption) => void;
-export type RequestMerchantTransferOption = {
+export type RequestMerchantTransfer = (options : RequestMerchantTransferOptions) => void;
+export type RequestMerchantTransferOptions = {
 	/**
 		商户号
 		@uniPlatform {
@@ -133,8 +133,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -202,8 +202,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -271,8 +271,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -340,8 +340,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -409,8 +409,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -478,8 +478,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -547,8 +547,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -616,8 +616,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -685,8 +685,8 @@ export type RequestMerchantTransferOption = {
 					"unixVer": "x"
 				},
 				"jd": {
-					"hostVer": "x",
-					"uniVer": "x",
+					"hostVer": "x", 
+					"uniVer": "x", 
 					"unixVer": "x"
 				}
 			}
@@ -707,4 +707,4 @@ export type RequestMerchantTransferSuccessCallback = (
 ) => void
 export type RequestMerchantTransferGeneralCallbackResult = {
 	errMsg : string
-}
+}
\ No newline at end of file