Skip to content

J
joshine
Commit 468a28b0 by 王东红
Options

fix

parent d0ae87d4
Showing with 35 additions and 14 deletions
app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
...@@ -75,9 +75,9 @@ $_helper = $block->getData('outputHelper'); ...@@ -75,9 +75,9 @@ $_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">
...@@ -103,12 +103,12 @@ $_helper = $block->getData('outputHelper'); ...@@ -103,12 +103,12 @@ $_helper = $block->getData('outputHelper');
/* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
?>"> ?>">
<?= $block->getBlockHtml('formkey') ?> <?= $block->getBlockHtml('formkey') ?>
<!-- <button type="submit"--> <!-- <button type="submit"-->
<!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"--> <!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"-->
<!-- class="action tocart primary"--> <!-- class="action tocart primary"-->
<!-- disabled>--> <!-- disabled>-->
<!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>--> <!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>-->
<!-- </button>--> <!-- </button>-->
</form> </form>
<?php else:?> <?php else:?>
<?php if ($_product->isAvailable()):?> <?php if ($_product->isAvailable()):?>
...@@ -120,16 +120,21 @@ $_helper = $block->getData('outputHelper'); ...@@ -120,16 +120,21 @@ $_helper = $block->getData('outputHelper');
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
</div> </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') ? <?= strpos($pos, $viewMode . '-primary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag( /* @noEscape */ $secureRenderer->renderStyleAsTag(
$position, $position,
'product-item-info_' . $_product->getId() . ' div.actions-primary' 'product-item-info_' . $_product->getId() . ' div.actions-primary'
) : '' ?> ) : '' ?>
<!-- <div data-role="add-to-links" class="actions-secondary">--> <div data-role="add-to-links" class="actions-secondary">
<!-- --><?php //if ($addToBlock = $block->getChildBlock('addto')): ?> <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
<!-- --><?//= $addToBlock->setProduct($_product)->getChildHtml() ?> <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
<!-- --><?php //endif; ?> <?php endif; ?>
<!-- </div>--> </div>
<?= strpos($pos, $viewMode . '-secondary') ? <?= strpos($pos, $viewMode . '-secondary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag( /* @noEscape */ $secureRenderer->renderStyleAsTag(
$position, $position,
...@@ -151,6 +156,7 @@ $_helper = $block->getData('outputHelper'); ...@@ -151,6 +156,7 @@ $_helper = $block->getData('outputHelper');
</div> </div>
</div> </div>
</div> </div>
</div>
<?= strpos($pos, $viewMode . '-actions') ? <?= strpos($pos, $viewMode . '-actions') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag( /* @noEscape */ $secureRenderer->renderStyleAsTag(
$position, $position,
......
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