Merge branch 'develop/wap' into beta/wap

@@ -113,6 +113,11 @@ class SearchController extends AbstractAction
             $classNames = Category\ClassModel::getClassNames();
             $classNames = Category\ClassModel::getClassNames();
 
 
             do {
             do {
+                // 品类名称为空时跳出
+                if (empty($classNames)) {
+                    break;
+                }
+                
                 /* 精确查一级品类 */
                 /* 精确查一级品类 */
                 $sorts = array_keys($classNames['first'], $query, true);
                 $sorts = array_keys($classNames['first'], $query, true);
                 if (isset($sorts[0])) {
                 if (isset($sorts[0])) {