From ef290a904e3aa62a2d3064d95023aa4fb2604b53 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 11 Mar 2020 15:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E4=B9=BE=E5=BF=AB=E6=8D=B7=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/View/default/Spend/pay_way.html     | 13 +++++++++++--
 .../Sdk/View/default/UserH/platform_pay.html        | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index 8d18ca5f..9ad3d7ee 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -74,7 +74,7 @@
                     </if>
                     
                     <if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
-                        <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
+                        <div class="payment_rest_way way_btn" data-type="sqshorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
                             <div>
                                 <img src="__IMG__/pay_way/xianshang.png" alt="">
                                 <span>快捷支付</span>
@@ -176,7 +176,7 @@
                         </if>
                     
                     <if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
-                        <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
+                        <div class="payment_rest_way way_btn" data-type="sqshorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
                             <div>
                                 <img src="__IMG__/pay_way/xianshang.png" alt="">
                                 <span>快捷支付</span>
@@ -299,6 +299,10 @@
             if(payway == "shorcut"){
                 shorcut();
             }
+            if(payway == "sqshorcut"){
+            	sqshorcut();
+            }
+            
             if(payway == "platform_pay"){
                 platform_pay();
             }
@@ -397,6 +401,11 @@
         return false;
 		// window.location.href =payurl;
     }
+    
+  	//sq快捷支付
+    function sqshorcut(){
+    	window.location.href = payurl;
+    }
     //平台币支付
     function platform_pay(){
         window.location.href = payurl;
diff --git a/Application/Sdk/View/default/UserH/platform_pay.html b/Application/Sdk/View/default/UserH/platform_pay.html
index bc2f703c..ff9632f5 100644
--- a/Application/Sdk/View/default/UserH/platform_pay.html
+++ b/Application/Sdk/View/default/UserH/platform_pay.html
@@ -68,7 +68,7 @@
                         </if>
                     </if>
                     <if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
-                        <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>$user_id,'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>0,'type'=>'platform', 'price' => $money, 'api_ver' => 2))}">
+                        <div class="payment_rest_way way_btn" data-type="sqshorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>$user_id,'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>0,'type'=>'platform', 'price' => $money, 'api_ver' => 2))}">
                             <div>
                             <img src="__IMG__/pay_way/xianshang.png" alt="">
                             <span>快捷支付</span>
@@ -164,7 +164,7 @@
                         </if>
                     </if>
                     <if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
-                        <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>$user_id,'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>0,'type'=>'platform', 'price' => $money, 'api_ver' => 2))}">
+                        <div class="payment_rest_way way_btn" data-type="sqshorcut" data-url="{:U('Shortcut/wap_shortcut_pay', array('user_id'=>$user_id,'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>0,'type'=>'platform', 'price' => $money, 'api_ver' => 2))}">
                             <div>
                             <img src="__IMG__/pay_way/xianshang.png" alt="">
                             <span>快捷支付</span>
@@ -247,6 +247,9 @@
         if(payway == "shorcut"){
             shorcut();
         }
+        if(payway == "sqshorcut"){
+            sqshorcut();
+        }
     })
     //微信支付
     function wxpay(){
@@ -332,6 +335,12 @@
       //  flag = false;
       //  window.location.href =payurl;
     }
+    
+  //快捷支付
+    function sqshorcut(){
+      flag = false;
+      window.location.href =payurl;
+    }
     $(".payment_rest_btn").click(function(){
         $(".payment_rest_btn").hide();
         $(".weixin").show();