edit

content/lib/Base.php

@@ -66,10 +66,10 @@ class Base
      *
      * @return mixed
      */
-    protected function one($data)
+    protected function one($data, $state = 1)
     {
         $data = $this->handlePic($data);
-        if (isset($data['pic']) && $data['pic']) {
+        if ($state == 2 && isset($data['pic']) && $data['pic']) {
             $data['pic'] = explode(',', $data['pic']);
         }
         if (isset($data['video']) && $data['video']) {

content/v1/Course.php

@@ -29,7 +29,10 @@ class Course extends Base
      * @apiSuccess {Number}   course.id  听课id
      * @apiSuccess {String}   course.name  听课标题
      * @apiSuccess {String}   course.content  听课内容
+     * @apiSuccess {String}   course.pic  听课封面
+     * @apiSuccess {String}   course.top  听课详情页头图
      * @apiSuccess {String}   course.num_view  阅读数
+     * @apiSuccess {String}   course.num_watch  观看人数
      * @apiSuccess {String}   course.num_review  评论数
      * @apiSuccess {String}   course.num_up  赞数
      * @apiSuccess {String}   course.video  视频地址
@@ -83,6 +86,9 @@ class Course extends Base
      * @apiSuccess {Number}   course.id  听课id
      * @apiSuccess {String}   course.name  听课标题
      * @apiSuccess {String}   course.content  听课内容
+     * @apiSuccess {String}   course.pic  听课封面
+     * @apiSuccess {String}   course.top  听课详情页头图
+     * @apiSuccess {String}   course.num_watch  观看人数
      * @apiSuccess {String}   course.num_view  阅读数
      * @apiSuccess {String}   course.num_review  评论数
      * @apiSuccess {String}   course.num_up  赞数
@@ -111,10 +117,10 @@ class Course extends Base
         $id = Dever::input('id');
 
         if ($id > 0) {
-            $news = Dever::load('content/course-one', $id);
+            $course = Dever::load('content/course-one', $id);
 
-            if ($news) {
-                $this->data['course'] = $this->one($news);
+            if ($course) {
+                $this->data['course'] = $this->one($course);
 
                 $watch = Dever::load('comment/watch-state', array('option_info_id' => $this->data['info']['id'], 'option_course_id' => $id));
                 $this->data['course']['user'] = array();

content/v1/Meeting.php

@@ -25,14 +25,14 @@ class Meeting extends Base
      * @apiSuccess {String}   info.title  首页标题
      * @apiSuccess {String}   info.pic  首页头图
      *
-     * @apiSuccess {Object[]} focus 正在进行的听课信息
-     * @apiSuccess {Number}   focus.id  正在进行的听课id
-     * @apiSuccess {String}   focus.name  正在进行的听课标题
-     * @apiSuccess {String}   focus.num  听课人数
-     * @apiSuccess {String}   focus.sdate  听课开始时间
-     * @apiSuccess {String}   focus.edate  听课结束时间
-     * @apiSuccess {String}   focus.content  正在进行的听课内容
-     * @apiSuccess {String}   focus.num_view  正在进行的阅读数
+     * @apiSuccess {Object[]} focus 正在进行的会议信息
+     * @apiSuccess {Number}   focus.id  正在进行的会议id
+     * @apiSuccess {String}   focus.name  正在进行的会议标题
+     * @apiSuccess {String}   focus.num  会议人数
+     * @apiSuccess {String}   focus.sdate  会议开始时间
+     * @apiSuccess {String}   focus.edate  会议结束时间
+     * @apiSuccess {String}   focus.pic  会议封面
+     * @apiSuccess {String}   focus.content  正在进行的会议内容
      * @apiSuccess {String}   focus.cdate  时间
     *
      * @apiSuccess {Object[]} cate 分类信息
@@ -43,6 +43,7 @@ class Meeting extends Base
      * @apiSuccess {Number}   cate.meeting.id  会议id
      * @apiSuccess {String}   cate.meeting.name  会议标题
      * @apiSuccess {String}   cate.meeting.num  会议人数
+     * @apiSuccess {String}   cate.meeting.pic  会议封面
      * @apiSuccess {String}   cate.meeting.sdate  会议开始时间
      * @apiSuccess {String}   cate.meeting.edate  会议结束时间
      * @apiSuccess {String}   cate.meeting.content  会议内容
@@ -119,6 +120,7 @@ class Meeting extends Base
      * @apiSuccess {Number}   meeting.id  会议id
      * @apiSuccess {String}   meeting.name  会议标题
      * @apiSuccess {String}   meeting.num  会议人数
+     * @apiSuccess {String}   meeting.pic  会议封面
      * @apiSuccess {String}   meeting.sdate  会议开始时间
      * @apiSuccess {String}   meeting.edate  会议结束时间
      * @apiSuccess {String}   meeting.content  会议内容
@@ -136,7 +138,7 @@ class Meeting extends Base
 
         if ($cateid > 0) {
             $cate = Dever::load('content/meeting_cate-one', $cateid);
-
+            $this->data['meeting'] = array();
             if ($cate) {
                 $this->data['meeting'] = Dever::load('content/meeting-getOld', array('option_info_id' => $this->data['info']['id'], 'option_cate_id' => $cate['id'], 'option_end' => time()));
                 //echo Dever::sql();die;
@@ -171,14 +173,15 @@ class Meeting extends Base
      * @apiSuccess {String}   info.title  首页标题
      * @apiSuccess {String}   info.pic  首页头图
      *
-     * @apiSuccess {Object[]} cate.meeting 会议信息
-     * @apiSuccess {Number}   cate.meeting.id  会议id
-     * @apiSuccess {String}   cate.meeting.name  会议标题
-     * @apiSuccess {String}   cate.meeting.num  会议人数
-     * @apiSuccess {String}   cate.meeting.sdate  会议开始时间
-     * @apiSuccess {String}   cate.meeting.edate  会议结束时间
-     * @apiSuccess {String}   cate.meeting.content  会议内容
-     * @apiSuccess {String}   cate.meeting.cdate  时间
+     * @apiSuccess {Object[]} meeting 会议信息
+     * @apiSuccess {Number}   meeting.id  会议id
+     * @apiSuccess {String}   meeting.name  会议标题
+     * @apiSuccess {String}   meeting.num  会议人数
+     * @apiSuccess {String}   meeting.pic  会议封面
+     * @apiSuccess {String}   meeting.sdate  会议开始时间
+     * @apiSuccess {String}   meeting.edate  会议结束时间
+     * @apiSuccess {String}   meeting.content  会议内容
+     * @apiSuccess {String}   meeting.cdate  时间
      *
      * @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"},"meeting":{"id":"1","name":"\u6d4b\u8bd5","info_id":"1","desc":"\u98a0\u4e09\u5012\u56db","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\/1e493a87d4cdddde7fd06ad9762694d2.jpg","sdate":"1521734400","edate":"1537804800","content":"","reorder":"1","state":"1","cdate":"4\u5206\u949f\u524d"}}}
@@ -191,10 +194,10 @@ class Meeting extends Base
         $id = Dever::input('id');
 
         if ($id > 0) {
-            $news = Dever::load('content/meeting-one', $id);
+            $meeting = Dever::load('content/meeting-one', $id);
 
-            if ($news) {
-                $this->data['meeting'] = $this->one($news);
+            if ($meeting) {
+                $this->data['meeting'] = $this->one($meeting);
             } else {
                 Dever::alert('错误的会议id');
             }

content/v1/News.php

@@ -32,17 +32,10 @@ class News extends Base
      * @apiSuccess {Number}   cate.id  栏目id
      * @apiSuccess {String}   cate.name  栏目名称
      *
-     * @apiSuccess {Object[]} focus 头部焦点图信息
-     * @apiSuccess {Number}   focus.id  焦点图id
-     * @apiSuccess {String}   focus.name  焦点图名称
-     * @apiSuccess {String}   focus.subname  焦点图子标题
-     * @apiSuccess {String}   focus.pic  焦点图图片
-     * @apiSuccess {Number}   focus.cate_id  栏目id
-     * @apiSuccess {Number}   focus.news_id  资讯id
-     *
      * @apiSuccess {Object[]} cate_child 子栏目信息
      * @apiSuccess {Number}   cate_child.id  栏目id
      * @apiSuccess {String}   cate_child.name  栏目名称
+     * @apiSuccess {String}   cate_child.pic  栏目图片
      * @apiSuccess {Number}   cate_child.cate_id  上级栏目id
      *
      * @apiSuccess {Object[]} cate_child.news 资讯信息
@@ -76,12 +69,15 @@ 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']));
+            foreach($this->data['cate_child'] as $k => $v) {
+                $this->data['cate_child'][$k]['pic'] = $this->replacePic($v['pic']);
+            }
             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['cate_child'][0]['news'][$k] = $this->one($v, 2);
                     }
                 }
             }
@@ -148,13 +144,13 @@ class News extends Base
 
         if ($cateid > 0) {
             $cate = Dever::load('set/cate-one', $cateid);
-
+            $this->data['news'] = array();
             if ($cate) {
                 $this->data['news'] = Dever::load('content/news-getAll', array('option_info_id' => $this->data['info']['id'], 'option_cate_id' => $cate['id']));
 
                 if ($this->data['news']) {
                     foreach ($this->data['news'] as $k => $v) {
-                        $this->data['news'][$k] = $this->one($v);
+                        $this->data['news'][$k] = $this->one($v, 2);
                     }
                 }
             }
@@ -211,7 +207,7 @@ class News extends Base
             $news = Dever::load('content/news-one', $id);
 
             if ($news) {
-                $this->data['news'] = $this->one($news);
+                $this->data['news'] = $this->one($news, 2);
                 # 增加阅读量
                 Dever::load('content/news-addView', $id);
             } else {