dever 6 år sedan
förälder
incheckning
933b13c384
2 ändrade filer med 11 tillägg och 1 borttagningar
  1. 7 1
      main/src/Journal.php
  2. 4 0
      push/lib/Data.php

+ 7 - 1
main/src/Journal.php

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

+ 4 - 0
push/lib/Data.php

@@ -76,6 +76,10 @@ class Data
                         $info['pic'] = $data['pic_view_cover'];
                         $info['pic'] = $data['pic_view_cover'];
                     }
                     }
 
 
+                    if (isset($data['num_ding'])) {
+                        $info['num_ding'] = $data['num_ding'] + $data['num_add_ding'];
+                    }
+
                     if (isset($data['pdate']) && $data['pdate']) {
                     if (isset($data['pdate']) && $data['pdate']) {
                         $info['cdate'] = $data['pdate'];
                         $info['cdate'] = $data['pdate'];
                     }
                     }