...
|
...
|
@@ -406,7 +406,7 @@ class IndexController extends RestBaseController |
|
|
$work_content=db('work')->column('name');
|
|
|
// dump($people);
|
|
|
foreach ($people as $k=>$v){
|
|
|
$join1[$k]['photo']=$v['photo'];
|
|
|
$join1[$k]['photo']=cmf_get_image_url($v['photo']);
|
|
|
$join1[$k]['name']=$v['name'];
|
|
|
$join1[$k]['level']=$v['level'];
|
|
|
$join1[$k]['duty']=$work_content[$v['work_content']-1]??'';
|
...
|
...
|
@@ -531,7 +531,7 @@ class IndexController extends RestBaseController |
|
|
$people=$Join->getJoinData($id);
|
|
|
$join1=[];
|
|
|
foreach ($people as $k=>$v){
|
|
|
$join1[$k]['photo']=$v['photo'];
|
|
|
$join1[$k]['photo']=cmf_get_image_url($v['photo']);
|
|
|
$join1[$k]['name']=$v['name'];
|
|
|
$join1[$k]['level']=$v['level'];
|
|
|
}
|
...
|
...
|
@@ -566,7 +566,7 @@ class IndexController extends RestBaseController |
|
|
$this->error('您还未报名此活动');
|
|
|
}
|
|
|
if ($join['status']==3){
|
|
|
$this->error('您已经提交过了');
|
|
|
$this->error('您已经提交过了');
|
|
|
}
|
|
|
if ($join['status']==2||$join['status']==0){
|
|
|
$this->error('还没有通过审核');
|
...
|
...
|
@@ -1113,4 +1113,4 @@ class IndexController extends RestBaseController |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
\ No newline at end of file |
|
|
} |
...
|
...
|
|