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

@@ -565,7 +565,7 @@
 }
 }
 
 
 .fotorama__arr--prev {
 .fotorama__arr--prev {
-    left: 80px;
+    left: 100px;
 }
 }
 
 
 .fotorama__arr--prev .fotorama__arr__arr {
 .fotorama__arr--prev .fotorama__arr__arr {
@@ -573,7 +573,7 @@
 }
 }
 
 
 .fotorama__arr--next {
 .fotorama__arr--next {
-    right: 2px!important;
+    right: 0!important;
 }
 }
 
 
 .fotorama__arr--next .fotorama__arr__arr {
 .fotorama__arr--next .fotorama__arr__arr {

app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml

@@ -44,6 +44,9 @@
             $('.header ').css('margin-bottom',imgH);
             $('.header ').css('margin-bottom',imgH);
         }else{
         }else{
             var headerH = $('.page-header').outerHeight(true);
             var headerH = $('.page-header').outerHeight(true);
+            if ($('.breadcrumbs').height()){
+                headerH -= $('.breadcrumbs').height();
+            }
             $('.columns').css('margin-top',headerH);
             $('.columns').css('margin-top',headerH);
         }
         }
     });
     });

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

@@ -3090,9 +3090,7 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
 .sparsh-mfp-wrap .fotorama__stage__shaft,fotorama__grab{
 .sparsh-mfp-wrap .fotorama__stage__shaft,fotorama__grab{
   float: right;
   float: right;
 }
 }
-.sparsh-mfp-wrap .fotorama__stage__frame .fotorama__img{
-  top: 40%;
-}
+
 .sparsh-mfp-wrap .fotorama__arr--prev{
 .sparsh-mfp-wrap .fotorama__arr--prev{
   left: 80px;
   left: 80px;
 }
 }
@@ -3129,6 +3127,15 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
     height: 1000px!important;
     height: 1000px!important;
   }
   }
 
 
+
+  .fotorama__wrap--slide .fotorama__stage__frame{
+    margin-left: 20px;
+  }
+
+  .product.media{
+    min-width: 880px!important;
+  }
+
 }
 }
 .fotorama__arr, .fotorama__thumb__arr{
 .fotorama__arr, .fotorama__thumb__arr{
   background-color: rgba(255,255,255,0.8);
   background-color: rgba(255,255,255,0.8);
@@ -3160,9 +3167,6 @@ 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";

lib/web/fotorama/fotorama.js

@@ -991,6 +991,14 @@ fotoramaVersion = '4.6.4';
     };
     };
 
 
     function fit($el, measuresToFit) {
     function fit($el, measuresToFit) {
+
+        if (measuresToFit.width){
+            measuresToFit.width =  $('.fotorama__stage').width();
+            measuresToFit.w = measuresToFit.width;
+            measuresToFit.W = measuresToFit.width;
+            measuresToFit.nw = measuresToFit.width;
+        }
+
         var elData = $el.data(),
         var elData = $el.data(),
             measures = elData.measures;
             measures = elData.measures;
 
 
@@ -2522,7 +2530,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, $('.fotorama__stage').width(), opts.margin, repositionIndex)}, o_fade && getDuration(0)));
+                toDetach[STAGE_FRAME_KEY][normalizedIndex] = $frame.css($.extend({left: o_fade ? 0 : getPosByIndex(index, measures.w, opts.margin, repositionIndex)}, o_fade && getDuration(0)));
 
 
                 if (isDetached($frame[0])) {
                 if (isDetached($frame[0])) {
                     $frame.appendTo($stageShaft);
                     $frame.appendTo($stageShaft);