From c74777c086591d10bd10de153d0d99a47fa221a9 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 16:20:56 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/UserController.class.php    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index b1890c08..48cc9b91 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -2115,9 +2115,9 @@ class UserController extends BaseController
                 $data['age_status'] = 3;  // 未成年
             }
         } else {
-            if(M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find()) {
-                $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
-            } else {
+            // if(M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find()) {
+            //     $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
+            // } else {
                 $re = age_verify($data['idcard'], $data['real_name']);
                 switch ($re) {
 
@@ -2140,12 +2140,12 @@ class UserController extends BaseController
                     default:
 
                 }
-                if($re == 1 || $re == 2) {
-                    $arr['name'] = $data['real_name'];
-                    $arr['id_card'] = $data['idcard'];
-                    M('idcard', 'tab_')->data($arr)->add();
-                }
-            }
+            //     if($re == 1 || $re == 2) {
+            //         $arr['name'] = $data['real_name'];
+            //         $arr['id_card'] = $data['idcard'];
+            //         M('idcard', 'tab_')->data($arr)->add();
+            //     }
+            // }
 
         }
         $return = M('User', 'tab_') -> where($map) -> save($data);

From 479f96894096683b46eb358f7179e814e222b392 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 16:53:28 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=AA=97=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/GameController.class.php   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php
index 6563b1f3..58bca7db 100644
--- a/Application/Sdk/Controller/GameController.class.php
+++ b/Application/Sdk/Controller/GameController.class.php
@@ -145,15 +145,14 @@ class GameController extends BaseController{
 	 */
 	public function get_suspend(){
         $data = json_decode(base64_decode(file_get_contents("php://input")), true);
-        
         if (!isset($data['api_ver']) || $data['api_ver'] != 2) {
         	$this->get_suspend_1();
         	return ;
         }
-		if (I('debug') == 1) {
-			$data['user_id'] = 1;
-			$data['sdk_version'] = 2;
-		}
+		// if (I('debug') == 1) {
+		// 	$data['user_id'] = 1;
+		// 	$data['sdk_version'] = 2;
+		// }
         
         if(empty($data['user_id'])) {
         	re_msg(1004, 'fail', '用户不存在');
@@ -191,8 +190,8 @@ class GameController extends BaseController{
             if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign'){
                 unset($menus[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
-                $menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $user['user_token'];
-                $menus[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token'];
+                // $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
+                $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $menus[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;
@@ -228,8 +227,8 @@ class GameController extends BaseController{
             if ($data['sdk_version'] == 1 && $personalMenu[$k]['name'] == 'suppersign'){
                 unset($personalMenu[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
-                $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . 'user_token/' . $user['user_token'];
-                $personalMenu[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token'];
+                // $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . 'user_token/' . $user['user_token'];
+                $personalMenu[$k]['ios_url'] =  $v['ios_url'] . '/user_token/' . $user['user_token'] . "/game_id/".$data['game_id'];
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $personalMenu[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;
@@ -265,8 +264,8 @@ class GameController extends BaseController{
             'menus' => $menusArr,
             'mine_features' => $personalMenuArr,
         ];
-        if (I('debug') == 1)
-        	pp(($ret));
+        // if (I('debug') == 1)
+        // 	pp(($ret));
         re_msg(200,'获取成功',$ret);
     }
     

From a07d8f5817661195ec1f927c8c786f94fa5f91bf Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 17:12:14 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=AA=97=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/GameController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php
index 58bca7db..65ae8574 100644
--- a/Application/Sdk/Controller/GameController.class.php
+++ b/Application/Sdk/Controller/GameController.class.php
@@ -191,7 +191,7 @@ class GameController extends BaseController{
                 unset($menus[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
                 // $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
-                $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
+                $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . '.html?action=openurl';
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $menus[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;
@@ -228,7 +228,7 @@ class GameController extends BaseController{
                 unset($personalMenu[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
                 // $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . 'user_token/' . $user['user_token'];
-                $personalMenu[$k]['ios_url'] =  $v['ios_url'] . '/user_token/' . $user['user_token'] . "/game_id/".$data['game_id'];
+                $personalMenu[$k]['ios_url'] =  $v['ios_url'] . '/user_token/' . $user['user_token'] . '.html?action=openurl';
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $personalMenu[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;

From f16c01f794e03fee8c4f1e8c1dd8e561c2d72ff2 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 20 Nov 2019 17:28:39 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=20url=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/SpendController.class.php | 12 +++++++++---
 Application/Sdk/View/default/Spend/paycallback.html  |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 47f43037..4121cb0b 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -293,7 +293,9 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		$userToken = I('user_token');
 		$orderno = $_GET['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
 		$pay_where = substr($orderno, 0, 2);
-		$Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt");
+		// $Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt");
+		$gameId = $_GET ['game_id'];
+		$Scheme = "txgame".$gameId;
 		$map ['pay_order_number'] = $orderno;
 		$paytype = I('request.paytype', 0);  // 支付方式  weixinpay  alipay
 		$gopay = I('request.gopay');
@@ -354,6 +356,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		$this->assign ('Scheme', $Scheme);
 		$this->assign ('gopay', $gopay);
 		$this->assign ('user_token', $userToken);
+		$this->assign ('game_id', $gameId);
 		
 		$this->assign ('gopay_url', $gopayUrl);
 		$this->assign ('paystatus', $result ['pay_status']);
@@ -366,6 +369,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 	public function order_status() {
 		$userToken = I('user_token');
 		$orderno = I('orderno');
+		$gameId = I('game_id');
 		$pay_where = substr ($orderno, 0, 2);
 		$payStatus = 0;
 		$table = "spend";
@@ -376,12 +380,14 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 			$table = "deposit";
 		}
 		
-		$payStatus = M($table, "tab_")->where(['pay_order_number' => $orderno])->getField("pay_status");
+		$order = M($table, "tab_")->where(['pay_order_number' => $orderno])->find();
+		$payStatus = $order["pay_status"];
 		
 		echo json_encode([
 			'type' => $table,
 			'payStatus' => $payStatus?'1':'0',
-			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}"
+			'game_id' => $gameId,
+			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}/game_id/{$gameId}/sdk_version/{$order['sdk_version']}api_ver/2?action=pay&nav_title=%E4%BD%99%E9%A2%9D",
 		]);
 		exit();
 	}
diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html
index 9dd1a4b6..f5e2a63c 100644
--- a/Application/Sdk/View/default/Spend/paycallback.html
+++ b/Application/Sdk/View/default/Spend/paycallback.html
@@ -19,6 +19,7 @@
 	<input type="hidden" name="aliapp" class="aliapp" value="{$aliapp}">
 	<input type="hidden" name="sqzfb" class="sqzfb" value="{$sqzfb}">
 	<input type="hidden" name="user_token" class="user_token" value="{$user_token}">
+	<input type="hidden" name="game_id" class="game_id" value="{$game_id}">
 	
         <!-- <div class="close" onclick="javascript:history.go(-1);">
             <a href="javascript:">
@@ -134,6 +135,7 @@ $(function() {
 		var device=$('.device').val();
 		var Scheme=$('.Scheme').val();
 		var user_token = $('.user_token').val();
+		var game_id = $('.game_id').val();
 		
 		$.ajax({
 			type: "post",
@@ -142,6 +144,7 @@ $(function() {
 			data: {
 				'orderno' : orderno,
 				'user_token' : user_token,
+				'game_id' : game_id,
 			},
 			success: function(r) {
 				var u = navigator.userAgent;

From 88a5980c525690ee1635a1dd4884ef7cfbf4642e Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 17:33:47 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/UserController.class.php   | 28 ++++++++++++-------
 Data/update.sql                               |  8 ++++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index 48cc9b91..e63bf46f 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -2115,10 +2115,23 @@ class UserController extends BaseController
                 $data['age_status'] = 3;  // 未成年
             }
         } else {
-            // if(M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find()) {
-            //     $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
-            // } else {
+            $model = M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
+            if(!empty($model)) {
+                if($model['status'] == 1) {
+                    $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
+                } elseif ($model['status'] == 0) {
+                    $this -> set_message(1069, "fail", "用户数据不匹配");
+                }
+            } else {
+
                 $re = age_verify($data['idcard'], $data['real_name']);
+                $arr['name'] = $data['real_name'];
+                $arr['id_card'] = $data['idcard'];
+                $arr['user_id'] = $user['user_id'];
+                $arr['status'] = ($re == 1 || $re == 2 ) ? 1 : 0;
+                $arr['ip'] = get_client_ip();
+                $arr['create_time'] = time();
+                M('idcard', 'tab_')->data($arr)->add();
                 switch ($re) {
 
                     case - 1:
@@ -2140,14 +2153,9 @@ class UserController extends BaseController
                     default:
 
                 }
-            //     if($re == 1 || $re == 2) {
-            //         $arr['name'] = $data['real_name'];
-            //         $arr['id_card'] = $data['idcard'];
-            //         M('idcard', 'tab_')->data($arr)->add();
-            //     }
-            // }
-
+            }
         }
+
         $return = M('User', 'tab_') -> where($map) -> save($data);
         if ($return === false) {
             $this -> set_message(1070, "fail", "用户数据更新失败");
diff --git a/Data/update.sql b/Data/update.sql
index bdceed08..98f5bdbe 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -173,6 +173,10 @@ alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '
 CREATE TABLE `tab_idcard` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(80) NOT NULL COMMENT '姓名',
-  `id_card` varchar(20) DEFAULT NULL COMMENT '身份证号码',
+  `id_card` varchar(20) NOT NULL COMMENT '身份证号码',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `ip` varchar(40) DEFAULT NULL COMMENT 'ip地址',
+  `status` tinyint(2) DEFAULT NULL COMMENT '0 认证失败 1 认证成功',
+  `create_time` int(11) DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='正确身份证信息';
\ No newline at end of file
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';
\ No newline at end of file

From db3d679a043914cbca281089edb9d7c6daadd3c5 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 17:35:11 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/update.sql b/Data/update.sql
index 98f5bdbe..8d30cc27 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -175,8 +175,8 @@ CREATE TABLE `tab_idcard` (
   `name` varchar(80) NOT NULL COMMENT '姓名',
   `id_card` varchar(20) NOT NULL COMMENT '身份证号码',
   `user_id` int(11) NOT NULL COMMENT '用户id',
-  `ip` varchar(40) DEFAULT NULL COMMENT 'ip地址',
-  `status` tinyint(2) DEFAULT NULL COMMENT '0 认证失败 1 认证成功',
-  `create_time` int(11) DEFAULT NULL COMMENT '创建时间',
+  `ip` varchar(40) DEFAULT '0' COMMENT 'ip地址',
+  `status` tinyint(2) DEFAULT '0' COMMENT '0 认证失败 1 认证成功',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';
\ No newline at end of file
+) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';
\ No newline at end of file

From f5ff01beeb8d4e97139289972b0e3431d9a9e3d3 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 17:37:37 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/UserController.class.php   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index e63bf46f..e95ce83c 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -2115,23 +2115,23 @@ class UserController extends BaseController
                 $data['age_status'] = 3;  // 未成年
             }
         } else {
-            $model = M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
-            if(!empty($model)) {
-                if($model['status'] == 1) {
-                    $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
-                } elseif ($model['status'] == 0) {
-                    $this -> set_message(1069, "fail", "用户数据不匹配");
-                }
-            } else {
+            // $model = M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
+            // if(!empty($model)) {
+            //     if($model['status'] == 1) {
+            //         $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
+            //     } elseif ($model['status'] == 0) {
+            //         $this -> set_message(1069, "fail", "用户数据不匹配");
+            //     }
+            // } else {
 
                 $re = age_verify($data['idcard'], $data['real_name']);
-                $arr['name'] = $data['real_name'];
-                $arr['id_card'] = $data['idcard'];
-                $arr['user_id'] = $user['user_id'];
-                $arr['status'] = ($re == 1 || $re == 2 ) ? 1 : 0;
-                $arr['ip'] = get_client_ip();
-                $arr['create_time'] = time();
-                M('idcard', 'tab_')->data($arr)->add();
+                // $arr['name'] = $data['real_name'];
+                // $arr['id_card'] = $data['idcard'];
+                // $arr['user_id'] = $user['user_id'];
+                // $arr['status'] = ($re == 1 || $re == 2 ) ? 1 : 0;
+                // $arr['ip'] = get_client_ip();
+                // $arr['create_time'] = time();
+                // M('idcard', 'tab_')->data($arr)->add();
                 switch ($re) {
 
                     case - 1:
@@ -2153,7 +2153,7 @@ class UserController extends BaseController
                     default:
 
                 }
-            }
+            // }
         }
 
         $return = M('User', 'tab_') -> where($map) -> save($data);

From 2fece872d937564fd052d260ea4479d1f9bc7084 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 20 Nov 2019 18:04:18 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=20url=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/SpendController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 4121cb0b..1eac887d 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -387,7 +387,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 			'type' => $table,
 			'payStatus' => $payStatus?'1':'0',
 			'game_id' => $gameId,
-			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}/game_id/{$gameId}/sdk_version/{$order['sdk_version']}api_ver/2?action=pay&nav_title=%E4%BD%99%E9%A2%9D",
+			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}/game_id/{$gameId}/sdk_version/{$order['sdk_version']}api_ver/2", //?action=pay&nav_title=%E4%BD%99%E9%A2%9D
 		]);
 		exit();
 	}

From ab018802019c828e601ff5838de0a9c9ef472b4c Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 20 Nov 2019 18:32:59 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E5=BF=BD=E7=95=A5sdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/GameGiftController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Sdk/Controller/GameGiftController.class.php b/Application/Sdk/Controller/GameGiftController.class.php
index b1f96320..f9448c8c 100644
--- a/Application/Sdk/Controller/GameGiftController.class.php
+++ b/Application/Sdk/Controller/GameGiftController.class.php
@@ -14,6 +14,7 @@ class GameGiftController extends BaseController{
     	$gift = M("Giftbag","tab_");
         $map['game_id'] = $request['game_id'];
         $map['status']=1;
+        $map['giftbag_name'] = ['NEQ','超级签专属礼包'];
         $row = $request['row']?:10;
         $page = $request['p']?:1;
         switch ($request['sdk_version']) {