|
|
@@ -75,8 +75,15 @@ class Data
|
|
|
foreach ($data['module'] as $k => $v) {
|
|
|
$where = array();
|
|
|
$where['module_id'] = $v['id'];
|
|
|
- $where['limit'] = '0,' . $v['num'];
|
|
|
- $data['module'][$k]['data'] = Dever::db('page/data')->getAll($where);
|
|
|
+ $page = Dever::input($v['key'] . '_page');
|
|
|
+ if ($page) {
|
|
|
+ $where['page'] = array($v['num'], 'list');
|
|
|
+ $data['module'][$k]['data'] = Dever::db('page/data')->getAllPage($where);
|
|
|
+ } else {
|
|
|
+ $where['limit'] = '0,' . $v['num'];
|
|
|
+ $data['module'][$k]['data'] = Dever::db('page/data')->getAll($where);
|
|
|
+ }
|
|
|
+
|
|
|
if ($data['module'][$k]['data']) {
|
|
|
foreach ($data['module'][$k]['data'] as $k1 => $v1) {
|
|
|
$data['module'][$k]['data'][$k1] = $this->getOne($v1, 2, $cdate);
|
rabin