Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -2933,12 +2933,23 @@ div#shipping-method-buttons-container {
 }
 @media(min-width: 1024px) {
   div.product-item-info:hover {
-    padding: 7px !important; //消除鼠标经过抖动
     background: #ffffff !important;
     border: 1px solid #bbbbbb;
     position: relative;
     z-index: 9;
   }
+
+  .products.list .product-item-info:hover {
+    padding: 7px !important;
+  }
+
+  div.flash-sale-inner .product-item-info{
+    padding: 1px; //占位
+  }
+  div.flash-sale-inner .product-item-info:hover{
+    padding: 0 !important;//消除抖动
+  }
+
   .payment-method-content {
     width: 55%;
     margin-top: -6%;