|
@@ -137,7 +137,7 @@ class Journal_v1 extends Core
|
|
|
|
|
|
# 查看是否有排行榜
|
|
# 查看是否有排行榜
|
|
$this->data['info']['active'] = $info['top'];
|
|
$this->data['info']['active'] = $info['top'];
|
|
-
|
|
|
|
|
|
+
|
|
# 查看是否有活动
|
|
# 查看是否有活动
|
|
/*
|
|
/*
|
|
$active = Dever::db('journal/active')->one(array('id' => $info['id']));
|
|
$active = Dever::db('journal/active')->one(array('id' => $info['id']));
|
|
@@ -333,7 +333,12 @@ class Journal_v1 extends Core
|
|
{
|
|
{
|
|
$id = $this->check();
|
|
$id = $this->check();
|
|
|
|
|
|
- $this->data['top'] = Dever::load('act/lib/num')->getList($id);
|
|
|
|
|
|
+ $config_id = 20;
|
|
|
|
+ if ($id > $config_id) {
|
|
|
|
+ $this->data['top'] = Dever::load('act/lib/num')->getList($id);
|
|
|
|
+ } else {
|
|
|
|
+ $this->data['score'] = Dever::load('act/lib/score')->getList($id);
|
|
|
|
+ }
|
|
|
|
|
|
# 获取活动说明
|
|
# 获取活动说明
|
|
$this->data['active'] = Dever::db('journal/active')->one(array('id' => $id));
|
|
$this->data['active'] = Dever::db('journal/active')->one(array('id' => $id));
|