Merge branch 'ozq-dev' into dev

app/index/controller/TopicNas.php

@@ -268,20 +268,20 @@ class TopicNas extends Common
         $article_categorys_new = [];
         $article_categorys_two = [];
         if (!$article_categorys->isEmpty()) {
-            foreach ($article_categorys as $kk=>$vv) {
+            foreach ($article_categorys->toArray() as $kk=>$vv) {
-                if ( $parent == $vv->pid ) {
+                if ( $parent == $vv['pid'] ) {
                     array_push($article_categorys_new,$vv);
                 } else {
-                    $article_categorys_two[$vv->pid][] = $vv;
+                    $article_categorys_two[$vv['pid']][] = $vv;
                 }
             }
             if ( !empty($article_categorys_two) ) {
                 foreach ($article_categorys_new as &$vvv) {
-                    $vvv['child'] = isset($article_categorys_two[$vvv->id])?$article_categorys_two[$vvv->id]:'';
+                    $vvv['child'] = isset($article_categorys_two[$vvv['id']])?$article_categorys_two[$vvv['id']]:'';
                 }
             }
         }
-        dump($article_categorys_new->toArray());exit;
+        dump($article_categorys_new);exit;
 //        dump($article_categorys_two);exit;
 
         View::assign('article_categorys', $article_categorys_new);