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

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
-.product.media .gallery-placeholder .fotorama__stage{ left: 0 !important; }
+.product.media .gallery-placeholder .fotorama__stage{ left: 0 !important; margin-left: 20px }
 .product.media .gallery-placeholder .fotorama__nav--thumbs{float: right;}
 
 .breeze-gallery .thumbnails .item img{
@@ -3099,36 +3099,70 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
   top: 40%;
 }
 .sparsh-mfp-wrap .fotorama__arr--prev{
-  left: 95px;
+  left: 80px;
 }
 
 .sparsh-mfp-wrap .fotorama__arr--next{
-  right: 2px!important;
+  right: 0px!important;
 }
 
 .sparsh-mfp-wrap .fotorama__arr .fotorama__arr__arr{
   top: 42%!important;
 }
 
-.fotorama__nav{
-  max-height:1000px;
-}
+@media (min-width: 1024px) {
+  .gallery-placeholder .fotorama__stage__shaft {
+    height: 1000px !important;
+    width: 800px !important;
+    max-width:none!important;
+  }
 
-.product,.media .fotorama__stage{
+  .gallery-placeholder .fotorama__stage{
     max-height: 1000px;
-  max-width: 800px;
+    max-width: 880px;
+    width: 880px!important;
+    height: 1000px!important;
+  }
+
+  #sparsh-mfp-quickview .fotorama__stage__shaft{
+    height: 645px !important;
+    width: 516px !important;
+  }
+
+  .gallery-placeholder .fotorama__nav {
+    max-height: 1000px!important;
+    height: 1000px!important;
+  }
+
+}
+.fotorama__arr, .fotorama__thumb__arr{
+  background-color: rgba(255,255,255,0.8);
 }
 
 .fotorama__thumb-border{
-  border-color: #0a0a0a;
+  border-color: rgba(0,0,0,0.3);
 }
-#sparsh-mfp-quickview .fotorama__nav{
-  max-height:645px;
+
+
+#sparsh-mfp-quickview .fotorama__nav {
+  max-height: 645px!important;
+  height: 645px!important;
 }
 
-#sparsh-mfp-quickview .fotorama__stage{
-  max-height: 700px;
-  max-width: 560px;
+#sparsh-mfp-quickview .fotorama__stage {
+  max-height: 645px;
+  max-width: 600px;
+}
+
+.fotorama__nav-wrap{
+  background-color: white;
+}
+
+@media (max-width: 769px){
+  #sparsh-mfp-quickview .fotorama__nav {
+    max-height: auto !important;
+    height: auto !important;
+  }
 }
 
 /*导入Joshine工具类*/

lib/web/fotorama/fotorama.js

@@ -2231,7 +2231,7 @@ fotoramaVersion = '4.6.4';
             var isVerticalDir = (opts.navdir === 'vertical');
             var param = isVerticalDir ? $navShaft.height() : $navShaft.width();
             var mainParam = isVerticalDir ? measures.h : measures.nw;
-            navShaftTouchTail.min = Math.min(0, mainParam - param);
+            navShaftTouchTail.min = Math.min(0, $('.fotorama__nav-wrap').height() - param);
             navShaftTouchTail.max = 0;
             navShaftTouchTail.direction = opts.navdir;
             $navShaft.toggleClass(grabClass, !(navShaftTouchTail.noMove = navShaftTouchTail.min === navShaftTouchTail.max));