Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/View/default/Spend/pay_way.html

@@ -221,7 +221,7 @@ function small_program(status) {
 	//alert(status);
 	if (status == 1) { // 小程序
 		if ($('#sdk_version').val() == 1) { // android
-			window.mengchuang.getSmallRoutine($('#small_json').val());
+			window.txyxsdk.getSmallRoutine($('#small_json').val());
 		} else {
 			window.webkit.messageHandlers.miniprogramPay.postMessage($('#small_json').val());
 		}
@@ -266,7 +266,7 @@ $(function() {
 					} 
 					else {
 						if ($('#sdk_version').val() == 1)
-							window.mengchuang.getZFBPay(data.url);
+							window.txyxsdk.getZFBPay(data.url);
 						else
 							window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
 					}

Application/Sdk/View/default/UserH/platform_pay.html

@@ -80,8 +80,10 @@ $(function(){
 						window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
 					} 
 					else {
-						if ($('#sdk_version').val() == 1)
-							window.mengchuang.getZFBPay(data.url);
+						var u = navigator.userAgent;
+						var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+						if (isAndroid)
+							window.txyxsdk.getZFBPay(data.url);
 						else
 							window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
 					}