Merge branch 'master' of http://47.99.244.21:9999/root/joshine

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

@@ -1916,7 +1916,7 @@ background-color: #000;
 }
 
 
-@media (max-width: 768px){
+@media (min-width: 768px){
   .review-list .review-details{
     width: 20%;
   }
@@ -1935,7 +1935,6 @@ background-color: #000;
   .review-list .review-item{
     flex-direction: inherit !important;
   }
-
   //显示评论统计
   .amreview-summary-details{
     display: block !important;
@@ -1943,6 +1942,23 @@ background-color: #000;
 }
 
 //产品评论form表单默认隐藏
+
+//.block.review-add.amreview-submit-form{
+//  display: none;
+//}
+//
+//.slick-track{
+//  width: 100% !important;
+//}
+//.amreview-images.slick-slider .slick-slide{
+//  width: 100px !important;
+//}
+
+.cart-container {
+  width: 81%;
+  margin: 0 auto;
+}
+
 .block.review-add.amreview-submit-form{
   display: none;
 }
@@ -1958,4 +1974,5 @@ background-color: #000;
     width: 81%;
     margin: 0 auto;
   }
-}
\ No newline at end of file
+}
+

vendor/jajuma/module-webpimages/Helper/Data.php

@@ -458,6 +458,9 @@ class Data extends AbstractHelper
      */
     public function getImageUrlFromPath($imagePath)
     {
+        if (empty($imagePath)){
+            return ;
+        }
         $systemPaths = $this->getSystemPaths();
         if (!preg_match('/^http/', $imagePath)) {
             foreach ($systemPaths as $systemPath) {