edit

app/collection/src/Api.php

@@ -69,7 +69,7 @@ class Api extends Core
         return $data;
     }
 
-    # 获取消息
+    # 获取消息 <block></block>
     public function msg()
     {
         $data['msg'] = array();
@@ -88,6 +88,7 @@ class Api extends Core
                         $user = $this->getUser($v['from_uid'], $this->id);
                         $data['msg'][$k]['avatar'] = $user['avatar'];
                     }
+                    $data['msg'][$k]['date'] = Dever::mdate($v['cdate']);
                 }
             }
         }
@@ -152,7 +153,7 @@ class Api extends Core
             if ($data['cate']) {
                 $data['info'] = Dever::db('collection/info')->getHot(array('cate_id' => $data['cate'][0]['id']));
             }
-        } elseif ($this->uid > 0) { {
+        } elseif ($this->uid > 0) {
             # 获取我拥有的合集
             $cate = Dever::load('user/lib/collection')->getCateList($this->uid);
             if ($cate) {
@@ -162,13 +163,26 @@ class Api extends Core
                     $data['info'] = Dever::load('user/lib/collection')->getList($this->uid, $data['cate'][0]['id']);
                 }
             }
-
-            # 焦点图
-            //$data['focus'] = Dever::load('push/lib/data')->get('focus', '阅览焦点图', 5);
-            }
         }
         # 获取分享信息
         $data['share'] = $this->getConfigShare();
+        # 焦点图
+        $data['focus'] = Dever::load('push/lib/data')->get('focus', '合小记焦点图', 5);
+        if ($data['focus']) {
+            $path = 'dream/index?id=';
+            foreach ($data['focus'] as $k => $v) {
+                if (!$v['link'] && $v['type_id'] > 0) {
+                    $data['focus'][$k]['link'] = $path . Dever::load('collection/lib/common')->encode($v['type_id']);
+                } elseif ($v['link'] && is_numeric($v['link'])) {
+                    $data['focus'][$k]['link'] = $path . Dever::load('collection/lib/common')->encode($v['link']);
+                }
+
+                $data['focus'][$k]['title'] = $v['name'];
+                $data['focus'][$k]['img'] = $v['pic'];
+                $data['focus'][$k]['url'] = $data['focus'][$k]['link'];
+                $data['focus'][$k]['opentype'] = 'click';
+            }
+        }
 
         if ($data['info']) {
             foreach ($data['info'] as $k => $v) {

package/article/index.php

@@ -0,0 +1,4 @@
+<?php 
+define('DEVER_PACKAGE', 'article');
+define('DEVER_APP_SETUP', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+include(dirname(__FILE__) . DIRECTORY_SEPARATOR . '../boot.php');