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

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto/compare.phtml

@@ -6,11 +6,9 @@
 
 /** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
 ?>
-
 <?php $viewModel = $block->getData('addToCompareViewModel'); ?>
 <?php if ($viewModel->isAvailableForCompare($block->getProduct())) :?>
 <a href="#" data-post='<?= /* @noEscape */ $block->getPostDataParams() ?>'
         data-role="add-to-links"
         class="action tocompare"><span><?= $block->escapeHtml(__('Add to Compare')) ?></span></a>
-<?php endif; ?>
-
+<?php endif; ?>
\ No newline at end of file

app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml

@@ -7,13 +7,13 @@
 <div id="box">
     <ul class="list">
         <li class="current">
-            <a href="https://www.joshine.com/on-sale">
+            <a href="/on-sale">
                 <img src="/media/wysiwyg/2_1_.jpg" alt="Joshine Flash Sale" class="box-pc">
                 <img src="/media/wysiwyg/2_M_1_.jpg" alt="Joshine Flash Sale" class="box-moblie">
             </a>
         </li>
         <li>
-            <a href="https://www.joshine.com/on-sale">
+            <a href="/on-sale">
                 <img src="/media/wysiwyg/1_1_.jpg" alt="" class="box-pc">
                 <img src="/media/wysiwyg/1_M_1_.jpg" alt="" class="box-moblie">
             </a></li>
@@ -46,7 +46,6 @@
             <a href="/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/6-thongs.png" alt="" /></a>
         </div>
 
-
         <div class="shop-by-cata" >
             <a href="/shapewear/pamaleta-luggage"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
         </div>
@@ -57,23 +56,10 @@
 </div>
 
 <?php
-/**
- * Template for displaying new products widget
- *
- * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
- */
-
-// phpcs:disable Magento2.Files.LineLength.MaxExceeded
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 $type = 'widget-new-grid';
-
 $mode = 'grid';
-
 $image = 'new_products_content_widget_grid';
 ?>
-
-
 <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
     <div class="block-title">
         <strong role="heading" aria-level="2" >NEW ARRIVALS</strong>
@@ -82,8 +68,6 @@ $image = 'new_products_content_widget_grid';
         <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
         <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
             <ol class="product-items <?= /* @noEscape */ $type ?>">
-
-
                 <?php
                 $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
                 $news_ids = explode(',',"366,244,188,193");
@@ -255,7 +239,7 @@ $image = 'new_products_content_widget_grid';
                 endforeach;
                 ?>
             </div>
-            <div class="view-more-flashsale"><a href="https://www.joshine.com/flashsale-0422?product_list_order=price_low">View More</a></div>
+            <div class="view-more-flashsale"><a href="/flashsale-0422?product_list_order=price_low">View More</a></div>
         </div>
 </div>
 

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

@@ -1538,6 +1538,9 @@ margin-top: 0px;
   }
   .product-info-wrapper .page-title span.base{
     color: #999999;
+    font-size: initial;
+    float: left;
+    margin-left: -10px;
   }
 
   .product-info-wrapper .price-final_price .price {
@@ -1545,12 +1548,9 @@ margin-top: 0px;
   }
 
   .product-info-price .price-box{
-    margin-top: -35px;
+    margin-top: -30px;
   }
 
-  .product-add-form .box-tocart {
-    display: none;
-  }
   .price-final_price .old-price .price{
     color: #999999;
   }
@@ -1570,7 +1570,19 @@ margin-top: 0px;
   .product-info-wrapper .page-title-wrapper{
     margin-top: -20px;
   }
+  .swatch-option-tooltip{
+    display: none;
+  }
+
+  .product-info-wrapper .page-title-wrapper h1{
+    margin-left: 10px;
+    margin-top:10px;
+  }
+}
 
+//关闭选中颜色和尺码提示
+ .breeze .swatch-option-tooltip {
+  display: none !important;
 }
 
 

app/design/frontend/Joshine/breeze/web/js/breeze/custom.js

@@ -43,4 +43,24 @@
     },function(){
         timer = setInterval(autoPlay,3000);
     })
+
+    //产品详情调取block
+    $('#product-intro__freeshipping-more').click(function () {
+        $('.mask').removeClass('hide');
+        $('.prompt_cont.f1').css('display','block');
+    });
+    $('#product-intro__freeshipping-more-2').click(function () {
+        $('.mask').removeClass('hide');
+        $('.prompt_cont.f2').css('display','block');
+    });
+    $('#product-intro__freeshipping-more-3').click(function () {
+        $('.mask').removeClass('hide');
+        $('.prompt_cont.f3').css('display','block');
+    });
+    $('.product-intro-prompt_cancel').click(function () {
+        $('.mask').addClass('hide');
+        $('.prompt_cont.f1').css('display','none');
+        $('.prompt_cont.f2').css('display','none');
+        $('.prompt_cont.f3').css('display','none');
+    })
 })();
\ No newline at end of file