rabin 7 years ago
parent
commit
495575d6ea
2 changed files with 17 additions and 14 deletions
  1. 13 13
      content/v1/News.php
  2. 4 1
      content/v1/Video.php

+ 13 - 13
content/v1/News.php

@@ -31,7 +31,7 @@ class News extends Base
      * @apiSuccess {Object[]} cate 主栏目信息
      * @apiSuccess {Number}   cate.id  栏目id
      * @apiSuccess {String}   cate.name  栏目名称
-
+     *
      * @apiSuccess {Object[]} focus 头部焦点图信息
      * @apiSuccess {Number}   focus.id  焦点图id
      * @apiSuccess {String}   focus.name  焦点图名称
@@ -45,17 +45,17 @@ class News extends Base
      * @apiSuccess {String}   cate_child.name  栏目名称
      * @apiSuccess {Number}   cate_child.cate_id  上级栏目id
      *
-     * @apiSuccess {Object[]} cate_child.news 资讯信息
-     * @apiSuccess {Number}   cate_child.news.id  资讯id
-     * @apiSuccess {String}   cate_child.news.name  资讯标题
-     * @apiSuccess {String}   cate_child.news.content  资讯内容
-     * @apiSuccess {String}   cate_child.news.num_view  阅读数
-     * @apiSuccess {String}   cate_child.news.cdate  时间
+     * @apiSuccess {Object[]} news 资讯信息
+     * @apiSuccess {Number}   news.id  资讯id
+     * @apiSuccess {String}   news.name  资讯标题
+     * @apiSuccess {String}   news.content  资讯内容
+     * @apiSuccess {String}   news.num_view  阅读数
+     * @apiSuccess {String}   news.cdate  时间
      *
-     * @apiSuccess {Object[]} cate_child.news.author 作者信息
-     * @apiSuccess {Number}   cate_child.news.author.id  作者id
-     * @apiSuccess {String}   cate_child.news.author.name  作者姓名
-     * @apiSuccess {String}   cate_child.news.author.pic  作者头像
+     * @apiSuccess {Object[]} news.author 作者信息
+     * @apiSuccess {Number}   news.author.id  作者id
+     * @apiSuccess {String}   news.author.name  作者姓名
+     * @apiSuccess {String}   news.author.pic  作者头像
      *
      * @apiSuccessExample 操作成功
      * {"status":1,"code":1,"msg":"success","data":{"info":{"id":"1","name":"\u7279\u8272\u5c0f\u9547\u600e\u4e48\u641e","cate_id":"1","logo":"http:\/\/192.168.33.10\/plant\/data\/upload\/1\/2018\/03\/24\/1e493a87d4cdddde7fd06ad9762694d2.jpg","title":"test","pic":"http:\/\/192.168.33.10\/plant\/data\/upload\/1\/2018\/03\/24\/da31b5d54d15192fea10406f77f4b0cb.jpg","state":"1","cdate":"1521858466"},"cate":{"id":"1","name":"\u7279\u8272\u5c0f\u9547\u4e0d\u5f97\u4e0d\u5b66\u4e60\u7cfb\u5217","cate_id":"-1","reorder":"1","state":"1","cdate":"1521814022"},"cate_child":[{"id":"3","name":"\u5341\u5927\u6848\u4f8b","cate_id":"1","reorder":"1","state":"1","cdate":"1521858511","news":[{"id":"1","name":"\u4e07\u8fbe\u57ce\u521b\u65b0\u4e1a\u6001\u7814\u7a76\u62a5\u544a","pic":["http:\/\/192.168.33.10\/plant\/data\/upload\/1\/2018\/03\/24\/1e493a87d4cdddde7fd06ad9762694d2.jpg"],"top":"http:\/\/192.168.33.10\/plant\/data\/upload\/1\/2018\/03\/24\/da31b5d54d15192fea10406f77f4b0cb.jpg","cate_id":"3","info_id":"1","author_id":"1","content":"<p>\u5730\u65b9\u5927\u5e45\u5ea6\u53d1<\/p>","num_view":"0","cdate":"9\u5c0f\u65f6\u524d","author":{"id":"1","name":"\u7a0b\u8302","pic":"http:\/\/192.168.33.10\/plant\/data\/upload\/1\/2018\/03\/24\/1e493a87d4cdddde7fd06ad9762694d2.jpg","state":"1","cdate":"1521858481"}}]},{"id":"2","name":"\u5341\u5927\u680f\u76ee","cate_id":"1","reorder":"1","state":"1","cdate":"1521858505"}]},"page":{"total":"1","current_page":1,"total_page":1,"next_page":1,"prev_page":1,"html":"","status":0}}
@@ -73,13 +73,13 @@ class News extends Base
             $this->focus($this->data['cate']['id']);
 
             $this->data['cate_child'] = Dever::load('set/cate-getAll', array('option_cate_id' => $this->data['cate']['id']));
-
+            $this->data['news'] = array();
             if ($this->data['cate_child'] && isset($this->data['cate_child'][0])) {
                 $news = Dever::load('content/news-getAll', array('option_info_id' => $this->data['info']['id'], 'option_cate_id' => $this->data['cate_child'][0]['id']));
 
                 if ($news) {
                     foreach ($news as $k => $v) {
-                        $this->data['cate_child'][0]['news'][$k] = $this->one($v);
+                        $this->data['news'][$k] = $this->one($v);
                     }
                 }
             }

+ 4 - 1
content/v1/Video.php

@@ -22,7 +22,10 @@ class Video
         if (!$link) {
             $link = 'https://v.qq.com/x/page/j0515xuxz37.html';
         }
-        $key = str_replace(array('https://v.qq.com/x/page/', '.html'), '', $link);
+        $temp = explode('/page/', $link);
+        $temp = explode('.html', $temp[1]);
+        $key = $temp[0];
+        //$key = str_replace(array('https://v.qq.com/x/page/', '.html'), '', $link);
 
         $api = 'http://vv.video.qq.com/getinfo?vids='.$key.'&platform=101001&charge=0&otype=json';