Merge branch 'hotfix/shopbase' of http://git.yoho.cn/fe/YOHOBUYWAP into hotfix/shopbase

Conflicts:
	static/dist/myohobuy/4.9.01/index.css
	static/sass/product/_shop-index.css

@@ -211,7 +211,7 @@ class ShopProcess
             }
             }
             self::$shopData['spring'][$key] = array(
             self::$shopData['spring'][$key] = array(
                 'url' => $val['data'][0]['url'],
                 'url' => $val['data'][0]['url'],
-                'springType' => str_replace('http:', '', $val['data'][0]['src']) . '?imageView/2/format/jpg/w/288/h/167/q/80'
+                'springType' => str_replace('http:', '', $val['data'][0]['src']) . '?imageView/2/format/jpg/w/275/h/160/q/80'
             );
             );
         }
         }
     }
     }

@@ -181,7 +181,7 @@
 
 
         li {
         li {
             width: 50%;
             width: 50%;
-            height: 160px;
+            height: 168px;
             float: left;
             float: left;
             text-align: center;
             text-align: center;
             list-style: none;
             list-style: none;
@@ -549,10 +549,6 @@
     .category-list-only-one-row {
     .category-list-only-one-row {
         border-top: none!important;
         border-top: none!important;
     }
     }
-
-    .category-list-last-full-row {
-        border-bottom: 1px solid #e0e0e0;
-    }
 }
 }
 
 
 .shop-index + .filter-mask {
 .shop-index + .filter-mask {

@@ -491,7 +491,7 @@ class IndexController extends AbstractAction
         $data['channel'] = $this->get('yh_channel') ? $this->get('yh_channel') : Helpers::getChannelByCookie();
         $data['channel'] = $this->get('yh_channel') ? $this->get('yh_channel') : Helpers::getChannelByCookie();
 
 
         $filter = Product\SearchModel::filter(array(
         $filter = Product\SearchModel::filter(array(
-            'shop' => $shopId,
+            'shop_id' => $shopId,
             'gender' => $data['gender'],
             'gender' => $data['gender'],
             'channel' => $data['channel'],
             'channel' => $data['channel'],
             'brand' => $data['brand']
             'brand' => $data['brand']