Commit 41f02cba by dhn

样式调整

parent 8bdcfe81
...@@ -72,7 +72,7 @@ define([ ...@@ -72,7 +72,7 @@ define([
return priceUtils.formatPrice(price, quote.getPriceFormat()); return priceUtils.formatPrice(price, quote.getPriceFormat());
}, },
getGrandTotal:function(){ getGrandTotal:function(){
return priceUtils.formatPrice(this.totals['base_subtotal'], quote.getPriceFormat()); return this.getFormattedPrice(this.totals['subtotal']);
}, },
/** /**
* Set items to observable field * Set items to observable field
......
...@@ -63,7 +63,6 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct ...@@ -63,7 +63,6 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
vertical-align: middle; vertical-align: middle;
} }
.item-info-right .item-name{ .item-info-right .item-name{
margin-bottom: 0.45em;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
white-space: nowrap; white-space: nowrap;
...@@ -90,7 +89,6 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct ...@@ -90,7 +89,6 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
font-style: normal; font-style: normal;
-webkit-transition: color .2s ease-in-out; -webkit-transition: color .2s ease-in-out;
transition: color .2s ease-in-out; transition: color .2s ease-in-out;
padding-bottom: 0.45rem;
} }
.item-info-right .item-price .price-box.price-final_price{ .item-info-right .item-price .price-box.price-final_price{
float: none; float: none;
...@@ -140,6 +138,15 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct ...@@ -140,6 +138,15 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
.checkout-cart-index .item-info-right .qty-change { .checkout-cart-index .item-info-right .qty-change {
padding:2px 15px; padding:2px 15px;
} }
.checkout-cart-index .item-info-right .actions-toolbar {
margin-top: 0px;
margin-bottom: 0px;
}
.checkout-cart-index .item-info-right .action-delete span{
color:#0a0a0a;
}
</style> </style>
<?php if (!$mobileDetect->isMobile()): ?> <?php if (!$mobileDetect->isMobile()): ?>
<tbody class="cart item"> <tbody class="cart item">
......
...@@ -980,7 +980,12 @@ $free_price = $_helper->currency(0, true, false); ...@@ -980,7 +980,12 @@ $free_price = $_helper->currency(0, true, false);
border:1px solid #ddd!important; border:1px solid #ddd!important;
padding: 0!important; padding: 0!important;
} }
.checkout-index-index .table-totals td, .checkout-index-index .table-totals th {
padding: 0.1rem 0.5rem;
}
.checkout-index-index .table-totals .grand.totals td{
padding-bottom:0.45rem;
}
/********************************************address from end****************************************************/ /********************************************address from end****************************************************/
</style> </style>
...@@ -1026,7 +1031,6 @@ script; ...@@ -1026,7 +1031,6 @@ 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 () {
......
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