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

app/design/frontend/Joshine/breeze/Magento_Catalog/web/css/gallery.css

@@ -895,7 +895,7 @@
     max-height: 100%;
     max-height: 100%;
     max-width: 100%;
     max-width: 100%;
     position: absolute;
     position: absolute;
-    top: 45%;
+    top: 50%;
     -webkit-transform: translate3d(-50%, -50%, 0);
     -webkit-transform: translate3d(-50%, -50%, 0);
     -ms-transform: translate3d(-50%, -50%, 0);
     -ms-transform: translate3d(-50%, -50%, 0);
     -o-transform: translate3d(-50%, -50%, 0);
     -o-transform: translate3d(-50%, -50%, 0);

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

 // DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
 // DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
 // DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
 // DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
-.product.media .gallery-placeholder .fotorama__stage{ left: 0 !important; margin-left: 20px }
+.product.media .gallery-placeholder .fotorama__stage{ left: 0 !important; }
 .product.media .gallery-placeholder .fotorama__nav--thumbs{float: right;}
 .product.media .gallery-placeholder .fotorama__nav--thumbs{float: right;}
 
 
 .breeze-gallery .thumbnails .item img{
 .breeze-gallery .thumbnails .item img{
@@ -3165,6 +3165,10 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
   }
   }
 }
 }
 
 
+.fotorama__wrap--slide .fotorama__stage__frame{
+  margin-left: 20px;
+}
+
 /*导入Joshine工具类*/
 /*导入Joshine工具类*/
 @import "./_joshine_col";
 @import "./_joshine_col";
 @import "./_joshine_utils";
 @import "./_joshine_utils";

lib/web/fotorama/fotorama.js

@@ -2522,7 +2522,7 @@ fotoramaVersion = '4.6.4';
                 var normalizedIndex = normalizeIndex(index);
                 var normalizedIndex = normalizeIndex(index);
                 frameData.eq = normalizedIndex;
                 frameData.eq = normalizedIndex;
 
 
-                toDetach[STAGE_FRAME_KEY][normalizedIndex] = $frame.css($.extend({left: o_fade ? 0 : getPosByIndex(index, measures.w, opts.margin, repositionIndex)}, o_fade && getDuration(0)));
+                toDetach[STAGE_FRAME_KEY][normalizedIndex] = $frame.css($.extend({left: o_fade ? 0 : getPosByIndex(index, $('.fotorama__stage').width(), opts.margin, repositionIndex)}, o_fade && getDuration(0)));
 
 
                 if (isDetached($frame[0])) {
                 if (isDetached($frame[0])) {
                     $frame.appendTo($stageShaft);
                     $frame.appendTo($stageShaft);