edit

app/collection/lib/Core.php

@@ -63,7 +63,7 @@ class Core
     # 获取内容
     protected function getOne($id)
     {
-        $info = Dever::load('collection/lib/info')->num($id);
+        $info = Dever::load('collection/lib/info')->one($id);
         if ($info) {
             $this->handle($info);
         }

app/collection/lib/Info.php

@@ -14,7 +14,7 @@ class Info
         return $info;
     }
 
-    public function num($data)
+    public function one($data)
     {
     	if (is_numeric($data)) {
     		$data = $this->get($data);

app/collection/src/Api.php

@@ -44,6 +44,33 @@ class Api extends Core
 
     # 获取首页
     public function home()
+    {
+        # 基本配置
+        $data['config'] = Dever::db('main/config')->one();
+
+        # 宣传栏推送位
+        //$data['xuanchuan'] = Dever::load('push/lib/data')->get('xuanchuan', '首页宣传栏', 3);
+
+        # 获取分享信息
+        $data['share'] = $this->getConfigShare($data['config']);
+
+        # 获取分类
+        $data['cate'] = Dever::db('main/cate')->state(array('status' => 1));
+
+        if ($data['cate']) {
+            foreach ($data['cate'] as $k => $v) {
+                $data['cate'][$k]['button'] = Dever::db('main/button')->state(array('cate_id' => $v['id'], 'status' => 1));
+                if (!$data['cate'][$k]['button']) {
+                    unset($data['cate'][$k]);
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    # 获取个人页
+    public function my()
     {
         if ($this->uid < 0) {
             $this->user['username'] = '游客';
@@ -56,48 +83,38 @@ class Api extends Core
 
         $data['row'][] = array
         (
-            'type' => 'yue',
-            'name' => $data['score']['name'],
-            'value' => $data['score']['score'],
+            $data['score']['score'],
+            '',
+            $data['score']['name'],
         );
 
         $data['row'][] = array
         (
-            'type' => 'quan',
-            'name' => '代金券',
-            'value' => 0,
+            0,
+            '',
+            '代金券',
         );
 
         $ticket = Dever::load('user/lib/ticket')->num($this->uid);
 
         $data['row'][] = array
         (
-            'type' => 'piao',
-            'name' => '门票',
-            'value' => $ticket,
+            $ticket,
+            '',
+            '门票'
         );
 
         $data['row'][] = array
         (
-            'type' => 'sw',
-            'name' => '声望',
-            'value' => 0,
+            0,
+            '',
+            '声望'
         );
 
-
-        # 基本配置
-        $data['config'] = Dever::db('main/config')->one();
-
-        # 宣传栏推送位
-        $data['xuanchuan'] = Dever::load('push/lib/data')->get('xuanchuan', '首页宣传栏', 3);
-
-        # 获取分享信息
-        $data['share'] = $this->getConfigShare($data['config']);
-
         return $data;
     }
 
-    # 我的合集列表
+    # 合集首页列表
     public function getList()
     {
         # 类型 1是全部，2是我的
@@ -109,27 +126,49 @@ class Api extends Core
             if ($data['cate']) {
                 $data['info'] = Dever::db('collection/info')->getHot(array('cate_id' => $data['cate'][0]['id']));
             }
-        } else {
+        } elseif ($this->uid > 0) { {
             # 获取我拥有的合集
-            if ($this->uid > 0) {
-                $cate = Dever::load('user/lib/collection')->getCateList($this->uid);
-                print_r($cate);die;
-                if ($cate) {
-                    $cate = array_keys($cate);
-                    $data['cate'] = Dever::db('collection/cate')->getData(array('ids' => $cate));
-                    if ($data['cate']) {
-                        $data['info'] = Dever::load('user/lib/collection')->getList($this->uid, $data['cate'][0]['id']);
-                    }
+            $cate = Dever::load('user/lib/collection')->getCateList($this->uid);
+            if ($cate) {
+                $cate = array_keys($cate);
+                $data['cate'] = Dever::db('collection/cate')->getData(array('ids' => $cate));
+                if ($data['cate']) {
+                    $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['focus'] = Dever::load('push/lib/data')->get('focus', '阅览焦点图', 5);
             }
         }
         # 获取分享信息
         $data['share'] = $this->getConfigShare();
-        print_r($data);die;
 
+        if ($data['info']) {
+            foreach ($data['info'] as $k => $v) {
+                $data['info'][$k]['id_code'] = Dever::load('collection/lib/common')->encode($v['id']);
+            }
+        }
+        return $data;
+    }
+
+    # 获取合集列表数据
+    public function getListData()
+    {
+        $cate = Dever::input('cate');
+        $type = Dever::input('type', 1);
+        $data['info'] = array();
+        if ($type == 1) {
+            $data['info'] = Dever::db('collection/info')->getHot(array('cate_id' => $cate));
+        } elseif ($this->uid > 0) {
+            # 获取我拥有的合集
+            $data['info'] = Dever::load('user/lib/collection')->getList($this->uid, $cate);
+        }
+        if ($data['info']) {
+            foreach ($data['info'] as $k => $v) {
+                $data['info'][$k]['id_code'] = Dever::load('collection/lib/common')->encode($v['id']);
+            }
+        }
         return $data;
     }