From 0184892f7f125032c223e2e9ffa2ae7aff4c0ea9 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Fri, 22 Nov 2019 14:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/PayH5Controller.class.php |  2 +-
 .../Sdk/Controller/ShortcutController.class.php      |  4 ++--
 .../Sdk/View/default/Shortcut/wap_shortcut_pay.html  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 678abeb8..1d804dc3 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -380,7 +380,7 @@ class PayH5Controller extends BaseController{
         	$data['order_no'] = $request['pay_order_number'];
         	$data['paymenttype'] = "ZFBZF";
         	$data['MerRemark'] = "mark";
-        	$data['subject'] = "游戏充值";
+        	$data['subject'] = "消费-".$request["pay_order_number"];
         	$data['notifyurl'] = C('PAY_DOMAIN')."/callback.php/Notify/sq_callback";//通知
         	$data['returnurl'] = $returl;
         	$data['mchAppId'] = "wmtxkj.com";
diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php
index 2d5a3c02..a7f8dc74 100644
--- a/Application/Sdk/Controller/ShortcutController.class.php
+++ b/Application/Sdk/Controller/ShortcutController.class.php
@@ -239,8 +239,8 @@ class ShortcutController extends BaseController{
 	    			'payAmount' => $payInfo['price'],
 	    			'secret' => C('sqpay.key'),
 	    			'merOrderNo' => $payInfo['order_id'],
-	    			'NotifyURL' => "http://api.wmtxkj.cn"."/callback.php?Notify/sq_callback",
-	    			'purpose' => '游戏充值'
+	    			'NotifyURL' => C("PAY_DOMAIN")."/callback.php?Notify/sq_callback",
+	    			'purpose' => '消费-'.$payInfo['order_id']
 	    		));
 	    		//echo "发送短信==》".time()."<br>";
 	    		if ($ret['resFlag'] == 'success') {
diff --git a/Application/Sdk/View/default/Shortcut/wap_shortcut_pay.html b/Application/Sdk/View/default/Shortcut/wap_shortcut_pay.html
index 5ed3a182..7399f4f2 100644
--- a/Application/Sdk/View/default/Shortcut/wap_shortcut_pay.html
+++ b/Application/Sdk/View/default/Shortcut/wap_shortcut_pay.html
@@ -362,6 +362,9 @@
                 'extend' : $("#extend").val(),
             },
             success:function(res){
+            	if (res.code == 200) {
+            		window.location.href = res.url;
+            	}
                 // 返回列表数组，构造数据流模块
                 if(res.status == 0){
                     $("#tipmsg").html(res.info);
@@ -431,6 +434,9 @@
                 'phoneNo' : $("#phoneNo").val()
             },
             success:function(res){
+            	if (res.code == 200) {
+            		window.location.href = res.url;
+            	}
                 // 返回列表数组，构造数据流模块
                 if (res.status == 1) {
                     var time=60;
@@ -490,6 +496,9 @@
                         'signCode' : code,
                     },
                     success:function(res){
+                    	if (res.code == 200) {
+                    		window.location.href = res.url;
+                    	}
                         if (res.status == 1) {
                             $("#tipmsg").html('签约成功');
                             $("#bankdialog").hide();
@@ -546,6 +555,9 @@
                 url: "{:U('Shortcut/shortcut_pay')}" ,
                 data: $('#wfform').serialize(),
                 success: function (result) {
+                	if (res.code == 200) {
+                		window.location.href = res.url;
+                	}
                     btnpay = false;
                     //处理结果
                     if(result.status == 0){