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

@@ -151,7 +151,14 @@ EOL;
             }
             foreach($banners as $banner):
               $res_size = json_decode($banner['res_size'], true);
-              $height = ceil($res_size['height'] * (308 / $res_size['width']));
+              if($res_size['height'] < 308 && $res_size['width']< 308)
+              {
+                  $height = $res_size['height'];
+              }
+              else
+              {
+                  $height = ceil($res_size['height'] * (308 / $res_size['width']));
+              }
               $width = 308;
          ?>
             <div class="image-box" style="padding-bottom: 30px;">