elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Browse Source
master
tpingzhang 5 years ago
parent f16c01f794 a07d8f5817
commit 75587d2068
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File

21
Application/Sdk/Controller/GameController.class.php
Unescape Escape View File

@ -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'] . '.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,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'] . '.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;
@ -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);
}

18
Application/Sdk/Controller/UserController.class.php
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save