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

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

Browse Source
master
ELF 5 years ago
parent b3483d58c3 10ee809e6e
commit 6bfa70b6fe
6 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
Application/Home/View/default/Home/promitionofregestion.html
Unescape Escape View File

@ -209,7 +209,7 @@
}
} else {
if (is_ios()) {
if (!Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i))) {
if (Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i))) {
if (parseInt("{:I('get.status')}") > 0) {
location.href = "{:U('iosDown',array('gid'=>$gameId,'pid'=>I('get.pid'),'status'=>1))}";
return false;

2
Application/Mobile/Controller/UserController.class.php
Unescape Escape View File

@ -307,8 +307,6 @@ class UserController extends BaseController {
}
$register_way = 4;
$register_type = 2;
switch ($sex) {

4
Application/Mobile/View/User/login.html
Unescape Escape View File

@ -28,11 +28,15 @@
<body class="unlr">
<header class="header login-header">
<div class="">
<if condition="I('get.pid') gt 0">
<a href="javascript:;history.back(-1)" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
<else/>
<if condition="I('get.back') neq ''">
<a href="javascript:;history.go('{:I('get.back')}')" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
<else/>
<a href="{:U('user')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
</if>
</if>
<h1 class="caption">用户登录</h1>
</div>
</header>

4
Application/Mobile/View/User/register.html
Unescape Escape View File

@ -20,7 +20,11 @@
<body class="unlr">
<header class="header forget-header">
<div class="">
<if condition="I('get.pid') gt 0">
<a href="{:U('login',array('pid'=>I('get.pid'),'gid'=>I('get.gid')))}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
<else/>
<a href="{:U('login')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
</if>
<h1 class="caption">注册</h1>
</div>
</header>

4
Application/Mobile/View/User/step.html
Unescape Escape View File

@ -20,7 +20,11 @@
<body class="unlr">
<header class="header forget-header">
<div class="">
<if condition="I('get.pid') gt 0">
<a href="{:U('login',array('pid'=>I('get.pid'),'gid'=>I('get.gid')))}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
<else/>
<a href="{:U('login')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
</if>
<h1 class="caption">注册</h1>
</div>
</header>

4
Application/Mobile/View/User/step1.html
Unescape Escape View File

@ -20,7 +20,11 @@
<body class="unlr">
<header class="header forget-header">
<div class="">
<if condition="I('get.pid') gt 0">
<a href="{:U('login',array('pid'=>I('get.pid'),'gid'=>I('get.gid')))}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
<else/>
<a href="{:U('login')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
</if>
<h1 class="caption">账号注册</h1>
</div>
</header>

Write Preview
Loading…
Cancel
Save