Skip to content

J
joshine
Commit b090b618 by dhn
Options

购物车改版

parent a4d666a8
Showing with 210 additions and 95 deletions
app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
</block> </block>
</container> </container>
<block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" template="Magento_Checkout::cart/coupon.phtml" after="checkout.cart.summary.title"/> <block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" template="Magento_Checkout::cart/coupon.phtml" after="checkout.cart.summary.title"/>
<block class="Magento\Checkout\Block\Cart" name="checkout.cart.methods.bottom" template="Magento_Checkout::cart/methods-new.phtml"> <block class="Magento\Checkout\Block\Cart" name="checkout.cart.methods.bottom" template="Magento_Checkout::cart/methods.phtml">
<container name="checkout.cart.methods" as="methods" label="Payment Methods After Checkout Button"> <container name="checkout.cart.methods" as="methods" label="Payment Methods After Checkout Button">
<block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.bottom" template="Magento_Checkout::onepage/link.phtml" /> <block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.bottom" template="Magento_Checkout::onepage/link.phtml" />
<block class="Magento\Checkout\Block\QuoteShortcutButtons" name="checkout.cart.shortcut.buttons" /> <block class="Magento\Checkout\Block\QuoteShortcutButtons" name="checkout.cart.shortcut.buttons" />
......
app/code/Magento/Checkout/view/frontend/templates/cart/methods-new.phtml
...@@ -105,7 +105,7 @@ $subtotalStr = $block->escapeHtml( ...@@ -105,7 +105,7 @@ $subtotalStr = $block->escapeHtml(
</div> </div>
</div> </div>
</div> </div>
<!--
<style> <style>
#we-accept{ #we-accept{
text-align: center; text-align: center;
...@@ -122,6 +122,7 @@ $subtotalStr = $block->escapeHtml( ...@@ -122,6 +122,7 @@ $subtotalStr = $block->escapeHtml(
<div class="title"><?= __('We Accept') ?> </div> <div class="title"><?= __('We Accept') ?> </div>
<img src="/media/wysiwyg/we_accept.png" alt=""> <img src="/media/wysiwyg/we_accept.png" alt="">
</div> </div>
-->
</div> </div>
<?php endif; ?> <?php endif; ?>
<script> <script>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<body> <body>
<referenceBlock name="product.info.description" remove="true" /> <referenceBlock name="product.info.description" remove="true" />
<referenceBlock name="product.attributes" remove="true" /> <referenceBlock name="product.attributes" remove="true" />
<referenceBlock name="catalog.product.related" remove="true" />
<referenceContainer name="content"> <referenceContainer name="content">
<block class="Magento\Catalog\Block\Product\View" name="product.recently_viewed.collector" template="Magento_Catalog::product/view/recently_viewed/collector.phtml" after="product.info.details"/> <block class="Magento\Catalog\Block\Product\View" name="product.recently_viewed.collector" template="Magento_Catalog::product/view/recently_viewed/collector.phtml" after="product.info.details"/>
</referenceContainer> </referenceContainer>
<referenceContainer name="content.aside"> <referenceContainer name="content.aside">
<block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently" before="catalog.product.related"> <block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently" before="product.info.upsell">
<arguments> <arguments>
<argument name="block_id" xsi:type="string">recently_viewed</argument> <argument name="block_id" xsi:type="string">recently_viewed</argument>
</arguments> </arguments>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml
...@@ -8,51 +8,31 @@ ...@@ -8,51 +8,31 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="checkout_cart_item_renderers"/> <update handle="checkout_cart_item_renderers"/>
<body> <body>
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceBlock name="checkout.cart.addtocart" remove="true" />
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="nav.main.box" remove="true"/>
<referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" />
<referenceBlock name="header.search.bar" remove="true" />
<referenceBlock name="header.account" remove="true" />
<referenceBlock name="header.wishlist" remove="true" />
<referenceBlock name="minicart" remove="true" />
<referenceBlock name="checkout.cart.crosssell" remove="true"/> <referenceBlock name="checkout.cart.crosssell" remove="true"/>
<referenceContainer name="header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top"> <referenceBlock name="checkout.cart.summary.title" remove="true"/>
<arguments>
<argument name="block_id" xsi:type="string">cart_payment_top</argument>
</arguments> <!-- -->
</block> <!-- <referenceBlock name="checkout.cart.totals">-->
</referenceContainer> <!-- <arguments>-->
<referenceContainer name="columns.top"> <!-- <argument name="jsLayout" xsi:type="array">-->
<block class="Magento\Cms\Block\Block" name="progress.bar" before="-"> <!-- <item name="components" xsi:type="array">-->
<arguments> <!-- <item name="block-totals" xsi:type="array">-->
<argument name="block_id" xsi:type="string">progress_bar</argument> <!-- <item name="children" xsi:type="array">-->
</arguments> <!-- <item name="shpping-get" xsi:type="array">-->
</block> <!-- <item name="component" xsi:type="string">Magento_Checkout/js/view/address-get</item>-->
</referenceContainer> <!-- </item>-->
<referenceContainer name="content"> <!-- </item>-->
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" /> <!-- </item>-->
<!-- </item>-->
<!-- </argument>-->
<!-- </arguments>-->
<!-- </referenceBlock>-->
<referenceContainer name="checkout.cart.totals.container">
<block class="Magento\Checkout\Block\Cart\Totals" name="checkout.cart.totals" template="Magento_Checkout::cart/totals.phtml" />
</referenceContainer> </referenceContainer>
<referenceBlock name="checkout.cart.totals">
<arguments>
<argument name="jsLayout" xsi:type="array">
<item name="components" xsi:type="array">
<item name="block-totals" xsi:type="array">
<item name="children" xsi:type="array">
<item name="shpping-get" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/address-get</item>
</item>
</item>
</item>
</item>
</argument>
</arguments>
</referenceBlock>
<referenceContainer name="checkout.cart.noitems"> <referenceContainer name="checkout.cart.noitems">
<block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently"> <block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently">
<arguments> <arguments>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/coupon.phtml
...@@ -13,10 +13,6 @@ $hasCouponCode = (bool) strlen($block->getCouponCode()); ...@@ -13,10 +13,6 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
?> ?>
<style> <style>
.checkout-cart-index .cart-container .block.discount.active{
border-bottom: 1px solid #ddd;
}
.checkout-cart-index .cart-container .block.discount.active .content{ .checkout-cart-index .cart-container .block.discount.active .content{
padding:0px 1rem; padding:0px 1rem;
} }
...@@ -40,9 +36,11 @@ $hasCouponCode = (bool) strlen($block->getCouponCode()); ...@@ -40,9 +36,11 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
id="block-discount" id="block-discount"
data-mage-init='{"collapsible":{"active":"true", "openedState": "active", "saveState": false}}' data-mage-init='{"collapsible":{"active":"true", "openedState": "active", "saveState": false}}'
> >
<!--
<div class="title" data-role="title" aria-controls="block-summary" role="tab" aria-selected="true" aria-expanded="true" tabindex="0"> <div class="title" data-role="title" aria-controls="block-summary" role="tab" aria-selected="true" aria-expanded="true" tabindex="0">
<strong id="block-shipping-coupon" role="heading" aria-level="2"><?= __("Coupon Code") ?> </strong> <strong id="block-shipping-coupon" role="heading" aria-level="2"><?= __("Coupon Code") ?> </strong>
</div> </div>
-->
<div class="content" data-role="content" aria-labelledby="block-discount-heading" style="display: block;"> <div class="content" data-role="content" aria-labelledby="block-discount-heading" style="display: block;">
<form id="discount-coupon-form" <form id="discount-coupon-form"
action="<?= $block->escapeUrl($block->getUrl('checkout/cart/couponPost')) ?>" action="<?= $block->escapeUrl($block->getUrl('checkout/cart/couponPost')) ?>"
...@@ -53,7 +51,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode()); ...@@ -53,7 +51,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
"cancelButton": "button.action.cancel"}}'> "cancelButton": "button.action.cancel"}}'>
<div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>"> <div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>">
<input type="hidden" name="remove" id="remove-coupon" value="0" /> <input type="hidden" name="remove" id="remove-coupon" value="0" />
<div class="field" style="width: 50%;"> <div class="field" style="width: 70%;">
<label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label> <label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label>
<div class="control" style="float: left;margin-top: 0px;width: 100%;"> <div class="control" style="float: left;margin-top: 0px;width: 100%;">
<input type="text" <input type="text"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/methods.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php
/** @var $block \Magento\Checkout\Block\Cart */
?>
<?php if (!$block->hasError()) :?>
<?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
<ul class="checkout methods items checkout-methods-items">
<?php foreach ($methods as $code => $method): ?>
<?php $methodHtml = $block->getMethodHtml($method); ?>
<?php if (trim($methodHtml) !== '') :?>
<?php if (trim($method) === 'checkout.cart.shortcut.buttons') :?>
<li class="item" style="order:0;"><?= /* @noEscape */ $methodHtml ?></li>
<?php else : ?>
<li class="item" style="order:1;"><?= /* @noEscape */ $methodHtml ?></li>
<?php endif; ?>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php if ($block->getContinueShoppingUrl()): ?>
<div class="continue-content" style="height:40px;">
<button class="action continue" style="width:100%;" onclick="window.location.href='<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>'">Continue shopping</button>
</div>
<?php endif; ?>
<div class="shipping-msg" style="text-align: center;margin:1rem 0px;">Taxes and shipping fee will be calculated at checkout
</div>
<script>
require(['jquery'], function ($) {
var isMobile = window.matchMedia("(pointer:coarse)").matches;
if (isMobile) {
$(window).scroll(function () {
var positionUl = $('.cart-container .checkout-methods-items li:first-child')
if (window.outerHeight + $(document).scrollTop() < $(positionUl).parent().offset().top + 50) {
$(positionUl).removeClass("button-static");
} else {
$(positionUl).addClass("button-static");
}
});
}
});
</script>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/totals.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php
/**
* Shopping cart totals template
* @var $block \Magento\Checkout\Block\Cart\Totals
*/
$code = $block->getQuote()->getCouponCode();
$subtotal = 0;
if($code == null)
{
$subtotal = $block->getQuote()->getSubtotalWithDiscount();
}
else{
$subtotal = $block->getQuote()->getBaseSubtotalWithDiscount();
}
//获取商品总价格
$total = $block->getQuote()->getSubtotal();
$discount = 0;
if($total > $subtotal)
{
$discount = $total - $subtotal;
$discountStr = $block->escapeHtml(
$this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($discount),
['span']
);
}
$subtotalStr = $block->escapeHtml(
$this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($subtotal),
['span']
);
?>
<div id="cart-totals" class="cart-totals" data-bind="scope:'block-totals'">
<?php if ($discount > 0 ): ?>
<div class="discount-area">
<div class="discount-title">discount</div>
<div class="discount-price">-<?= $discountStr ?></div>
</div>
<?php endif; ?>
<div class="total-area">
<div class="total-title">Total</div>
<div class="total-price"><?= $subtotalStr ?></div>
</div>
</div>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage/link.phtml
...@@ -15,7 +15,7 @@ use Magento\Framework\Escaper; ...@@ -15,7 +15,7 @@ use Magento\Framework\Escaper;
<?php if ($block->isPossibleOnepageCheckout()): ?> <?php if ($block->isPossibleOnepageCheckout()): ?>
<button type="button" <button type="button"
data-role="proceed-to-checkout" data-role="proceed-to-checkout"
title="<?= $escaper->escapeHtmlAttr(__('Checkout Now')) ?>" title="<?= $escaper->escapeHtmlAttr(__('Checkout')) ?>"
data-mage-init='{ data-mage-init='{
"Magento_Checkout/js/proceed-to-checkout":{ "Magento_Checkout/js/proceed-to-checkout":{
"checkoutUrl":"<?= $escaper->escapeJs($block->getCheckoutUrl()) ?>" "checkoutUrl":"<?= $escaper->escapeJs($block->getCheckoutUrl()) ?>"
...@@ -24,8 +24,12 @@ use Magento\Framework\Escaper; ...@@ -24,8 +24,12 @@ use Magento\Framework\Escaper;
class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>" class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>"
<?php if ($block->isDisabled()): ?> <?php if ($block->isDisabled()): ?>
disabled="disabled" disabled="disabled"
<?php endif; ?> style=" background: #0000; height: 40px;font-size: 22px;text-transform: uppercase;font-weight: 400;"> <?php endif; ?> style="background: #7E6452; height: 40px;font-size: 16px;font-weight: 400;">
<span data-v-20221108="" class="secure"><img data-v-b14bd780="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAA3CAYAAAClxaIBAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjMyODNDODA2MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjMyODNDODA3MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzI4M0M4MDQyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzI4M0M4MDUyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7niMRCAAAEKklEQVR42tSaW0gVQRjHt01SwiyTJKuHiugiEVIUVhBlPRRBN7ppUCT2EGVB0A2SoB6iJ596iPJBLJPM7B5SdDXNyjIxy0iLIsEoNYuu1vb/8DuwnM7OzszZPR7/8FNxZ3b2f+ab2ZlvTj/LsgyPlQhWgvlgNkgAXaAS3ABnQIenLZIJj0gGB8EHSyy6fgCM9KptL24yCOwFbZaaPnG9xN40EQ+2gxYrPL0DO/l+Ws/ST2NMDAM5YBMY42Fkt4BCUADeq1RUMTELrAVZIMnwT1/AKTZU5YWJiWAxWAOmG5HXA1AKroM6WRNxIJ1ZAqaCWKP3RQ9ZDS6AGnAf/LCbSMPvuWAeSAXjjOhXM2jk984tMvEUf0wx+q7qTX6b9mV9Nu2x1Uf1g0z8jsYQAY9AJq+/RPpp8rwcbQYaeEovAfEu5btMz1eU4RugN/Y62/9GuNRpj8GPzigx8Bjs5hebXaNc6nWQidYoMbCReyLUWk2k92TiXRQYoPB54XB9iEv9t6bqitGHMbBdYIBkCq79okgyOZxae8nAYd62Cgeu4NqbQE+08lo+0gbOgWKJsq9dTHSQib/gVYRNvAT7JctWOQx40nN7vNVFeI+QqVj+l8O1WruJ2giGUR7oVqgzQ7BIrbGnbAaCdstfPQVHFBIA48FVrhdKTYGyMezoG7taqPnpdvMsskC02gRbJO+5A2xw2efcCzUH39U0cAtM40brBeXyJe9ZIGGAdDNUBjBNMTQucpfb75HvUL5cMoTOC8LHru8gySl51ijx8NVghcND0Nh6EqLOOAkD1yQNkM7Z6wa/0ktdQqcMzARnHcrQ2CoPCqtKiffQNZCssNcvESWUJwvcD1WYWWptveCWnqxQ6AFSJ+d/HXuigfM7obReYcAXcm9cAV8F5S6D4YrZlqL/dqMhPplMwXh4CHIke4PGToLgepFiDwQ0SSYrPgC8kZiZkl1MjBVcy9c0UKGS2t8qcUOahVZrpOKzNQ2QMlRMxEqc+AR65ZCCgbQwDNzmKVzpkGWbwovvpISBATxOdJUOTFUT/UGzgpHzLibKwzBwTHRv0f71D8iVnPZoihwNrjpc3wPGai7fKS+2S5z4dw+DYsU11eWg+qlhjANLZvKQMTEYdCgaKQtaE+nqksyEESOTOgeb+RxNNrRIR/kwJFkzjGg3ly13jiQ/PR63IqtFfpxjm7zsiITy/DzHTuHMiG6IyIjCNkulgs5hfBqvdON8MEBb5DmqlUyNhqgnlvlgoMnoOTM3ImGCVKGYAHMTpVEzdE+tzDAapi3iKg8MPDN6ztG1k9pmmA9AX8CiQ/w2zfp32EB4ZyQefXGKshn1itPoSSuKvrRlX/UWShrY52G7npoIkMvJrVD6CJZ43aYfJogJ4HSQgRMgxY/2dF52KloOlnKy7YJfjfwTYAD0328CQiS8EQAAAABJRU5ErkJggg=="></span> <!--
<span><?= $escaper->escapeHtml(__('Checkout Now')) ?></span> <span data-v-20221108="" class="secure">
<img data-v-b14bd780="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAA3CAYAAAClxaIBAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjMyODNDODA2MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjMyODNDODA3MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzI4M0M4MDQyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzI4M0M4MDUyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7niMRCAAAEKklEQVR42tSaW0gVQRjHt01SwiyTJKuHiugiEVIUVhBlPRRBN7ppUCT2EGVB0A2SoB6iJ596iPJBLJPM7B5SdDXNyjIxy0iLIsEoNYuu1vb/8DuwnM7OzszZPR7/8FNxZ3b2f+ab2ZlvTj/LsgyPlQhWgvlgNkgAXaAS3ABnQIenLZIJj0gGB8EHSyy6fgCM9KptL24yCOwFbZaaPnG9xN40EQ+2gxYrPL0DO/l+Ws/ST2NMDAM5YBMY42Fkt4BCUADeq1RUMTELrAVZIMnwT1/AKTZU5YWJiWAxWAOmG5HXA1AKroM6WRNxIJ1ZAqaCWKP3RQ9ZDS6AGnAf/LCbSMPvuWAeSAXjjOhXM2jk984tMvEUf0wx+q7qTX6b9mV9Nu2x1Uf1g0z8jsYQAY9AJq+/RPpp8rwcbQYaeEovAfEu5btMz1eU4RugN/Y62/9GuNRpj8GPzigx8Bjs5hebXaNc6nWQidYoMbCReyLUWk2k92TiXRQYoPB54XB9iEv9t6bqitGHMbBdYIBkCq79okgyOZxae8nAYd62Cgeu4NqbQE+08lo+0gbOgWKJsq9dTHSQib/gVYRNvAT7JctWOQx40nN7vNVFeI+QqVj+l8O1WruJ2giGUR7oVqgzQ7BIrbGnbAaCdstfPQVHFBIA48FVrhdKTYGyMezoG7taqPnpdvMsskC02gRbJO+5A2xw2efcCzUH39U0cAtM40brBeXyJe9ZIGGAdDNUBjBNMTQucpfb75HvUL5cMoTOC8LHru8gySl51ijx8NVghcND0Nh6EqLOOAkD1yQNkM7Z6wa/0ktdQqcMzARnHcrQ2CoPCqtKiffQNZCssNcvESWUJwvcD1WYWWptveCWnqxQ6AFSJ+d/HXuigfM7obReYcAXcm9cAV8F5S6D4YrZlqL/dqMhPplMwXh4CHIke4PGToLgepFiDwQ0SSYrPgC8kZiZkl1MjBVcy9c0UKGS2t8qcUOahVZrpOKzNQ2QMlRMxEqc+AR65ZCCgbQwDNzmKVzpkGWbwovvpISBATxOdJUOTFUT/UGzgpHzLibKwzBwTHRv0f71D8iVnPZoihwNrjpc3wPGai7fKS+2S5z4dw+DYsU11eWg+qlhjANLZvKQMTEYdCgaKQtaE+nqksyEESOTOgeb+RxNNrRIR/kwJFkzjGg3ly13jiQ/PR63IqtFfpxjm7zsiITy/DzHTuHMiG6IyIjCNkulgs5hfBqvdON8MEBb5DmqlUyNhqgnlvlgoMnoOTM3ImGCVKGYAHMTpVEzdE+tzDAapi3iKg8MPDN6ztG1k9pmmA9AX8CiQ/w2zfp32EB4ZyQefXGKshn1itPoSSuKvrRlX/UWShrY52G7npoIkMvJrVD6CJZ43aYfJogJ4HSQgRMgxY/2dF52KloOlnKy7YJfjfwTYAD0328CQiS8EQAAAABJRU5ErkJggg==">
</span>
-->
<span><?= $escaper->escapeHtml(__('Checkout')) ?></span>
</button> </button>
<?php endif?> <?php endif?>
app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut.phtml
...@@ -26,8 +26,24 @@ if ($block->getIsInCatalogProduct()) { ...@@ -26,8 +26,24 @@ if ($block->getIsInCatalogProduct()) {
$isInCatalogProduct = $block->getIsInCatalogProduct(); $isInCatalogProduct = $block->getIsInCatalogProduct();
} }
?> ?>
<?php
if(strpos($block->escapeUrl($block->getImageUrl()),'checkout-logo-medium') !== false){
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-color.svg');
$class = 'checkout-logo-medium';
$classFirst = '';
} else {
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-credit.png');
$class = 'paypal-credit displayno';
$classFirst = 'displayno';
}
?>
<div data-label="<?= $block->escapeHtml(__('or')) ?>" <div data-label="<?= $block->escapeHtml(__('or')) ?>"
class="paypal checkout <?= /* @noEscape */ $labelPosition ?> paypal-logo class="paypal checkout <?= /* @noEscape */ $labelPosition ?> <?= /* @noEscape */ $classFirst ?> paypal-logo
<?= /* @noEscape */ $shortcutHtmlId ?>" <?= /* @noEscape */ $shortcutHtmlId ?>"
data-mage-init='{ data-mage-init='{
"paypalCheckout": { "paypalCheckout": {
...@@ -36,15 +52,6 @@ if ($block->getIsInCatalogProduct()) { ...@@ -36,15 +52,6 @@ if ($block->getIsInCatalogProduct()) {
} }
}' }'
> >
<?php
if(strpos($block->escapeUrl($block->getImageUrl()),'checkout-logo-medium') !== false){
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-color.svg');
$class = 'checkout-logo-medium';
} else {
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-credit.png');
$class = 'paypal-credit displayno';
}
?>
<div class="<?= $class ?>"> <div class="<?= $class ?>">
<input type="image" data-action="checkout-form-submit" <input type="image" data-action="checkout-form-submit"
data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>" data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
...@@ -57,6 +64,6 @@ if ($block->getIsInCatalogProduct()) { ...@@ -57,6 +64,6 @@ if ($block->getIsInCatalogProduct()) {
<img src="<?= $block->escapeHtml($linkImage['src']) ?>" /> <img src="<?= $block->escapeHtml($linkImage['src']) ?>" />
</a> </a>
<?php endif; ?> <?php endif; ?>
<div class="checkout-txt">Checkout</div> <div class="checkout-txt" style="display:contents;"></div>
</div> </div>
</div> </div>
app/design/frontend/Joshine/breeze/etc/view.xml
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<height>375</height> <height>375</height>
</image> </image>
<image id="cart_page_product_thumbnail" type="small_image"> <image id="cart_page_product_thumbnail" type="small_image">
<width>96</width> <width>150</width>
<height>120</height> <height>199</height>
</image> </image>
<image id="category_page_grid" type="small_image"> <image id="category_page_grid" type="small_image">
<width>400</width> <width>400</width>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -731,6 +731,10 @@ p.shopbycate-title { ...@@ -731,6 +731,10 @@ p.shopbycate-title {
cursor:pointer; cursor:pointer;
color: #0000ff; color: #0000ff;
} }
.checkout-cart-index #maincontent{
background-color:#FFFFFF;
border-top:1px solid #ddd;
}
.checkout-cart-index #maincontent .columns #block-shipping{ .checkout-cart-index #maincontent .columns #block-shipping{
margin-top:0; margin-top:0;
} }
...@@ -752,6 +756,10 @@ p.shopbycate-title { ...@@ -752,6 +756,10 @@ p.shopbycate-title {
height: 40px; height: 40px;
display: inline-block; display: inline-block;
} }
.checkout-cart-index .checkout.checkout-methods-items div,.checkout-cart-index .checkout-logo-medium input{
height:40px;
width:100%;
}
@media (min-width: 1024px){ @media (min-width: 1024px){
.cart.item .item-info td.col.item { .cart.item .item-info td.col.item {
width: 50%; width: 50%;
...@@ -773,11 +781,9 @@ p.shopbycate-title { ...@@ -773,11 +781,9 @@ p.shopbycate-title {
background: url("../images/icons-pc.png"); background: url("../images/icons-pc.png");
background-position-x: -160px; background-position-x: -160px;
} }
.checkout-cart-index .checkout.checkout-methods-items div{
height:auto;
}
.checkout-cart-index #cart-totals { .checkout-cart-index #cart-totals {
padding-bottom: 2rem; padding-bottom: 0;
} }
.checkout-cart-index #cart-totals .table-wrapper table tr { .checkout-cart-index #cart-totals .table-wrapper table tr {
border-bottom:none; border-bottom:none;
...@@ -832,7 +838,11 @@ p.shopbycate-title { ...@@ -832,7 +838,11 @@ p.shopbycate-title {
.checkout-cart-index .cart-container .checkout-methods-items .checkout-now button{ .checkout-cart-index .cart-container .checkout-methods-items .checkout-now button{
height: 50px; height: 50px;
} }
.checkout-cart-index #maincontent,.checkout-onepage-success #maincontent{ .checkout-cart-index .cart-container .checkout-methods-items{
padding:0px 1rem;
}
.checkout-onepage-success #maincontent{
background-color: #f4f4f4; background-color: #f4f4f4;
border-top:1px solid #ddd; border-top:1px solid #ddd;
} }
...@@ -864,24 +874,9 @@ p.shopbycate-title { ...@@ -864,24 +874,9 @@ p.shopbycate-title {
padding: 18px 15px; padding: 18px 15px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.checkout-cart-index .column.main .block .title
{
border-bottom: 1px solid #ddd;
}
.checkout-cart-index .column.main .block .title { .checkout-cart-index .column.main .block .title {
padding: 0.6rem 1rem; padding: 0.6rem 1rem;
} }
.checkout-cart-index .cart-container .cart-summary > .title,
.checkout-cart-index .column.main .block .title,
.checkout-cart-index .cart-container .cart-summary #block-summary,
.checkout-cart-index .cart-container #cart-totals,
.checkout-cart-index .cart-container #block-discount,
.checkout-cart-index .checkout-methods-items .item
{
background-color: #ffffff;
}
.block-minicart .subtotal { .block-minicart .subtotal {
margin-right: 1rem; margin-right: 1rem;
} }
...@@ -893,14 +888,24 @@ p.shopbycate-title { ...@@ -893,14 +888,24 @@ p.shopbycate-title {
animation-play-state: paused; animation-play-state: paused;
top: 45%; top: 45%;
left: 45%; left: 45%;
}
.checkout-cart-index .checkout-methods-items {
background-color: #fff;
} }
.free-over{ .free-over{
font-size: 16px; font-size: 16px;
color: #000; color: #000;
} }
}
.checkout-cart-index .total-area,.checkout-cart-index .discount-area {
display: flex;
font-weight: 400;
justify-content: space-between;
width: 100%;
padding: 10px 0px;
}
.discount-area{
color:#fa320f;
} }
.recently-viewed .product-info-promotion-span{ .recently-viewed .product-info-promotion-span{
position: absolute; position: absolute;
...@@ -910,10 +915,13 @@ p.shopbycate-title { ...@@ -910,10 +915,13 @@ p.shopbycate-title {
} }
.checkout-cart-index .cart-container .cart-summary { .checkout-cart-index .cart-container .cart-summary {
gap: 0px; gap: 0px;
background-color: rgba(0,0,0,.03);
padding-bottom: 1rem;
} }
@media (max-width: 768px){ @media (max-width: 768px){
.checkout-cart-index .cart-container .cart-summary { .checkout-cart-index .cart-container .cart-summary {
margin:0; margin:0;
background-color: #ffffff;
} }
.checkout-index-index .method-content .method-msg{ .checkout-index-index .method-content .method-msg{
padding: 5px 0 5px 2.2rem; padding: 5px 0 5px 2.2rem;
...@@ -947,6 +955,9 @@ p.shopbycate-title { ...@@ -947,6 +955,9 @@ p.shopbycate-title {
padding: 0px!important; padding: 0px!important;
gap: 0.5rem; gap: 0.5rem;
} }
.checkout-cart-index .button-static{
margin-bottom:0rem!important;
}
.checkout-now.button-static .now-grand-total{ .checkout-now.button-static .now-grand-total{
display: none; display: none;
} }
...@@ -954,10 +965,10 @@ p.shopbycate-title { ...@@ -954,10 +965,10 @@ p.shopbycate-title {
border: none; border: none;
} }
.checkout-cart-index .cart-container .checkout-methods-items{ .checkout-cart-index .cart-container .checkout-methods-items{
margin-top:2rem; margin-top:0;
} }
.checkout-cart-index .cart-container .checkout-methods-items .checkout-now{ .checkout-cart-index .cart-container .checkout-methods-items .checkout-now{
z-index:1; z-index:2;
gap: 0rem; gap: 0rem;
margin-bottom: 0px;padding: 0px 10px 10px; margin-bottom: 0px;padding: 0px 10px 10px;
} }
...@@ -1018,6 +1029,7 @@ p.shopbycate-title { ...@@ -1018,6 +1029,7 @@ p.shopbycate-title {
position: absolute; position: absolute;
right: 7%; right: 7%;
} }
@media (max-width: 768px){ @media (max-width: 768px){
.checkout-index-index .product-item-details .product-item-inner .subtotal { .checkout-index-index .product-item-details .product-item-inner .subtotal {
right: 13.5%; right: 13.5%;
...@@ -1062,7 +1074,7 @@ p.shopbycate-title { ...@@ -1062,7 +1074,7 @@ p.shopbycate-title {
} }
} }
.checkout-index-index .page-footer,.checkout-cart-index .page-footer{ .checkout-index-index .page-footer{
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.checkout-onepage-success #maincontent{ .checkout-onepage-success #maincontent{
...@@ -1177,7 +1189,7 @@ p.shopbycate-title { ...@@ -1177,7 +1189,7 @@ p.shopbycate-title {
} }
} }
@media(max-width: 768px){ @media(max-width: 768px){
.checkout-index-index .page-footer,.checkout-cart-index .page-footer{ .checkout-index-index .page-footer{
padding-top:0; padding-top:0;
margin-top:10px; margin-top:10px;
} }
...@@ -1188,14 +1200,23 @@ p.shopbycate-title { ...@@ -1188,14 +1200,23 @@ p.shopbycate-title {
{ {
border-left: none; border-left: none;
} }
} .checkout-cart-index .checkout-logo-medium {
margin-bottom:0px;
}
.checkout-cart-index .shipping-msg {
font-size:14px;
}
}
@media(min-width: 790px){ @media(min-width: 790px){
.baozhang_before_footer{ .baozhang_before_footer{
margin-top: 30px; margin-top: 30px;
} }
.baozhang_before_footer .image_first {margin-top: 10px;} .baozhang_before_footer .image_first {margin-top: 10px;}
.checkout-cart-index .continue-content{
padding:0px 1rem;
}
} }
@media(max-width:789px){ @media(max-width:789px){
.col-md-3.col-xs-12.social_block { .col-md-3.col-xs-12.social_block {
......
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