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

@@ -117,8 +117,6 @@ define('mobile', function(require, exports) {
             $('body,html').animate({
             $('body,html').animate({
                 scrollTop: offsetTop
                 scrollTop: offsetTop
             });
             });
-
-
         });
         });
         $('.search-wrap').find('input').on('keyup', function(event) {
         $('.search-wrap').find('input').on('keyup', function(event) {
             var keycode = event.which;
             var keycode = event.which;
@@ -131,7 +129,7 @@ define('mobile', function(require, exports) {
         });
         });
         //获取所有品牌
         //获取所有品牌
         $(".all_brand").live("tap", function() {
         $(".all_brand").live("tap", function() {
-            $("input[type='search']").val("");
+            $("input[type='text']").val("");
             getBrand();
             getBrand();
         });
         });
         $('.search-wrap input').on('blur', function() {
         $('.search-wrap input').on('blur', function() {

@@ -27,7 +27,7 @@
                 <div class="layout-item clearfix">
                 <div class="layout-item clearfix">
                     <div class="image-box">
                     <div class="image-box">
                           <img data-original="<?php echo Lib_Images::getImageUrl($plan['pic'], 'source','fragmentimg');?>?imageView/2/w/360" 
                           <img data-original="<?php echo Lib_Images::getImageUrl($plan['pic'], 'source','fragmentimg');?>?imageView/2/w/360" 
-                            src="<?php echo Lib_Images::getImageUrl($plan['pic'], 'source','fragmentimg');?>?imageView/2/w/320" alt="" >
+                            src="<?php echo Lib_Images::getImageUrl($plan['pic'], 'source','fragmentimg');?>" alt="" >
                     </div>
                     </div>
                     <div class="content">
                     <div class="content">
                         <h2 class="volupia">
                         <h2 class="volupia">