|
@@ -423,6 +423,8 @@ class EventsController extends Controller {
|
|
|
if (isset($v['pic'])) {
|
|
|
$data[$k]['pic'] = explode(',', $v['pic']);
|
|
|
}
|
|
|
+ $data[$k]['user'] = array();
|
|
|
+
|
|
|
$data[$k]['user']['nickname'] = $users[$v['uid']]['nickname'];
|
|
|
$key = $v['run_time_data']['events']['forms'][1]['name'];
|
|
|
if ($key) {
|
|
@@ -437,7 +439,7 @@ class EventsController extends Controller {
|
|
|
|
|
|
$type = isset($eventsData['type']) ? $eventsData['type'] : $eventsData[$v['events_id']]['type'];
|
|
|
|
|
|
- $data[$k]['user'] = array();
|
|
|
+
|
|
|
$data[$k]['user']['cdate'] = date('Y.m.d H:i', isset($v['winners_time']) ? $v['winners_time'] : $v['create_time']);
|
|
|
$data[$k]['user']['events'] = isset($eventsData['events_name']) ? $eventsData['events_name'] : $eventsData[$v['events_id']]['events_name'];
|
|
|
|