dever 6 years ago
parent
commit
37357c1f93
3 changed files with 7 additions and 5 deletions
  1. 1 1
      act/lib/Share.php
  2. 2 0
      doc/apidoc.php
  3. 4 4
      main/src/Journal.php

+ 1 - 1
act/lib/Share.php

@@ -91,7 +91,7 @@ class Share
                     if ($where['user_type'] == 1) {
                         $score = 0;
                         if ($type == 4) {
-                            $active = Dever::db('journal/active')->one(array('info_id' => $id));
+                            $active = Dever::db('journal/active')->one(array('id' => $id));
                             if ($active && $active['status'] == 1 && time() <= $active['end']) {
                                 $score = $active['invite_score'];
                             }

+ 2 - 0
doc/apidoc.php

@@ -282,6 +282,8 @@
 
  * @apiSuccess {Object[]} push_focus 焦点图
  * @apiSuccess {String}   push_focus.name 名称
+ * @apiSuccess {String}   push_focus.cate_name 栏目名称
+ * @apiSuccess {String}   push_focus.author_name 作者名称
  * @apiSuccess {String}   push_focus.pic 图片
  * @apiSuccess {String}   push_focus.type 类型,参考公共参数中的类型设置说明中的type说明
  * @apiSuccess {String}   push_focus.id 源表id,根据type计算路径,然后把这个id加上就是最终的path,小程序和app同样。如果没有id,则进入type相对应的列表。请做好判断!!

+ 4 - 4
main/src/Journal.php

@@ -109,7 +109,7 @@ class Journal extends Core
         $this->data['info']['subscribe'] = 2;
 
         # 查看是否有活动
-        $active = Dever::db('journal/active')->one(array('info_id' => $info['id']));
+        $active = Dever::db('journal/active')->one(array('id' => $info['id']));
         $this->data['info']['active'] = 2;
         if ($active && $active['status'] == 1) {
             $this->data['info']['active'] = 1;
@@ -176,7 +176,7 @@ class Journal extends Core
         $id = $this->check();
 
         # 获取购买说明
-        $buy = Dever::db('journal/buy')->one(array('info_id' => $id));
+        $buy = Dever::db('journal/buy')->one(array('id' => $id));
 
         $this->data['buy_desc'] = '';
         if ($buy) {
@@ -195,10 +195,10 @@ class Journal extends Core
         $id = $this->check();
 
         # 获取购买说明
-        $buy = Dever::db('journal/buy')->one(array('info_id' => $id));
+        $buy = Dever::db('journal/buy')->one(array('id' => $id));
 
         # 获取活动说明
-        $this->data['active'] = Dever::db('journal/active')->one(array('info_id' => $id));
+        $this->data['active'] = Dever::db('journal/active')->one(array('id' => $id));
 
         $this->data['active']['buy_title'] = '';
         $this->data['active']['buy_desc'] = '';