Skip to content

J
joshine
Commit 5eb030f3 by dhn
Options

优化结算流程

parent e10f8d0c
Showing with 21 additions and 5 deletions
app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
...@@ -197,7 +197,8 @@ class LayoutProcessor implements LayoutProcessorInterface ...@@ -197,7 +197,8 @@ class LayoutProcessor implements LayoutProcessorInterface
$fields $fields
); );
} }
$jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
['shippingAddress']['children']['shipping-address-fieldset']['children']['company']['sortOrder'] = 140;
return $jsLayout; return $jsLayout;
} }
......
app/code/Magento/Checkout/view/frontend/web/template/payment.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible"> <li id="payment" role="presentation" class="checkout-payment-method">
<div id="checkout-step-payment" <div id="checkout-step-payment"
class="step-content" class="step-content"
data-role="content" data-role="content"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml
...@@ -8,9 +8,11 @@ ...@@ -8,9 +8,11 @@
<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"/> <referenceContainer name="page.bottom.container" remove="true"/>
<referenceBlock name="checkout.cart.addtocart" remove="true" /> <referenceBlock name="checkout.cart.addtocart" remove="true" />
<referenceContainer name="footer-container" remove="true"/> <referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="nav.main.box" remove="true"/>
<referenceBlock name="catalog.topnav" remove="true" /> <referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" /> <referenceBlock name="top.search" remove="true" />
<referenceBlock name="header.search.bar" remove="true" /> <referenceBlock name="header.search.bar" remove="true" />
...@@ -35,6 +37,7 @@ ...@@ -35,6 +37,7 @@
<referenceContainer name="content"> <referenceContainer name="content">
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" /> <block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer> </referenceContainer>
<!--
<referenceBlock name="checkout.cart.totals"> <referenceBlock name="checkout.cart.totals">
<arguments> <arguments>
<argument name="jsLayout" xsi:type="array"> <argument name="jsLayout" xsi:type="array">
...@@ -50,5 +53,6 @@ ...@@ -50,5 +53,6 @@
</argument> </argument>
</arguments> </arguments>
</referenceBlock> </referenceBlock>
-->
</body> </body>
</page> </page>
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_index_index.xml
...@@ -12,13 +12,16 @@ ...@@ -12,13 +12,16 @@
<referenceBlock name="catalog.topnav" remove="true" /> <referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" /> <referenceBlock name="top.search" remove="true" />
<referenceBlock name="sparsh.free-shipping.bar.top" remove="true" /> <referenceBlock name="sparsh.free-shipping.bar.top" remove="true" />
<referenceContainer name="header.container">
<referenceContainer name="checkout.header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top"> <block class="Magento\Cms\Block\Block" name="cart.payment.top">
<arguments> <arguments>
<argument name="block_id" xsi:type="string">cart_payment_top</argument> <argument name="block_id" xsi:type="string">cart_payment_top</argument>
</arguments> </arguments>
</block> </block>
</referenceContainer> </referenceContainer>
<referenceContainer name="columns.top"> <referenceContainer name="columns.top">
<block class="Magento\Cms\Block\Block" name="progress.bar" before="-"> <block class="Magento\Cms\Block\Block" name="progress.bar" before="-">
<arguments> <arguments>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -953,14 +953,22 @@ p.shopbycate-title { ...@@ -953,14 +953,22 @@ p.shopbycate-title {
.checkout-index-index .page-footer,.checkout-cart-index .page-footer{ .checkout-index-index .page-footer,.checkout-cart-index .page-footer{
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.checkout-onepage-success #maincontent{
padding-bottom:0px;
}
@media (min-width: 768px){ @media (min-width: 768px){
.checkout-index-index .page-footer{ .checkout-index-index .page-footer{
padding-top:0px; padding-top:0px;
margin-top:20px; margin-top:20px;
} }
.checkout-onepage-success #maincontent{ .checkout-index-index .page-header,.checkout-cart-index .page-header,.checkout-onepage-success .page-header{
padding-bottom:0px; background-color: #ffffff;
}
.checkout-cart-index .page-header{
padding-top:5px;
} }
} }
.checkout-index-index #next-shipping,.checkout-index-index #next-payment { .checkout-index-index #next-shipping,.checkout-index-index #next-payment {
text-align: center; text-align: center;
......
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