Merge branch 'ozq-dev' into dev

app/index/controller/TopicNas.php

@@ -281,7 +281,7 @@ class TopicNas extends Common
                 }
             }
         }
-        dump($article_categorys_new);exit;
+//        dump($article_categorys_new);exit;
 //        dump($article_categorys_two);exit;
 
         View::assign('article_categorys', $article_categorys_new);

app/index/view/pc/topic_nas/help_detail.html

@@ -43,26 +43,24 @@
                         </div>
                         <!-- 二级-->
                         <ul class="sub-list"  {if condition='$ac.id == $Request.get.cid' }style="display: block;" {/if}>
-                            {volist name="ac.article" id="ar"}
-                            {if condition='!empty($ac.child)' }
+                            {volist name="ac.child" id="ad"}
                             <li class="two-mues">
                                 <a href="#" class="two-a">
                                     <div class="arrow"><img src="__IMAGES__/nas-jt.png" class="arrow" /></div>
-                                    <span>{$ar.title}</span>
+                                    <span>{$ad.name}</span>
                                 </a>
                                 <ul class="thress-mues">
-                                    {volist name="ar.child" id="ad"}
-                                    <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ad.id, 'id' => $ad.id])}" style="padding-top: 6px;padding-left: 30px;" {eq
-                                           name="ad.id" value="$Request.get.id" }class="active" {/eq}>{$ad.title}</a></li>
+                                    {volist name="ad.article" id="ae"}
+                                    <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ae.id, 'id' => $ae.id])}" style="padding-top: 6px;padding-left: 30px;" {eq
+                                           name="ae.id" value="$Request.get.id" }class="active" {/eq}>{$ae.title}</a></li>
                                     {/volist}
                                 </ul>
-                                 <!-- 三级-->
+                                <!-- 三级-->
                             </li>
-                            {/if}
-                            {if condition='empty($ac.child)' }
+                            {/volist}
+                            {volist name="ac.article" id="ar"}
                             <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id, 'id' => $ar.id])}" style="padding-top: 6px;" {eq
                                    name="ar.id" value="$Request.get.id" }class="active" {/eq}>{$ar.title}</a></li>
-                            {/if}
                             {/volist}
 <!--                            <li><a href="#">APP无法下载/下载失败怎么办？</a></li>-->
                         </ul>