|
@@ -368,13 +368,24 @@ class EventsController extends Controller {
|
|
|
$this->setOutput('newUserExpData', $newUserExpData);
|
|
|
|
|
|
|
|
|
+ $objEvents = new LotteryEvents ();
|
|
|
foreach ($data as $k => $v) {
|
|
|
|
|
|
if (isset($v['pic'])) {
|
|
|
$data[$k]['pic'] = explode(',', $v['pic']);
|
|
|
}
|
|
|
|
|
|
+ if ($v['events_id']) {
|
|
|
+ $d = $objEvents->findIdsBy(array('events_id' => $v['events_id']));
|
|
|
+ $t = $objLotteryUserExpress -> gets($tmpUserExpIds);
|
|
|
+ $eventsData = array_pop($t);
|
|
|
+ }
|
|
|
+
|
|
|
$type = isset($eventsData['type']) ? $eventsData['type'] : $eventsData[$v['events_id']]['type'];
|
|
|
+
|
|
|
+ if (!$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']);
|