dever 6 years ago
parent
commit
e9e2f30bf8
5 changed files with 30 additions and 10 deletions
  1. 8 8
      doc/apidoc.php
  2. 12 0
      journal/database/cate.php
  3. 1 2
      journal/database/info.php
  4. 5 0
      journal/lib/Manage.php
  5. 4 0
      main/src/Journal.php

+ 8 - 8
doc/apidoc.php

@@ -904,10 +904,10 @@
  * @apiSuccess {String}   journal.buy 小刊是否收费 1收费 2免费 3会员
  * @apiSuccess {String}   journal.bgmusic 小刊背景音乐
  *
- * @apiSuccess {Object[]} subscribe 订阅列表
- * @apiSuccess {String}   subscribe.id 
- * @apiSuccess {String}   subscribe.username 用户名
- * @apiSuccess {String}   subscribe.avatar 头像
+ * @apiSuccess {Object[]} push 主推小刊
+ * @apiSuccess {String}   push.id 小刊id
+ * @apiSuccess {String}   push.name 名称
+ * @apiSuccess {String}   push.num_ding 订阅数
  */
 
 /**
@@ -941,10 +941,10 @@
  * @apiSuccess {String}   journal.buy 小刊是否收费 1收费 2免费 3会员
  * @apiSuccess {String}   journal.bgmusic 小刊背景音乐
  *
- * @apiSuccess {Object[]} subscribe 订阅列表
- * @apiSuccess {String}   subscribe.id 
- * @apiSuccess {String}   subscribe.username 用户名
- * @apiSuccess {String}   subscribe.avatar 头像
+ * @apiSuccess {Object[]} push 主推小刊
+ * @apiSuccess {String}   push.id 小刊id
+ * @apiSuccess {String}   push.name 名称
+ * @apiSuccess {String}   push.num_ding 订阅数
  */
 
 /**

+ 12 - 0
journal/database/cate.php

@@ -17,6 +17,7 @@ $type = array
     13 => '关联直播',
 );
 
+$id = Dever::input('where_id');
 return array
 (
     # 表名
@@ -68,6 +69,17 @@ return array
             'option'    => $type,
         ),
 
+        'journal_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '主推小刊',
+            'default'   => '',
+            'desc'      => '主推小刊',
+            'match'     => 'is_numeric',
+            'update'    => $id ? 'select' : 'hidden',
+            'update_search' => 'journal/lib/manage.search_journal?cate=' . $id,
+        ),
+
         'title'      => array
         (
             'type'      => 'varchar-32',

+ 1 - 2
journal/database/info.php

@@ -506,8 +506,7 @@ return array
 			'option' => array
 			(
 				'ids' => array('yes-id', 'in'),
-				//'cate_id' => 'yes',
-				'cate_id' => 1,//暂时先只显示分类id为1的小刊
+				'cate_id' => 'yes',
 				'name' => array('yes', 'like'),
 				'id' => 'yes',
 				'state' => 1,

+ 5 - 0
journal/lib/Manage.php

@@ -68,6 +68,11 @@ class Manage
 
         $where = array();
 
+        $cate = Dever::input('cate', 1);
+        if ($cate) {
+            $where['cate_id'] = $cate;
+        }
+
         if ($yes) {
             $yes = Dever::db($table)->search(array('ids' => $yes));
         }

+ 4 - 0
main/src/Journal.php

@@ -58,6 +58,8 @@ class Journal extends Core
     {
         $cate = $this->getCate();
 
+        $this->data['push'] = Dever::db('journal/info')->one($cate['journal_id']);
+
         # 小刊列表
         $where = array();
         $where['cate_id'] = $cate['id'];
@@ -83,6 +85,8 @@ class Journal extends Core
 
         $cate = $this->getCate();
 
+        $this->data['push'] = Dever::db('journal/info')->one($cate['journal_id']);
+
         # 获取我的信息
         $this->data['user'] = Dever::load('passport/api')->info($this->data['uid']);