Merge branch 'dev' of 47.111.118.107:/srv/git/platform

master
ELF 5 years ago
commit 0f378f2467

@ -149,7 +149,7 @@ class HomeController extends Controller
} }
if ($status == 1) { if ($status == 1) {
$downLink = 'itms-services://?action=download-manifest&url=' . "https://" . $_SERVER["HTTP_HOST"] . M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'); $downLink = 'itms-services://?action=download-manifest&url=' . "https://" . ltrim('.', $_SERVER["HTTP_HOST"] . M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'));
} else { } else {
$downLink = get_apply_dow_url($gameId, $promoteId); $downLink = get_apply_dow_url($gameId, $promoteId);
} }

@ -169,20 +169,25 @@ class UserController extends BaseController {
); );
} else { } else {
$data = array( $data = array(
'status' => 0, 'status' => 1,
'msg' => '登录成功!绑定失败', 'msg' => '登录成功!绑定失败',
); );
} }
} else {
$data = array(
'status' => 1,
'msg' => '登录成功',
);
} }
} else { } else {
$data = array( $data = array(
'status' => 0, 'status' => 1,
'msg' => '登录成功!绑定失败', 'msg' => '登录成功!绑定失败',
); );
} }
} else { } else {
$data = array( $data = array(
'status' => 0, 'status' => 1,
'msg' => '登录成功!绑定失败', 'msg' => '登录成功!绑定失败',
); );
} }

Loading…
Cancel
Save