Merge branch 'master' of http://git.huoxingkandiqiu.com:3000/scms/wonderful

journal/database/info.php

@@ -563,7 +563,7 @@ $config = array
 			),
 			'type' => 'all',
 			'order' => array('reorder' => 'desc', 'id' => 'desc'),
-			'page' => array(1, 'list'),
+			'page' => array(10, 'list'),
 			'col' => $col,
 		),
 		

main/src/Preview.php

@@ -30,7 +30,7 @@ class Preview
         $scene = -1 . ',' . $type . ',' . $id;
 
         //echo $scene;die;
-        $send['project'] = 1;
+        $send['project'] = $info['cate_id'];
         $send['send'] = $scene;
         $send['width'] = 152;
         $send['path'] = $path;