|
...
|
...
|
@@ -257,7 +257,7 @@ class IndexController extends RestBaseController |
|
|
|
/*是否活动结束*/
|
|
|
|
$Activity=new ActivityModel();
|
|
|
|
$activityMap['id']=$id;
|
|
|
|
$activity=$Activity->findData($activityMap);
|
|
|
|
$activity=$Activity->findData($activityMap)->toArray();
|
|
|
|
if($activity['end_time']<time()){
|
|
|
|
$is_end=1;
|
|
|
|
}else{
|
|
...
|
...
|
@@ -412,7 +412,7 @@ class IndexController extends RestBaseController |
|
|
|
$join1[$k]['duty']=$work_content[$v['work_content']-1]??'';
|
|
|
|
}
|
|
|
|
$activity['join']=$join1;
|
|
|
|
dump($activity);
|
|
|
|
|
|
|
|
$this->success('获取成功！',$activity);
|
|
|
|
}
|
|
|
|
/**
|
...
|
...
|
|
