Merge branch 'develop' into 'develop'

Develop

1:加价购和赠品长度修改
2:购物车商品列表底部灰边

See merge request !66

@@ -28,9 +28,9 @@
     }
     }
 
 
     .few-tag{
     .few-tag{
-        width: 132rem / $pxConvertRem;
+        width: 148rem / $pxConvertRem;
         position: absolute;
         position: absolute;
-        left: 100rem / $pxConvertRem;
+        left: 92rem / $pxConvertRem;
         text-align: center;
         text-align: center;
         top: 75%;
         top: 75%;
         color: #fff;
         color: #fff;

@@ -5,7 +5,7 @@
 .icon-cb-checked:before { content: "\e61d"; }
 .icon-cb-checked:before { content: "\e61d"; }
 
 
 .shopping-cart-page {
 .shopping-cart-page {
-    padding-bottom: 120rem / $pxConvertRem;
+    margin-bottom: 120rem / $pxConvertRem;
     overflow-x: hidden;
     overflow-x: hidden;
     background: #f0f0f0;
     background: #f0f0f0;