Merge pull request 'feature/jlzhtg' (#37) from feature/jlzhtg into master

Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/37

Application/Sdk/Controller/SpendController.class.php

@@ -385,9 +385,11 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		}
 		
 // 		pp($orderno);
-		$this->assign('payway', $payway);
+//		$this->assign('payway', $payway);
 		$this->assign("orderno", $orderno);
 		$this->assign("paytype", $paytype);
+        $this->assign("pay_amount", $result['cost']+$result['deduction_amount']);
+        $this->assign("goods", $result['props_name']);
 		$this->assign ('pay_url', $result['pay_url']);
 		$this->assign("sdk_version", $result['sdk_version']?:0);
 		$this->assign ('Scheme', $Scheme);

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

@@ -204,7 +204,11 @@ $(function() {
 				if (r.type == "spend") {
 			       	if (r.payStatus == '1') {
 				        if (isAndroid) {
-				        	window.txyxsdk.getPayResult('succeed');
+				        	if ("{$game_id}" == "256") {
+                                window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}"));
+                            } else {
+                                window.txyxsdk.getPayResult('succeed');
+                            }
 				        } else {
 				        	try {
 				        		window.webkit.messageHandlers.exchangeResult.postMessage(1);
@@ -214,7 +218,11 @@ $(function() {
 				        }
 			       	} else {
 			       		if (isAndroid) {
-				        	window.txyxsdk.getPayResult('fail');
+                            if ("{$game_id}" == "256") {
+                                window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}"));
+                            } else {
+                                window.txyxsdk.getPayResult('fail');
+                            }
 				        } else {
 				        	try {
 				        		window.webkit.messageHandlers.exchangeResult.postMessage(0);