Merge branch 'ozq-dev' into dev

app/index/controller/TopicNas.php

@@ -263,18 +263,21 @@ class TopicNas extends Common
             ->isShow(true)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
-        dump($article_categorys->toArray());exit;
+//        dump($article_categorys->toArray());exit;
         //查询三级分类
         $article_categorys_new = [];
+        $article_categorys_two = [];
         if (!$article_categorys->isEmpty()) {
             foreach ($article_categorys as $kk=>$vv) {
-                $article_categorys_two = [];
                 if ( $parent == $vv->pid ) {
-
-                }
-
+                    array_push($article_categorys_new,$vv);
+                } else {
+                    $article_categorys_two[$vv->pid][] = $vv;
                 }
             }
+        }
+        dump($article_categorys_new);
+        dump($article_categorys_two);exit;
 
         View::assign('article_categorys', $article_categorys);