Merge branch 'master' of http://git.dever.cc/project/cms

main/src/Content.php

@@ -175,7 +175,7 @@ class Content
             if ($k == 'news') {
                 $t = 1;
             } else {
-                $t = 3;
+                $t = 2;
             }
             $data = Dever::load('push/lib/data')->get('menu_' . $k, '菜单里的' . $name . '推荐列表', 4, '1,3,5');
             if (!$data) {

main/template/xuniren/home.php

@@ -138,7 +138,7 @@ $view
 
             'p' => array
             (
-                'html' => '$v.home_info',
+                'html' => '$v.info',
             ),
         ),