Commit 27c3bee6 authored by houdong's avatar houdong

改文案

parent b6c74018
...@@ -466,7 +466,8 @@ class IndexAction extends IdentityAction { ...@@ -466,7 +466,8 @@ class IndexAction extends IdentityAction {
} }
//加入大赛 //加入大赛
// echo $ucData['user_id'];exit; // echo $ucData['user_id'];exit;
$joinRes=D('Group')->uc_join_group(['userId'=>$ucData['user_id'],'userName'=>$ucData['user_name'],'groupId'=>$groupId,'grade'=>0,'teamId'=>$groupId]); $joinRes=D('Group')->uc_join_group(['userId'=>$ucData['user_id'],'userName'=>$ucData['user_name'],
'groupId'=>$groupId,'grade'=>0,'teamId'=>$groupId]);
//钱包 //钱包
$userId=$ucData['user_id']; $userId=$ucData['user_id'];
...@@ -497,7 +498,7 @@ class IndexAction extends IdentityAction { ...@@ -497,7 +498,7 @@ class IndexAction extends IdentityAction {
if($mobile&&$joinRes['canLogin']){ if($mobile&&$joinRes['canLogin']){
$this->ajaxReturn(['status' => 1,'canLogin'=>1]); $this->ajaxReturn(['status' => 1,'canLogin'=>1]);
}else{ }else{
$this->ajaxReturn(array('status' => 0, 'info' =>$joinRes['error'],'joinStatus'=>$joinRes['joinStatus'])); $this->ajaxReturn(['status'=>0,'info'=>$joinRes['error'],'joinStatus'=>$joinRes['joinStatus'],'debug'=>$joinRes['debug']]);
} }
} }
......
...@@ -274,11 +274,11 @@ class GroupModel extends Model{ ...@@ -274,11 +274,11 @@ class GroupModel extends Model{
$teamid=$input['teamId']?$input['teamId']:$group_id; $teamid=$input['teamId']?$input['teamId']:$group_id;
if(empty($user_id) || empty($user_name)){ if(empty($user_id) || empty($user_name)){
return array('status'=>1,'error'=>'参数错误'); return ['status'=>1,'error'=>'参数错误','debug'=>'用户id或用户名是空'];
} }
$group = M('Group')->where(array('group_id'=>$group_id))->find(); $group = M('Group')->where(array('group_id'=>$group_id))->find();
if(empty($group)){ if(empty($group)){
return array('status'=>1,'error'=>'参数错误'); return ['status'=>1,'error'=>'参数错误','debug'=>'大赛id是空'];
} }
//参加的未开赛和正在进行中的大赛如果超过10个,禁止加入, //参加的未开赛和正在进行中的大赛如果超过10个,禁止加入,
......
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