Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -66,7 +66,7 @@ class ClassModel
                         $subitem = array();
                         $subitem = array();
                         $subitem['name'] = $value['category_name'];
                         $subitem['name'] = $value['category_name'];
                         $subitem['id'] = $value['relation_parameter']['sort'];
                         $subitem['id'] = $value['relation_parameter']['sort'];
-                        $subitem['url'] = $value['category_id'];
+                        $subitem['url'] = '/product/list/class?sort='.$value['relation_parameter']['sort'];
                     
                     
                         $item['sub'][] = $subitem;
                         $item['sub'][] = $subitem;
                     }
                     }

@@ -12,11 +12,18 @@ class ClassController extends AbstractAction
         $classes =  ClassModel::getClassData();
         $classes =  ClassModel::getClassData();
 
 
         $data = array(
         $data = array(
-            "searchUrl" => "",
+            'categoryPage' => true,
+            'pageHeader' => array (
+                'navBack' => true,
+                'navHome' =>  '/',
+                'navTitle' => '商品分类'
+            ),
+            'category' => array(
                 "class" => $classes
                 "class" => $classes
+            )
         );
         );
 
 
         $this->_view->assign('title', 'YOHO!有货');
         $this->_view->assign('title', 'YOHO!有货');
-        $this->_view->display('index', array('categoryPage' => true, 'category' => $data));
+        $this->_view->display('index', $data);
     }
     }
 }
 }

@@ -203,6 +203,7 @@ class ListController extends AbstractAction
                 break;
                 break;
             }
             }
             if (!empty($page) && !is_numeric($page)) {
             if (!empty($page) && !is_numeric($page)) {
+                
                 break;
                 break;
             }
             }
             if (!empty($authorId) && is_numeric($authorId)) {
             if (!empty($authorId) && is_numeric($authorId)) {
@@ -212,6 +213,7 @@ class ListController extends AbstractAction
             /* 获取资讯文章列表 */
             /* 获取资讯文章列表 */
             $uid = $this->getUid();
             $uid = $this->getUid();
             $udid = $this->getUdid();
             $udid = $this->getUdid();
+            $page = intval($page) + 1;
             $article = ListData::article($gender, $sortId, $uid, $udid, $page, $tag, $authorId); 
             $article = ListData::article($gender, $sortId, $uid, $udid, $page, $tag, $authorId); 
             if (empty($article['data']['list']['artList'])) {
             if (empty($article['data']['list']['artList'])) {
                 break;
                 break;