From c74777c086591d10bd10de153d0d99a47fa221a9 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 20 Nov 2019 16:20:56 +0800 Subject: [PATCH 1/3] =?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 Date: Wed, 20 Nov 2019 16:53:28 +0800 Subject: [PATCH 2/3] =?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 Date: Wed, 20 Nov 2019 17:12:14 +0800 Subject: [PATCH 3/3] =?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;