Merge branch 'developer' into production

app/code/Magento/Checkout/Block/Cart/Shipping.php

@@ -134,7 +134,11 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
     }
     }
     public function getFlatratePrice()
     public function getFlatratePrice()
     {
     {
-        return $this->_scopeConfigInterface->getValue('carriers/flatrate/price');
+        $full_free = $this->_scopeConfigInterface->getValue('carriers/flatrate/price');
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data');
+        $price = $_helper->currency($full_free, true, false);
+        return $price;
     }
     }
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country') {
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country') {
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();

app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js

@@ -107,7 +107,7 @@ define([
                 }
                 }
                 else
                 else
                 {
                 {
-                    return this.getFormattedPrice(window.checkoutConfig.flatrate_price);
+                    return window.checkoutConfig.flatrate_price;
                 }
                 }
             }
             }
             return this.getFormattedPrice(price);
             return this.getFormattedPrice(price);
@@ -127,7 +127,7 @@ define([
                 }
                 }
                 else
                 else
                 {
                 {
-                    return '-'+this.getFormattedPrice(window.checkoutConfig.flatrate_price);
+                    return '-'+window.checkoutConfig.flatrate_price;
                 }
                 }
             }
             }
             return 0;
             return 0;

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml

@@ -102,7 +102,7 @@ $_helper = $block->getData('outputHelper');
                         $hoverImg = '';
                         $hoverImg = '';
                         foreach ($allImage as $img){
                         foreach ($allImage as $img){
                             if (basename($baseImageUrl)  != basename($img->getUrl())){
                             if (basename($baseImageUrl)  != basename($img->getUrl())){
-                                $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($img->getFile())->resize(400,500)->getUrl();
+                                $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($img->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
                                 break;
                                 break;
                             }
                             }
                         }
                         }

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

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