From aade4d1a019996a23b15254dc9e49c9b976ac386 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Mon, 11 Nov 2019 18:05:39 +0800
Subject: [PATCH] paycallback

---
 Application/Sdk/Controller/PayH5Controller.class.php | 1 +
 Application/Sdk/Controller/SpendController.class.php | 5 +----
 Application/Sdk/View/default/Spend/paycallback.html  | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index c718e555..eeb8e5e9 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -464,6 +464,7 @@ class PayH5Controller extends BaseController{
 		        'game_id' => $game_id,
 		        'gopay' => 1,  // 立即支付
         		'tx_client' => 'tx_forbid_return', // android 返回键
+        		'user_token' => $this->userToken,
         	))]);
         exit; 
     }
diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index ac078eca..e6f50cd0 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -299,10 +299,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		} else {
 			$this->assign("sqzfb", 0);
 		}
-		$payway = 'wxpay';
-		if ($result['pay_way'] == 1 || get_zfb_type() == 2) {
-			$payway = 'alipay';
-		}
+		
 // 		pp($orderno);
 		$this->assign('payway', $payway);
 		$this->assign("orderno", $orderno);
diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html
index 1f153314..71be64b0 100644
--- a/Application/Sdk/View/default/Spend/paycallback.html
+++ b/Application/Sdk/View/default/Spend/paycallback.html
@@ -26,15 +26,15 @@
             </a>
         </div> -->
         <div class="wxicon">
-            <eq name="payway" value="wxpay">
-            <img src="__IMG__/pay/alipay2x.png">
+            <eq name="paytype" value="weixinpay">
+            <img src="__IMG__/wxpay2x.png">
             <else />
-            <img src="__IMG__/pay/wxpay2x.png">
+            <img src="__IMG__/alipay2x.png">
             </eq>
         </div>
         <div class="paydesc">
             <div>
-            <eq name="payway" value="wxpay">
+            <eq name="paytype" value="weixinpay">
                 <p>1、如果未打开微信客户端或者未完成付款，点击“继续付款”；<br/>2、如果您已完成，请点击“已完成付款”。</p>
             <else />
                 <p>1、如果未打开支付宝客户端或者未完成付款，点击“继续付款”；<br/>2、如果您已完成，请点击“已完成付款”。</p>