Merge branch 'develop'

@@ -95,7 +95,7 @@ function thumbTouchEvt(e) {
         }, 400);
     }
 
-    myScroll.refresh();
+    myScroll && myScroll.refresh();
 }
 
 if (isIphone) {

@@ -75,7 +75,7 @@
     img {
         display: block;
         width: 100%;
-        height: 366rem / $pxConvertRem;
+        max-height: 366rem / $pxConvertRem;
     }
 
     .few-tag {

@@ -34,12 +34,13 @@
 
         .search {
             position: absolute;
-            top: 20rem / $pxConvertRem;
+            top: 16rem / $pxConvertRem;
             right: 12rem / $pxConvertRem;
             border: none;
             background: transparent;
             color: #b2b2b2;
             font-size: 32rem / $pxConvertRem;
+            line-height: 64rem / $pxConvertRem;
         }
     }
 

@@ -46,7 +46,7 @@ class ClassModel
             $oneClass = array();
             $item = array();
             foreach ($data['data'] as $k => $v) {
-                $oneClass = array('name' => ucfirst($k), 'ca' => array());
+                $oneClass = array('name' => ucfirst(rtrim($k, 's')), 'ca' => array());
                 
                 foreach ($v as $val) {
                     $item = array();

@@ -89,7 +89,7 @@ class ListModel
         // 获取品牌banner的数据, 有缓存1小时
         $bannerData = BrandData::getBrandBanner($id);
         if (isset($bannerData['data']['banner'])) {
-            $result['banner'] = Helpers::getImageUrl($bannerData['data']['banner'], 640, 75);
+            $result['banner'] = Helpers::getImageUrl($bannerData['data']['banner'], 640, 150);
         }
 
         return $result;

@@ -151,7 +151,7 @@ class InfoController extends AbstractAction
         if (!empty($detail['getArticle']['tags'])) {
             foreach ($detail['getArticle']['tags'] as $value) {
                 if (!$isApp) {
-                    $value['url'] = Helpers::url('/tags/index', array('query=' => $value['name']), 'guang');
+                    $value['url'] = Helpers::url('/tags/index', array('query' => $value['name']), 'guang');
                 }
                 $data['relatedTag'][] = $value;
             }