|
@@ -367,7 +367,7 @@ class EventsController extends Controller {
|
|
|
$page = Request::varGetInt ( 'page', 1 );
|
|
|
$size = $limit;
|
|
|
$offset = ($page - 1) * $size;
|
|
|
- $order = 'update_time desc';
|
|
|
+ $order = 'id desc';
|
|
|
$data = $this->objMLottery->getLotteryDataList($condition, "{$offset},{$size}", $order);
|
|
|
|
|
|
if ($data) {
|
|
@@ -424,7 +424,7 @@ class EventsController extends Controller {
|
|
|
$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) {
|
|
@@ -440,7 +440,7 @@ class EventsController extends Controller {
|
|
|
$type = isset($eventsData['type']) ? $eventsData['type'] : $eventsData[$v['events_id']]['type'];
|
|
|
|
|
|
|
|
|
- $data[$k]['user']['cdate'] = date('Y.m.d H:i', isset($v['winners_time']) ? $v['winners_time'] : $v['create_time']);
|
|
|
+ $data[$k]['user']['cdate'] = date('Y.m.d H:i', isset($v['create_time']) ? $v['create_time'] : $v['create_time']);
|
|
|
$data[$k]['user']['events'] = isset($eventsData['events_name']) ? $eventsData['events_name'] : $eventsData[$v['events_id']]['events_name'];
|
|
|
|
|
|
$data[$k]['user']['headimgurl'] = $this->getUserHead($users[$v['uid']]);
|