...
|
...
|
@@ -77,6 +77,9 @@ class IndexController extends RestBaseController |
|
|
//活动
|
|
|
$activityModel = new ActivityModel();
|
|
|
$activity = $activityModel->selectDataByTime(0,2);
|
|
|
foreach ($activity as $k=>$v){
|
|
|
$activity[$k]['start_time']=date('Y-m-d',$v['start_time']);
|
|
|
}
|
|
|
// $beginAtOnce = $activityModel->beginAtOnce($activity_page,$activity_pageNum);
|
|
|
|
|
|
//新闻
|
...
|
...
|
@@ -258,6 +261,7 @@ class IndexController extends RestBaseController |
|
|
}else{
|
|
|
$is_end=0;
|
|
|
}
|
|
|
|
|
|
if ($is_end==0){
|
|
|
if ($activity['start_time']>time()){
|
|
|
$activity['activity_stage']=0;
|
...
|
...
|
@@ -318,17 +322,18 @@ class IndexController extends RestBaseController |
|
|
$check=1;
|
|
|
}
|
|
|
|
|
|
if ($is_end==1 && $check==0){
|
|
|
$status=5;
|
|
|
$title='已结束';
|
|
|
$check=1;
|
|
|
}
|
|
|
if ($is_volunteer==0 && $check==0) {
|
|
|
$status=6;
|
|
|
$check=1;
|
|
|
$title='成为志愿者';
|
|
|
}
|
|
|
|
|
|
if ($is_end==1 && $check==0){
|
|
|
$status=5;
|
|
|
$title='已结束';
|
|
|
$check=1;
|
|
|
}
|
|
|
|
|
|
|
|
|
if ($is_volunteer==1 && $check==0 && $is_pass==1 && $is_book==1){
|
|
|
$status=4;
|
...
|
...
|
|