diff --git a/app/service/ArticleService.php b/app/service/ArticleService.php
index b647c6df7b480d7a81695b4abc863acd96606ff2..8ad1b126bb7ebcabf3e90d50a60a904439af9026 100755
--- a/app/service/ArticleService.php
+++ b/app/service/ArticleService.php
@@ -610,5 +610,36 @@ class ArticleService
             'next'  => empty($next) ? null : $next[0],
         ];
     }
+
+    /**
+     * 获取分类和所有文章
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-10-19
+     * @desc    description
+     * @param   [array]          $params [输入参数]
+     */
+    public static function ArticleCategoryListContent($params = [])
+    {
+        $data = Db::name('ArticleCategory')->field('id,name')->where(['is_enable'=>1])->order('id asc, sort asc')->select()->toArray();
+        if(!empty($data))
+        {
+            foreach($data as &$v)
+            {
+                $items = Db::name('Article')->field('id,title,title_color')->where(['article_category_id'=>$v['id'], 'is_enable'=>1])->select()->toArray();
+                if(!empty($items))
+                {
+                    foreach($items as &$vs)
+                    {
+                        // url
+                        $vs['url'] = (APPLICATION == 'web') ? MyUrl('index/article/index', ['id'=>$vs['id']]) : '/pages/article-detail/article-detail?id='.$vs['id'];
+                    }
+                }
+                $v['items'] = $items;
+            }
+        }
+        return DataReturn('处理成功', 0, $data);
+    }
 }
 ?>
\ No newline at end of file