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

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

@@ -11,14 +11,14 @@
 </div>
 <style>
     *{ margin: 0;padding: 0;list-style: none}
-    .mask{background-color:rgba(0,0,0,0.2); width:100%; height:100%;position:fixed;top:0;left:0;z-index: 999;}
+    .mask{background-color:rgba(0,0,0,0.2); width:100%; height:100%;position:fixed;top:0;left:0;z-index: 999;
+        display: flex;
+        align-items: center;
+        justify-content: center;}
     .prompt_box{
-        width: 80%;
         background: #ffffff;
         border-radius: 6px;
         position: fixed;
-        top: 15%;
-        left: 10%;
         overflow: hidden;
         height: auto;
         padding: 10px;
@@ -47,6 +47,22 @@
             left: 0;
         }
     }
+
+    .action.towishlist{
+        text-align: center;
+        border: 1px solid #e5e5e5;
+        cursor: pointer;
+        border-radius: 50%;
+        position: relative;
+        width: 54px;
+        height: 54px;
+        line-height: 54px;
+    }
+    .towishlist::before{
+        -webkit-mask-size: 2rem 2rem;
+        width: 55px;
+        height: 55px;
+    }
 </style>
 <div class="mask hide">
     <div class="prompt_box">
@@ -64,9 +80,6 @@
         </div>
     </div>
 </div>
-
-<div  id="product-intro__freeshipping-more-3"><a href="#">Size Chart</a></div>
-
 <div style="width: 100%" class="product-view-freeshipping">
     <div class="product-intro__freeshipping product-intro__bg-none">
         <div class="product-intro__freeshipping-abt action" data-trigger="trigger-shipping">

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

@@ -6,9 +6,4 @@
 
 /** @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; ?>
\ No newline at end of file
+<?php $viewModel = $block->getData('addToCompareViewModel'); ?>
\ No newline at end of file

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

@@ -6,8 +6,33 @@
 
 /** @var $block \Magento\Catalog\Block\Product\View */
 ?>
+<div  id="product-intro__freeshipping-more-3" >
+        <a href="javascript:void(0);">Size Guide</a></span></div>
+<style>
+    #product-intro__freeshipping-more-3{
+        display: inline-block;
+        color: #2d68a8;
+        font-size: 12px;
+        line-height: 1;
+        margin-top: -10px;
+    }
+    .action.primary.tocart{
+        font-size: 18px;
+        background-color: #000;
+        max-width: 100%;
+        font-weight: 600;
+        height: 55px;
+        width: 300px;
+    }
+    @media (max-width: 780px){
+        #product-intro__freeshipping-more-3{
+            margin-top: -20px;
+            margin-bottom: 10px;
+        }
+    }
+</style>
 <?php $_product = $block->getProduct(); ?>
-<?php $buttonTitle = __('+ ADD TO CART'); ?>
+<?php $buttonTitle = __('ADD TO CART'); ?>
 <?php if ($_product->isSaleable()) :?>
 <div class="box-tocart">
     <div class="fieldset">

app/design/frontend/Joshine/breeze/Magento_Wishlist/templates/catalog/product/list/addto/wishlist.phtml

+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Magento\Wishlist\Block\Catalog\Product\ProductList\Item\AddTo\Wishlist $block */
+?>
+<?php if ($block->getWishlistHelper()->isAllow()) : ?>
+    <a href="#"
+       class="action towishlist"
+       title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
+       aria-label="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
+       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($block->getProduct()) ?>'
+       data-action="add-to-wishlist"
+       role="button">
+        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+    </a>
+<?php endif; ?>

app/design/frontend/Joshine/breeze/Magento_Wishlist/templates/catalog/product/view/addto/wishlist.phtml

+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Wishlist\Block\Catalog\Product\View\AddTo\Wishlist $block */
+?>
+<div>
+<?php if ($block->isWishListAllowed()) : ?>
+    <a href="#"
+       class="action towishlist"
+       data-post='<?= /* @noEscape */ $block->getWishlistParams() ?>'
+       data-action="add-to-wishlist"></span></a>
+<?php endif; ?>
+</div>
+<script type="text/x-magento-init">
+    {
+        "body": {
+            "addToWishlist": <?= /* @noEscape */ $block->getWishlistOptionsJson() ?>
+        }
+    }
+</script>

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

@@ -1574,6 +1574,35 @@ button.action.submit.primary {
     height: 900px;
   }
 }
+
+//选择label样式
+.swatch-attribute-label{
+  margin-right: 0.25rem;
+  font-size: 16px;
+  font-weight: 700;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+//购物车按钮样式
+.action.primary.tocart{
+  font-size: smaller;
+  background-color: #000;
+  max-width: 100%;
+  font-weight: 600;
+  height: 55px;
+  width: 300px;
+}
+
+#product-intro__freeshipping-more-3{
+  display: inline-block;
+  color: #2d68a8;
+  font-size: 12px;
+  line-height: 1;
+  margin-top: -10px;
+}
+
 //详情页mobile修改
 @media (max-width: 780px){
   .product-info-stock-sku{
@@ -1622,6 +1651,11 @@ button.action.submit.primary {
     margin-top: -20px;
   }
 
+  #product-intro__freeshipping-more-3{
+    margin-top: -20px;
+    margin-bottom: 10px;
+  }
+
 }
 .swatch-option.color, .swatch-option.text, .swatch-option.image{
   width: 40px !important;
@@ -1640,3 +1674,4 @@ button.action.submit.primary {
   display: none !important;
 }
 
+