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

master
chenzhi 5 years ago
commit 84d55a687f

@ -131,7 +131,7 @@
window.location.href = result.url;
}, 2000);
} else {
pmsg.msg(result.msg);
pmsg.msg(result.info ? result.info : result.msg);
}
},
error:function(){

@ -34,42 +34,42 @@
<img src="{:get_img_url($vo['icon'])}" onerror="this.src='__IMG__/empty.jpg';this.onerror=null">
<span>{$vo.game_name}</span>
</div>
<if condition='$vo.and_dow_address eq "" && $vo.add_game_address eq "" && $vo.ios_dow_address eq "" && $vo.ios_game_address eq "" '>
<a class="btn disabled">立即进入</a>
<else/>
<?php $devicetype = get_device_type();?>
<eq name='devicetype' value='1'>
<eq name="vo.down_port" value="2">
<a href="{$vo['add_game_address']}" class="btn">立即进入</a>
<else />
<a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=1')}</if>" class="btn down">立即进入</a>
</eq>
<else />
<eq name='devicetype' value='2'>
<eq name="vo.down_port" value="2">
<a href="{$vo['add_game_address']}" class="btn">立即进入</a>
<else />
<a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=2')}</if>" class="btn down">立即进入</a>
</eq>
<else/>
<!-- <a url="#" class="btn disabled">下载</a> -->
<eq name="vo.sdk_version" value="1">
<eq name="vo.down_port" value="2">
<a href="{$vo['add_game_address']}" class="btn">立即进入</a>
<else />
<a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=1')}</if>" class="btn down">立即进入</a>
</eq>
</eq>
<eq name="vo.sdk_version" value="2">
<eq name="vo.down_port" value="2">
<a href="{$vo['ios_game_address']}" class="btn">立即进入</a>
<else />
<a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=2')}</if>" class="btn down">立即进入</a>
</eq>
</eq>
</eq>
</eq>
</if>
<!-- <if condition='$vo.and_dow_address eq "" && $vo.add_game_address eq "" && $vo.ios_dow_address eq "" && $vo.ios_game_address eq "" '>-->
<!-- <a class="btn disabled">立即进入</a>-->
<!-- <else/>-->
<!-- <?php $devicetype = get_device_type();?>-->
<!-- <eq name='devicetype' value='1'>-->
<!-- <eq name="vo.down_port" value="2">-->
<!-- <a href="{$vo['add_game_address']}" class="btn">立即进入</a>-->
<!-- <else />-->
<!-- <a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=1')}</if>" class="btn down">立即进入</a>-->
<!-- </eq>-->
<!-- <else />-->
<!-- <eq name='devicetype' value='2'>-->
<!-- <eq name="vo.down_port" value="2">-->
<!-- <a href="{$vo['add_game_address']}" class="btn">立即进入</a>-->
<!-- <else />-->
<!-- <a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=2')}</if>" class="btn down">立即进入</a>-->
<!-- </eq>-->
<!-- <else/>-->
<!-- &lt;!&ndash; <a url="#" class="btn disabled">下载</a> &ndash;&gt;-->
<!-- <eq name="vo.sdk_version" value="1">-->
<!-- <eq name="vo.down_port" value="2">-->
<!-- <a href="{$vo['add_game_address']}" class="btn">立即进入</a>-->
<!-- <else />-->
<!-- <a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=1')}</if>" class="btn down">立即进入</a>-->
<!-- </eq>-->
<!-- </eq>-->
<!-- <eq name="vo.sdk_version" value="2">-->
<!-- <eq name="vo.down_port" value="2">-->
<!-- <a href="{$vo['ios_game_address']}" class="btn">立即进入</a>-->
<!-- <else />-->
<!-- <a url="<if condition='$vo.dow_status eq 0'>#<else/>{:U('AjaxDown/down_file?game_id='.$vo['relation_game_id'].'&type=2')}</if>" class="btn down">立即进入</a>-->
<!-- </eq>-->
<!-- </eq>-->
<!-- </eq>-->
<!-- </eq>-->
<!-- </if>-->
<!-- <a href="{$vo['add_game_address']}">立即进入</a> -->
</div>
</div>

@ -0,0 +1,95 @@
.loginPhTwo{
width: 100%;
font-family:PingFang SC;
}
.login-box{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.login-input{
margin-top: 0.6rem;
width: 5.5rem;
height: 0.8rem;
display: flex;
align-items: center;
justify-content: center;
background:rgba(245,245,245,1);
border-radius:0.4rem;
}
.login-input>img{
width: 0.42rem;
height: 0.42rem;
}
.login-input>input{
font-size: 0.28rem;
border: 0;
outline: 0;
height: 0.6rem;
width: 4rem;
margin-left: 0.16rem;
background-color: rgba(245,245,245,1);
}
.login-input>input::placeholder{
color: #A9A9A9;
}
.login-code{
margin-top: 0.6rem;
display: flex;
align-items: center;
justify-content: center;
}
.login-code>input{
width: 3rem;
height: 0.8rem;
background-color: #F5F5F5;
border-radius: 0.4rem;
font-size: 0.28rem;
text-align: center;
border: 0;
outline: 0;
}
.login-code>input::placeholder{
text-align: center;
color: #A9A9A9;
}
.login-code>div{
width: 2.3rem;
height: 0.8rem;
background-color: #389AED;
font-size: 0.28rem;
color: #FFFFFF;
border-radius: 0.4rem;
margin-left: 0.2rem;
text-align: center;
line-height: 0.8rem;
}
.login-btn{
margin-top: 0.6rem;
width: 5.5rem;
height: 0.8rem;
background-color: #389AED;
border-radius: 0.4rem;
font-size: 0.32rem;
color: #fff;
text-align: center;
line-height: 0.8rem;
outline: 0;
border: 0;
}
.forget-text{
font-size: 0.24rem;
color: #292929;
margin-top: 0.3rem;
font-weight: 400;
text-align: center;
line-height: 0.4rem;
}
.forget-text a{
color: #389AED;
font-size: 0.24rem;
font-weight: 400;
margin-left: 0.1rem;
cursor: pointer;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Loading…
Cancel
Save