dever 6 years ago
parent
commit
e52cffbb71
2 changed files with 5 additions and 2 deletions
  1. 1 1
      main/src/Journal.php
  2. 4 1
      push/lib/Data.php

+ 1 - 1
main/src/Journal.php

@@ -48,7 +48,7 @@ class Journal extends Core
     # 精选推荐更多
     public function jingxuan($page = true, $num = 4)
     {
-        $this->data['push_jingxuan'] = Dever::load('push/lib/data')->get('jingxuan', '小刊精选推荐', $num, $page);
+        $this->data['push_jingxuan'] = Dever::load('push/lib/data')->get('jingxuan', '小刊精选推荐', 4, $page, $num);
 
         $count = count($this->data['push_jingxuan']);
 

+ 4 - 1
push/lib/Data.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Data
 {
-    public function get($key, $name, $total = 10, $page = false)
+    public function get($key, $name, $total = 10, $page = false, $limit = false)
     {
         $info = Dever::db('push/info')->one(array('key' => $key));
 
@@ -24,6 +24,9 @@ class Data
             if (!$info['num']) {
                 $info['num'] = 20;
             }
+            if ($limit > 0) {
+                $info['num'] = $limit;
+            }
             if ($page) {
                 $data = Dever::db('push/data')->getAllPage(array('info_id' => $info['id'], 'page' => array($info['num'], 'list')));
             } else {