Merge branch 'feature/shop-group' into 'gray'

店铺问题修改



See merge request !1422

@@ -4,7 +4,7 @@
         <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}}class="pull-left shop-box">
             <div class="shop-img">
                 <img class="left-icon" src="{{image2 ../lefTopImg q=85}}" alt="">
-                <img src="{{image2 picture w=187 h=275 q=85}}" alt="">
+                <img src="{{image2 picture w=284 h=320 q=85}}" alt="">
             </div>
             <div class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=85}})">
                 <span class="shop-name">{{shop_name}}</span>
@@ -14,7 +14,7 @@
         <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}}class="pull-left shop-box">
             <div class="shop-img">
                 <img class="left-icon" src="{{image2 ../lefTopImg q=85}}" alt="">
-                <img src="{{image2 picture w=187 h=275 q=85}}" alt="">
+                <img src="{{image2 picture w=188 h=210 q=85}}" alt="">
             </div>
             <div class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=85}});">
                 <span class="shop-name">{{shop_name}}</span>

@@ -285,6 +285,9 @@ function shopGroupInit() {
             if (res && res.data && res.data.length) {
                 config.renderData = res.data;
 
+                // 最后店铺数量不足一行，截掉
+                res.data.length = res.data.length - (res.data.length % config.numOfOneRow);
+
                 config.renderData.forEach(shop => {
                     if (config.jump2Shop === '0' && config.linkParams) {
                         shop.href = config.linkParams.replace(/\$shop_id/gi, shop.shops_id);

@@ -114,7 +114,18 @@ $shop-width-3: 187px;
 .shop-individuation {
     &.shop-two,
     &.shop-three {
-        margin-top: 10px;
+        margin-top: 20px;
+    }
+
+    &.shop-two {
+        .shop-box {
+            margin-bottom: 20px;
+            height: auto;
+
+            .shop-img {
+                height: 320px;
+            }
+        }
     }
 
     &.shop-three {
@@ -122,11 +133,17 @@ $shop-width-3: 187px;
 
         .shop-box {
             width: 184px;
+            height: auto;
             margin-right: 8px;
+            margin-bottom: 20px;
 
             .shop-bottom-bar {
                 height: 40px;
             }
+
+            .shop-img {
+                height: 210px;
+            }
         }
 
         .shop-logo {