Merge branch 'develop'

public/themes/simpleboot3/portal/article.html

@@ -17,7 +17,7 @@
             <ul class="list-group">
                 <empty name="category_child">
                     <li class="list-group-item">
-                        <a href="javascript:history.back();">返回上一级</a>
+                        <a href="{:cmf_url('list/index')}?category_id={$category_self.id}">返回上一级</a>
                     </li>
                     <else/>
                     <volist name="category_child" id="vo">

public/themes/simpleboot3/portal/list.html

@@ -17,7 +17,7 @@
             <ul class="list-group">
                 <empty name="category_child">
                     <li class="list-group-item">
-                        <a href="javascript:history.back();">返回上一级</a>
+                        <a href="{:cmf_url('list/index')}?category_id={$category_self.parent_id}">返回上一级</a>
                     </li>
                     <else/>
                     <volist name="category_child" id="vo">