Commit 6e8463dd authored by houdong's avatar houdong

参赛bug

parent ce0dfdaa
...@@ -36,7 +36,7 @@ function baoming(userId,wwwUrl){ ...@@ -36,7 +36,7 @@ function baoming(userId,wwwUrl){
$(".mask").show(); $(".mask").show();
$("#pop1").show(); $("#pop1").show();
}else{ }else{
$.post("Vip/index/join",{},function(data){ $.post("/index/join",{},function(data){
if(data.status == 1){ if(data.status == 1){
$('#baoming').text('进入交易'); $('#baoming').text('进入交易');
$('#pop1').hide(); $('#pop1').hide();
......
...@@ -280,6 +280,14 @@ class GroupModel extends Model{ ...@@ -280,6 +280,14 @@ class GroupModel extends Model{
if(empty($group)){ if(empty($group)){
return array('status'=>1,'error'=>'参数错误'); return array('status'=>1,'error'=>'参数错误');
} }
//参加的未开赛和正在进行中的大赛如果超过10个,禁止加入,
//必须放在清缓存前面判断,否则清除缓存后还生成旧的参加大赛列表的缓存
$myCount=$this->checkMyGroupCount($user_id);
if($myCount[0]+$myCount[1]>10){
return ['status'=>1,'error'=>'你参加的未结束大赛超过10个,不能再报名'];
}
//清空缓存 //清空缓存
$this->clearGroupCache($user_id); $this->clearGroupCache($user_id);
//如果是练习组只能加入一个 //如果是练习组只能加入一个
...@@ -296,12 +304,7 @@ class GroupModel extends Model{ ...@@ -296,12 +304,7 @@ class GroupModel extends Model{
return array('status'=>1,'error'=>'您已经加入过该小组','joinStatus'=>1); return array('status'=>1,'error'=>'您已经加入过该小组','joinStatus'=>1);
} }
//参加的未开赛和正在进行中的大赛如果超过10个,禁止加入
$myCount=$this->checkMyGroupCount($user_id);
// var_dump($myCount);exit;
if($myCount[0]+$myCount[1]>10){
return ['status'=>1,'error'=>'你参加的未结束大赛超过10个,不能再报名'];
}
$res = M('UserGroup')->add( $res = M('UserGroup')->add(
array('user_id'=>$user_id, array('user_id'=>$user_id,
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="__PUBLIC__/js/clipboard.min.js" ></script> <script type="text/javascript" src="__PUBLIC__/js/clipboard.min.js" ></script>
<script type="text/javascript" src="__PUBLIC__/js/slider/js/jquery.bxslider.js"></script> <script type="text/javascript" src="__PUBLIC__/js/slider/js/jquery.bxslider.js"></script>
<script type="text/javascript" src="__PUBLIC__/js/pk.js{$Think.config.js_version}11"></script> <script type="text/javascript" src="__PUBLIC__/js/pk.js{$Think.config.js_version}11"></script>
<script src="../../../../Public/js/pk.js"></script>
</head> </head>
<body> <body>
...@@ -349,4 +350,4 @@ ...@@ -349,4 +350,4 @@
</html> </html>
<script type="text/javascript" src="__PUBLIC__/js/popad_mini_pk.js{$Think.config.js_version}"></script> <script type="text/javascript" src="__PUBLIC__/js/popad_mini_pk.js{$Think.config.js_version}"></script>
<!--userId:{$user.userID}-userName:{$user.userName}-popType:{$popType}-> <!--userId:{$user.userID}-userName:{$user.userName}-popType:{$popType}-->
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment