|
@@ -126,7 +126,9 @@ class Activity extends Api |
|
@@ -126,7 +126,9 @@ class Activity extends Api |
|
126
|
->where('campus_id',$cid)
|
126
|
->where('campus_id',$cid)
|
|
127
|
->select();
|
127
|
->select();
|
|
128
|
foreach ($data as $k => $v){
|
128
|
foreach ($data as $k => $v){
|
|
129
|
- $data[$k]['holdtime'] = date('Y-m-d',$v['holdtime']);
|
129
|
+ $data[$k]['campus_title'] = db('campus')->where('id',$v['campus_id'])->value('title');
|
|
|
|
130
|
+ $data[$k]['ronda_title'] = $v['title'];
|
|
|
|
131
|
+ $data[$k]['ronda_holdtime'] = date('Y-m-d',$v['holdtime']);
|
|
130
|
$data[$k]['images'] = cdnurl($v['images'],true);
|
132
|
$data[$k]['images'] = cdnurl($v['images'],true);
|
|
131
|
$data[$k]['details'] = strip_tags($v['details']);
|
133
|
$data[$k]['details'] = strip_tags($v['details']);
|
|
132
|
}
|
134
|
}
|
