Skip to content

J
joshine
Commit 468a28b0 by 王东红
Options

fix

parent d0ae87d4
Showing with 88 additions and 67 deletions
app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
...@@ -75,79 +75,85 @@ $_helper = $block->getData('outputHelper'); ...@@ -75,79 +75,85 @@ $_helper = $block->getData('outputHelper');
</a> </a>
</strong> </strong>
<?= $block->getReviewsSummaryHtml($_product, $templateType) ?> <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
<div class="price_wish">
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
<div class="product-item-inner">
<div class="product-item-inner"> <div class="product actions product-item-actions">
<div class="product actions product-item-actions"> <div class="actions-primary">
<div class="actions-primary"> <?php if ($_product->isSaleable()):?>
<?php if ($_product->isSaleable()):?> <?php $postParams = $block->getAddToCartPostParams($_product); ?>
<?php $postParams = $block->getAddToCartPostParams($_product); ?> <form data-role="tocart-form"
<form data-role="tocart-form" data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>" action="<?= $escaper->escapeUrl($postParams['action']) ?>"
action="<?= $escaper->escapeUrl($postParams['action']) ?>" method="post">
method="post"> <?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?>
<?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?> <?php foreach ($optionsData as $optionItem): ?>
<?php foreach ($optionsData as $optionItem): ?> <input type="hidden"
name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
<?php endforeach; ?>
<input type="hidden"
name="product"
value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
<input type="hidden" <input type="hidden"
name="<?= $escaper->escapeHtml($optionItem['name']) ?>" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
value="<?= $escaper->escapeHtml($optionItem['value']) ?>"> value="<?=
<?php endforeach; ?> /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
<input type="hidden" ?>">
name="product" <?= $block->getBlockHtml('formkey') ?>
value="<?= /* @noEscape */ $postParams['data']['product'] ?>"> <!-- <button type="submit"-->
<input type="hidden" <!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"-->
name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>" <!-- class="action tocart primary"-->
value="<?= <!-- disabled>-->
/* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] <!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>-->
?>"> <!-- </button>-->
<?= $block->getBlockHtml('formkey') ?> </form>
<!-- <button type="submit"-->
<!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"-->
<!-- class="action tocart primary"-->
<!-- disabled>-->
<!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>-->
<!-- </button>-->
</form>
<?php else:?>
<?php if ($_product->isAvailable()):?>
<div class="stock available">
<span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
<?php else:?> <?php else:?>
<div class="stock unavailable"> <?php if ($_product->isAvailable()):?>
<span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div> <div class="stock available">
<span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
<?php else:?>
<div class="stock unavailable">
<span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> </div>
<!-- <div id="quickview---><?//= /* @noEscape */ $_product->getId() ?><!--" class="btn-quickview">-->
<!-- <a class="ninja-quickview" data-quickview-url="/quickview/catalog_product/view/id/--><?//= /* @noEscape */ $_product->getId() ?><!--" href="javascript:void(0);" >-->
<!-- <span>kkkkkkk</span>-->
<!-- </a>-->
<!-- </div>-->
<?= strpos($pos, $viewMode . '-primary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.actions-primary'
) : '' ?>
<div data-role="add-to-links" class="actions-secondary">
<?php if ($addToBlock = $block->getChildBlock('addto')): ?>
<?= $addToBlock->setProduct($_product)->getChildHtml() ?>
<?php endif; ?>
</div>
<?= strpos($pos, $viewMode . '-secondary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.actions-secondary'
) : '' ?>
</div> </div>
<?= strpos($pos, $viewMode . '-primary') ? <?php if ($showDescription): ?>
/* @noEscape */ $secureRenderer->renderStyleAsTag( <div class="product description product-item-description">
$position, <?= /* @noEscape */ $_helper->productAttribute(
'product-item-info_' . $_product->getId() . ' div.actions-primary' $_product,
) : '' ?> $_product->getShortDescription(),
<!-- <div data-role="add-to-links" class="actions-secondary">--> 'short_description'
<!-- --><?php //if ($addToBlock = $block->getChildBlock('addto')): ?> ) ?>
<!-- --><?//= $addToBlock->setProduct($_product)->getChildHtml() ?> <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
<!-- --><?php //endif; ?> title="<?= /* @noEscape */ $_productNameStripped ?>"
<!-- </div>--> class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
<?= strpos($pos, $viewMode . '-secondary') ? </div>
/* @noEscape */ $secureRenderer->renderStyleAsTag( <?php endif; ?>
$position,
'product-item-info_' . $_product->getId() . ' div.actions-secondary'
) : '' ?>
</div> </div>
<?php if ($showDescription): ?>
<div class="product description product-item-description">
<?= /* @noEscape */ $_helper->productAttribute(
$_product,
$_product->getShortDescription(),
'short_description'
) ?>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
title="<?= /* @noEscape */ $_productNameStripped ?>"
class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
</div>
<?php endif; ?>
</div> </div>
</div> </div>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<referenceBlock name="main_css_preloader" remove="true"/> <referenceBlock name="main_css_preloader" remove="true"/>
<referenceBlock name="critical_css_block" remove="true"/> <referenceBlock name="critical_css_block" remove="true"/>
<referenceBlock name="css_rel_preload_script" remove="true"/> <referenceBlock name="css_rel_preload_script" remove="true"/>
<referenceBlock name="category.product.addto.compare" remove="true"/>
<!-- Set default logo dimensions. 2.4.3 fixes config values: https://github.com/magento/magento2/commit/e1aaf74d2eebfb54a152d857dcd2934a3eb79bf8 --> <!-- Set default logo dimensions. 2.4.3 fixes config values: https://github.com/magento/magento2/commit/e1aaf74d2eebfb54a152d857dcd2934a3eb79bf8 -->
<referenceBlock name="logo"> <referenceBlock name="logo">
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -553,3 +553,10 @@ ul { ...@@ -553,3 +553,10 @@ ul {
letter-spacing: -1.5px; letter-spacing: -1.5px;
line-height: 1; line-height: 1;
} }
.price_wish{
display: flex;
justify-content: space-between;
align-content: center;
align-items: flex-end;
}
\ No newline at end of file
composer.json
...@@ -388,5 +388,11 @@ ...@@ -388,5 +388,11 @@
"Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/" "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
} }
}, },
"prefer-stable": true "prefer-stable": true,
"repositories": [
{
"type": "composer",
"url": "https://repo.magento.com/"
}
]
} }
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