elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/39
master
张谷城 3 years ago
parent a686c6b216 9afcaf3997
commit 3f3fbd66a9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
Application/Sdk/Controller/SpendController.class.php
Unescape Escape View File

@ -299,6 +299,7 @@ class SpendController extends Controller {
$this->assign("paytype", 'platform'); $this->assign("paytype", 'platform');
$this->assign("pay_amount", $result['cost']+$result['deduction_amount']); $this->assign("pay_amount", $result['cost']+$result['deduction_amount']);
$this->assign("goods", $result['props_name']); $this->assign("goods", $result['props_name']);
$this->assign("order_id", $result['pay_order_number']);
$this->assign ( 'paystatus', $result ['pay_status'] ); $this->assign ( 'paystatus', $result ['pay_status'] );
$this->display ( 'pay_success3' ); $this->display ( 'pay_success3' );
@ -394,6 +395,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
$this->assign("orderno", $orderno); $this->assign("orderno", $orderno);
$this->assign("paytype", $paytype); $this->assign("paytype", $paytype);
$this->assign("pay_amount", $result['cost']+$result['deduction_amount']); $this->assign("pay_amount", $result['cost']+$result['deduction_amount']);
$this->assign("order_id", $result['pay_order_number']);
$this->assign("goods", $result['props_name']); $this->assign("goods", $result['props_name']);
$this->assign ('pay_url', $result['pay_url']); $this->assign ('pay_url', $result['pay_url']);
$this->assign("sdk_version", $result['sdk_version']?:0); $this->assign("sdk_version", $result['sdk_version']?:0);

10
Application/Sdk/View/default/Spend/pay_success3.html
Unescape Escape View File

@ -71,7 +71,7 @@ border: 1px solid #999;
try{ try{
if(isAndroid){ if(isAndroid){
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('succeed'); window.txyxsdk.getPayResult('succeed');
} }
@ -81,7 +81,7 @@ border: 1px solid #999;
}catch(err){ }catch(err){
if(isAndroid){ if(isAndroid){
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('succeed'); window.txyxsdk.getPayResult('succeed');
} }
@ -109,7 +109,7 @@ var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终
try{ try{
if(isAndroid){ if(isAndroid){
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('fail'); window.txyxsdk.getPayResult('fail');
} }
@ -156,7 +156,7 @@ $("#back_success").click(function() {
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){ if(isAndroid){
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('succeed'); window.txyxsdk.getPayResult('succeed');
} }
@ -194,7 +194,7 @@ $("#back_error").click(function() {
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){ if(isAndroid){
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('fail'); window.txyxsdk.getPayResult('fail');
} }

4
Application/Sdk/View/default/Spend/paycallback.html
Unescape Escape View File

@ -205,7 +205,7 @@ $(function() {
if (r.payStatus == '1') { if (r.payStatus == '1') {
if (isAndroid) { if (isAndroid) {
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('succeed', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('succeed'); window.txyxsdk.getPayResult('succeed');
} }
@ -219,7 +219,7 @@ $(function() {
} else { } else {
if (isAndroid) { if (isAndroid) {
if ("{$game_id}" == "256") { if ("{$game_id}" == "256") {
window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "0", 1, "{$paytype}", parseInt("{$pay_amount}")); window.txyxsdk.getPayResult('fail', "{$goods}", "{$goods}", "{$order_id}", 1, "{$paytype}", parseInt("{$pay_amount}"));
} else { } else {
window.txyxsdk.getPayResult('fail'); window.txyxsdk.getPayResult('fail');
} }

Write Preview
Loading…
Cancel
Save