Skip to content

J
joshine
Commit 9e71887d by liumengfei
Options

Merge branch 'developer' into production

parents 5c845a5c 911917cb
Showing with 107 additions and 45 deletions
app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
...@@ -238,6 +238,12 @@ define([ ...@@ -238,6 +238,12 @@ define([
is_mobile: function(){ is_mobile: function(){
return window.matchMedia("(pointer:coarse)").matches; return window.matchMedia("(pointer:coarse)").matches;
}, },
flatrate_price: function(){
return window.checkoutConfig.flatrate_price;
},
free_price: function(){
return window.checkoutConfig.free_price;
},
full_free_ship: function(){ full_free_ship: function(){
return window.checkoutConfig.full_free_ship; return window.checkoutConfig.full_free_ship;
}, },
......
app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
...@@ -34,12 +34,25 @@ ...@@ -34,12 +34,25 @@
</span> </span>
<!-- /ko --> <!-- /ko -->
<span class="col col-method" <span class="col col-method col-style"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></span> text="method.method_title"></span>
<span class="col col-carrier" <span class="col col-carrier col-style"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></span> text="method.carrier_title"></span>
<!-- ko if: (method.amount) -->
<span class="col col-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<span class="col col-amount col-free-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.free_price()"></span>
<span class="col col-amount col-elide-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
</div> </div>
<!-- ko if: (method.amount) --> <!-- ko if: (method.amount) -->
<div class="method-msg"> <div class="method-msg">
...@@ -99,12 +112,25 @@ ...@@ -99,12 +112,25 @@
</span> </span>
<!-- /ko --> <!-- /ko -->
<span class="col col-method" <span class="col col-method col-style"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></span> text="method.method_title"></span>
<span class="col col-carrier" <span class="col col-carrier col-style"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></span> text="method.carrier_title"></span>
<!-- ko if: (method.amount) -->
<span class="col col-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<span class="col col-amount col-free-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.free_price()"></span>
<span class="col col-amount col-elide-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
</div> </div>
<!-- ko if: (method.amount) --> <!-- ko if: (method.amount) -->
<div class="method-msg"> <div class="method-msg">
...@@ -123,7 +149,7 @@ ...@@ -123,7 +149,7 @@
10-15 Working Days</span> 10-15 Working Days</span>
</span> </span>
</div> </div>
<!-- /ko --> <!-- /ko -->
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
$('.swatch-opt').on('swatch.initialized',function(){ $('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action')); }) $('.swatch-opt').on('swatch.initialized',function(){ $('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action')); })
if($('.swatch-attribute.size .swatch-attribute-selected-option').length > 0){ if($('.swatch-attribute.size .swatch-attribute-selected-option').length > 0){
$('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action')); $('.swatch-attribute.size .swatch-attribute-selected-option').after(" : " + $('.sizechart.action'));
}else{ }else{
$('.product-options-wrapper').after($('.sizechart.action')); $('.product-options-wrapper').after($('.sizechart.action'));
} }
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</div> </div>
<style> <style>
.joshine-desction{ .joshine-desction,.product-view-description{
width:100%; width:100%;
} }
...@@ -196,14 +196,9 @@ ...@@ -196,14 +196,9 @@
.product-view-description{ .product-view-description{
max-height: 450px; max-height: 450px;
overflow: auto; overflow: auto;
width: 100%;
} }
} }
span.swatch-attribute-selected-option{
margin-left: 20px;
color: cornflowerblue;
}
</style> </style>
<div class="product-view-description"> <div class="product-view-description">
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
...@@ -168,16 +168,15 @@ ...@@ -168,16 +168,15 @@
<div id="areaMask" class="mask"></div> <div id="areaMask" class="mask"></div>
</li> </li>
<style> <style>
#product-intro__freeshipping-more-3{
display: revert;
color: #2d68a;
font-size: large;
float: right;
margin-top: 0px;
text-decoration: underline;
}
@media (min-width: 1024px){ @media (min-width: 1024px){
#product-intro__freeshipping-more-3{
display: inline-block;
display: inline-block;
color: #2d68a;
font-size: 12px;
line-height: 1;
float: right;
margin-top: 10px;
}
.action.primary.tocart{ .action.primary.tocart{
font-size: 18px; font-size: 18px;
background-color: #000; background-color: #000;
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -13,6 +13,7 @@ $flatraPrice = $block->getFlatratePrice(); ...@@ -13,6 +13,7 @@ $flatraPrice = $block->getFlatratePrice();
$full_free = $block->getFullFreeShip(); $full_free = $block->getFullFreeShip();
$_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data'); $_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data');
$full_free_ship = $_helper->currency($full_free, true, false); $full_free_ship = $_helper->currency($full_free, true, false);
$free_price = $_helper->currency(0, true, false);
?> ?>
<style type="text/css"> <style type="text/css">
.payment-method._active{ .payment-method._active{
...@@ -92,6 +93,9 @@ $full_free_ship = $_helper->currency($full_free, true, false); ...@@ -92,6 +93,9 @@ $full_free_ship = $_helper->currency($full_free, true, false);
.opc-block-summary{ .opc-block-summary{
padding: 15px; padding: 15px;
} }
.checkout-index-index .col-elide-amount{
text-decoration:line-through;
}
.action.action-auth-toggle{ .action.action-auth-toggle{
background: none; background: none;
color: #000; color: #000;
...@@ -438,6 +442,12 @@ $full_free_ship = $_helper->currency($full_free, true, false); ...@@ -438,6 +442,12 @@ $full_free_ship = $_helper->currency($full_free, true, false);
.checkout-cart-index .opc-estimated-wrapper .minicart-wrapper { .checkout-cart-index .opc-estimated-wrapper .minicart-wrapper {
display: none; display: none;
} }
.checkout-index-index .col-style{
color:#777;
}
.checkout-index-index .col-amount{
margin-left:0.5rem;
}
/****************************************payment end********************************************************/ /****************************************payment end********************************************************/
@media(max-width:768px){ @media(max-width:768px){
.opc .step-title .number { .opc .step-title .number {
...@@ -995,6 +1005,7 @@ $full_free_ship = $_helper->currency($full_free, true, false); ...@@ -995,6 +1005,7 @@ $full_free_ship = $_helper->currency($full_free, true, false);
window.checkoutConfig = {$serializedCheckoutConfig}; window.checkoutConfig = {$serializedCheckoutConfig};
window.checkoutConfig.flatrate_price = '{$flatraPrice}'; window.checkoutConfig.flatrate_price = '{$flatraPrice}';
window.checkoutConfig.full_free_ship = '{$full_free_ship}'; window.checkoutConfig.full_free_ship = '{$full_free_ship}';
window.checkoutConfig.free_price = '{$free_price}';
// Create aliases for customer.js model from customer module // Create aliases for customer.js model from customer module
window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn; window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
window.customerData = window.checkoutConfig.customerData; window.customerData = window.checkoutConfig.customerData;
...@@ -1015,6 +1026,7 @@ script; ...@@ -1015,6 +1026,7 @@ script;
</div> </div>
<script> <script>
require(['jquery'], function ($) { require(['jquery'], function ($) {
console.log('window.checkoutConfig',window.checkoutConfig)
var isMobile = window.matchMedia("(pointer:coarse)").matches; var isMobile = window.matchMedia("(pointer:coarse)").matches;
if (!isMobile) { if (!isMobile) {
$(window).scroll(function () { $(window).scroll(function () {
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -537,8 +537,15 @@ ul { ...@@ -537,8 +537,15 @@ ul {
font-size: 14px; font-size: 14px;
} }
.product-info-price .price-box {
margin-top: 20px;
margin-bottom: 20px;
}
.product-info-wrapper .price-final_price .price{ .product-info-wrapper .price-final_price .price{
font-size: 24px; font-size: 30px;
font-weight: 700;
font-family: auto;
color: black;
} }
.product-info-wrapper{ .product-info-wrapper{
display: grid; display: grid;
...@@ -2247,14 +2254,17 @@ button.action.submit.primary { ...@@ -2247,14 +2254,17 @@ button.action.submit.primary {
//选择label样式 //选择label样式
.swatch-attribute-label{ .swatch-attribute-label{
margin-right: 0.25rem; margin-right: 1rem;
font-size: 16px; font-weight: 500;
font-weight: 700;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
margin-bottom: revert;
font-size: larger;
} }
.swatch-attribute {
margin-bottom: 1.5rem !important;
}
#product-intro__freeshipping-more-3{ #product-intro__freeshipping-more-3{
...@@ -2268,10 +2278,10 @@ button.action.submit.primary { ...@@ -2268,10 +2278,10 @@ button.action.submit.primary {
//详情页mobile修改 //详情页mobile修改
@media (max-width: 1024px){ @media (max-width: 1024px){
.product-info-wrapper .page-title span.base { .product-info-wrapper .page-title span.base {
font-size: 20px; font-size: 22px;
float: left; float: left;
margin-left: -10px; margin-left: -10px;
font-weight: 400; font-weight: 500;
} }
.product-info-wrapper .price-final_price .price { .product-info-wrapper .price-final_price .price {
...@@ -2327,31 +2337,30 @@ button.action.submit.primary { ...@@ -2327,31 +2337,30 @@ button.action.submit.primary {
width: 30px !important; width: 30px !important;
height: 30px !important; height: 30px !important;
background-clip: content-box!important; background-clip: content-box!important;
padding: 1px; padding: 3px;
border: 1px solid rgba(23,23,23,0.3);
} }
.product-info-main .swatch-option.color, .swatch-option.image{ .product-info-main .swatch-option.color, .swatch-option.image{
margin-right: 3% !important; margin-right: 10px !important;
} }
.swatch-option.color.selected{ .swatch-option.color.selected{
border: 2px solid black!important; border: 1px solid black!important;
} }
.swatch-option.image.selected{ .swatch-option.image.selected{
border: 2px solid black!important; border: 1px solid black!important;
} }
.swatch-option.text{ .swatch-option.text{
width: auto!important; width: auto!important;
padding: calc( 8.5px) calc( 11px); padding: calc( 8.5px) calc( 11px);
line-height:10px!important; line-height:10px!important;
min-width: 40px; min-width: 70px;
text-align: center; text-align: center;
font-size: 15px; font-size: 15px;
background: none!important; background: none!important;
border:2px solid rgba(23, 23, 23, 0.3); border:1px solid rgba(23, 23, 23, 0.3);
border-radius: 15px; border-radius: 15px;
margin-right: 10px; margin-right: 10px;
} }
...@@ -2372,6 +2381,8 @@ button.action.submit.primary { ...@@ -2372,6 +2381,8 @@ button.action.submit.primary {
display: none; display: none;
} }
.swatch-attribute-options.clearfix{margin-top: 20px !important;}
@media (max-width: 768px){ @media (max-width: 768px){
.swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{ .swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{
margin-left: 0!important; margin-left: 0!important;
...@@ -2406,6 +2417,7 @@ button.action.submit.primary { ...@@ -2406,6 +2417,7 @@ button.action.submit.primary {
height: 30px !important; height: 30px !important;
border-radius: 50% !important; border-radius: 50% !important;
line-height: 30px; line-height: 30px;
margin: 1px !important;
} }
.swatch-option.text .swatch-option.text
...@@ -2413,7 +2425,7 @@ button.action.submit.primary { ...@@ -2413,7 +2425,7 @@ button.action.submit.primary {
width: auto !important; width: auto !important;
line-height: 10px!important; line-height: 10px!important;
height: 30px !important; height: 30px !important;
min-width: 30px; min-width: 50px;
} }
.swatch-option::before{ .swatch-option::before{
...@@ -2542,6 +2554,10 @@ button.action.submit.primary { ...@@ -2542,6 +2554,10 @@ button.action.submit.primary {
display: none; display: none;
} }
.stock.available {
display: none;
}
//product view right //product view right
@media(min-width: 1024px) { @media(min-width: 1024px) {
.page-main>.columns>.sidebar-main{ .page-main>.columns>.sidebar-main{
...@@ -2553,12 +2569,11 @@ button.action.submit.primary { ...@@ -2553,12 +2569,11 @@ button.action.submit.primary {
width: 100%; width: 100%;
} }
.product-info-wrapper .page-title span.base{ .product-info-wrapper .page-title span.base{
font-size: 20px; font-size: 18px;
font-weight: 400;
color: #292929;
padding-bottom: 1px; padding-bottom: 1px;
margin-bottom: 0; margin-bottom: 0;
line-height: 0px; line-height: 0px;
font-weight: 400;
} }
...@@ -2955,6 +2970,13 @@ tr.grand.totals { ...@@ -2955,6 +2970,13 @@ tr.grand.totals {
} }
} }
.product-info-stock-sku {
display: flex;
align-items: center;
gap: 0.5rem;
border-bottom: 1px solid lightgrey;
font-size: 12px;
}
.swatch-option.selected:before{ .swatch-option.selected:before{
box-shadow:none; box-shadow:none;
......
lib/internal/Magento/Framework/Locale/Format.php
...@@ -171,8 +171,10 @@ class Format implements \Magento\Framework\Locale\FormatInterface ...@@ -171,8 +171,10 @@ class Format implements \Magento\Framework\Locale\FormatInterface
'pattern' => $currency->getOutputFormat(), 'pattern' => $currency->getOutputFormat(),
'precision' => $totalPrecision, 'precision' => $totalPrecision,
'requiredPrecision' => $requiredPrecision, 'requiredPrecision' => $requiredPrecision,
'decimalSymbol' => $decimalSymbol, /* 'decimalSymbol' => $decimalSymbol, 框架旧代码,这里有bug
'groupSymbol' => $groupSymbol, 'groupSymbol' => $groupSymbol,*/
'decimalSymbol' => '.',
'groupSymbol' => ',',
'groupLength' => $group, 'groupLength' => $group,
'integerRequired' => $totalPrecision == 0, 'integerRequired' => $totalPrecision == 0,
]; ];
......
vendor/magento/zendframework1/library/Zend/Locale/Data/es.xml
...@@ -3537,8 +3537,8 @@ For terms of use, see http://www.unicode.org/copyright.html ...@@ -3537,8 +3537,8 @@ For terms of use, see http://www.unicode.org/copyright.html
</dates> </dates>
<numbers> <numbers>
<symbols numberSystem="latn"> <symbols numberSystem="latn">
<decimal>,</decimal> <decimal>.</decimal>
<group>.</group> <group>,</group>
<list>;</list> <list>;</list>
<percentSign>%</percentSign> <percentSign>%</percentSign>
<plusSign>+</plusSign> <plusSign>+</plusSign>
...@@ -3629,10 +3629,10 @@ For terms of use, see http://www.unicode.org/copyright.html ...@@ -3629,10 +3629,10 @@ For terms of use, see http://www.unicode.org/copyright.html
<currencyFormats numberSystem="latn"> <currencyFormats numberSystem="latn">
<currencyFormatLength> <currencyFormatLength>
<currencyFormat type="standard"> <currencyFormat type="standard">
<pattern>¤ #,##0.00</pattern> <pattern>¤#,##0.00</pattern>
</currencyFormat> </currencyFormat>
<currencyFormat type="accounting"> <currencyFormat type="accounting">
<pattern>¤ #,##0.00</pattern> <pattern>¤#,##0.00</pattern>
</currencyFormat> </currencyFormat>
</currencyFormatLength> </currencyFormatLength>
<unitPattern count="one">{0} {1}</unitPattern> <unitPattern count="one">{0} {1}</unitPattern>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment