elf
/
qy-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 into dev

Browse Source
master
ELF 5 years ago
parent cf31d4cc57 1fcf563731
commit de27e846eb
4 changed files with 59 additions and 71 deletions
Show Stats Download Patch File Download Diff File

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

@ -1011,10 +1011,10 @@ class UserController extends BaseController
if (!$invidcard) {
$this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth')));
}
$cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
if ($cardd) {
$this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
}
// $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
// if ($cardd) {
// $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
// }
}
if (C('tool_age.status') == 0) {

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

@ -42,15 +42,39 @@
</div>
<input type="hidden" id="from" name="from" value="{$from}">
<div class="popmsg pop-dialog" style="font-size: .28rem"></div>
<!-- 底部导航 -->
<div class="foot_tabbar">
<div class="foot_tabbar_box">
<div class="foot_info ">
<a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
<img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
<span>首页</span>
</a>
</div>
<div class="foot_info ">
<a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
<img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
<span>企业简介</span></a>
</div>
<div class="foot_info ">
<a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
<img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
<span>招商合作</span>
</a>
</div>
<div class="foot_info ">
<a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
<img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
<span>我的</span>
</a>
</div>
</div>
</div>
</body>
<script src="__JS__/pop.lwx.min.js"></script>
<script src="__JS__/lwx.js"></script>
<script src="__JS__/common.js"></script>
<script>
$(document).ready(function(){
$('.foot_tabbar').hide()
});
$(document).keyup(function(event){
if(event.keyCode == 13){
$('.submit').click();

29
Application/Mobile/View/User/userset.html
Unescape Escape View File

@ -138,34 +138,7 @@
</div>
</div>
</div>
<!-- 底部导航 -->
<div class="foot_tabbar">
<div class="foot_tabbar_box">
<div class="foot_info ">
<a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
<img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
<span>首页</span>
</a>
</div>
<div class="foot_info ">
<a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
<img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
<span>企业简介</span></a>
</div>
<div class="foot_info ">
<a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
<img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
<span>招商合作</span>
</a>
</div>
<div class="foot_info ">
<a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
<img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
<span>我的</span>
</a>
</div>
</div>
</div>
<div class="popmsg pop-dialog" style="font-size: .28rem;"></div>

61
Application/Sdk/View/default/Spend/pay_success.html
Unescape Escape View File

@ -137,28 +137,19 @@ $("#back_success").click(function() {
}catch(err){
} */
var Scheme=$('.Scheme').val();
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){
window.mengchuang.getPayResult('succeed');
}else{
<if condition="get_wx_type() neq 1">
window.location.href = Scheme+"://1&back";
<else/>
window.location.href = "mengchuang://showWapPayResult_btnType_?1&back";
</if>
}
// var Scheme=$('.Scheme').val();
// var orderno=$('.orderno').val();
// var u = navigator.userAgent;
// var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
// if(isAndroid){
// window.mengchuang.getPayResult('succeed');
// }else{
window.location.href = '/mobile.php?s=/User/index.html';
// }
});
$("#back_error").click(function() {
window.location.href = '/mobile.php?s=/User/index.html';
/* var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
@ -171,22 +162,22 @@ $("#back_error").click(function() {
}catch(err){
} */
var Scheme=$('.Scheme').val();
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){
window.mengchuang.getPayResult('fail');
}else{
<if condition="get_wx_type() neq 1">
if (!Scheme)
;
else
window.location.href = Scheme+"://0&back";
<else/>
window. location.href = "mengchuang://showWapPayResult_btnType_?0&back";
</if>
}
// var Scheme=$('.Scheme').val();
// var orderno=$('.orderno').val();
// var u = navigator.userAgent;
// var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
// if(isAndroid){
// window.mengchuang.getPayResult('fail');
// }else{
// <if condition="get_wx_type() neq 1">
// if (!Scheme)
// ;
// else
// window.location.href = Scheme+"://0&back";
// <else/>
// window. location.href = "mengchuang://showWapPayResult_btnType_?0&back";
// </if>
// }
});
</script>

Write Preview
Loading…
Cancel
Save