Skip to content

J
joshine
Commit 9194db31 by 王东红
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents d62624f7 70750253
Showing with 129 additions and 35 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
...@@ -4,25 +4,6 @@ ...@@ -4,25 +4,6 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
?> ?>
<button type="button" class="action" data-trigger="trigger">
<span data-bind="i18n: 'Click Here'"></span>
</button>
<div data-bind="mageInit: {
'Magento_Ui/js/modal/modal':{
'type': 'popup',
'title': 'Popup title',
'trigger': '[data-trigger=trigger]',
'responsive': true,
'buttons': [{
text: jQuery.mage.__('Submit'),
class: 'action'
}]
}}">
<div class="content">
Popup Content
</div>
</div>
<div class="product-intro__freeshipping product-intro__bg-none"> <div class="product-intro__freeshipping product-intro__bg-none">
<div class="product-intro__freeshipping-abt action" data-trigger="trigger-shipping"> <div class="product-intro__freeshipping-abt action" data-trigger="trigger-shipping">
<div class="product-intro__freeshipping-icon shipping "><i class="svgicon svgicon-gd-shipping"></i> <p>Fast Delivery</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div> <div class="product-intro__freeshipping-icon shipping "><i class="svgicon svgicon-gd-shipping"></i> <p>Fast Delivery</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div>
...@@ -36,7 +17,7 @@ ...@@ -36,7 +17,7 @@
'responsive': true, 'responsive': true,
'buttons': [] 'buttons': []
}}"> }}">
<div class="content"> <div class="content" style="display: none;">
<div> <div>
<p style="text-align: center;"><h1>SHIP METHODS</h1></p> <p style="text-align: center;"><h1>SHIP METHODS</h1></p>
<h4 style="text-align: left;">Ship to US</h4> <h4 style="text-align: left;">Ship to US</h4>
...@@ -162,7 +143,7 @@ ...@@ -162,7 +143,7 @@
'buttons': [] 'buttons': []
}}"> }}">
<div class="content"> <div class="content" style="display: none;">
<h2><strong>Return &amp; Exchange Policy</strong></h2> <h2><strong>Return &amp; Exchange Policy</strong></h2>
<p>Our 100% guarantee ensures that you can return unused items in their original condition and <strong>packaging within 15 days</strong> for an exchange or prompt refund.</p> <p>Our 100% guarantee ensures that you can return unused items in their original condition and <strong>packaging within 15 days</strong> for an exchange or prompt refund.</p>
<p>We simply ask that when you receive an order, <strong>you try it on OVER panties or undergarments</strong>. We are unable to accept worn items for hygienic reasons.</p> <p>We simply ask that when you receive an order, <strong>you try it on OVER panties or undergarments</strong>. We are unable to accept worn items for hygienic reasons.</p>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
...@@ -23,9 +23,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -23,9 +23,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
$title = __('New Products'); $title = __('New Products');
$items = $block->getProductCollection()->getItems(); $items = $block->getProductCollection()->getItems();
$showWishlist = true; $showWishlist = false;
$showCompare = true; $showCompare = false;
$showCart = true; $showCart = false;
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW; $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
$description = false; $description = false;
} }
...@@ -40,10 +40,6 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -40,10 +40,6 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<?= /* @noEscape */ '<!-- ' . $image . '-->' ?> <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
<div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>"> <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
<ol class="product-items <?= /* @noEscape */ $type ?>"> <ol class="product-items <?= /* @noEscape */ $type ?>">
<?php
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$blocklist = $objectManager->get('\Magento\Catalog\Block\Product\ListProduct');
?>
<?php foreach ($items as $_item) :?> <?php foreach ($items as $_item) :?>
<li class="product-item"> <li class="product-item">
<div class="product-item-info"> <div class="product-item-info">
...@@ -59,11 +55,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -59,11 +55,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<?= $block->escapeHtml($_item->getName()) ?> <?= $block->escapeHtml($_item->getName()) ?>
</a> </a>
</strong> </strong>
<?= $blocklist->getProductPrice($_item); ?> <?= $block->getProductPriceHtml($_item); ?>
<?php if ($templateType) :?>
<?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
<?php endif; ?>
</div> </div>
</div> </div>
</li> </li>
......
app/design/frontend/Joshine/breeze/Magento_Review/templates/helper/summary.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/**
* @var \Magento\Review\Block\Product\ReviewRenderer $block
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/
$url = $block->getReviewsUrl() . '#reviews';
$urlForm = $block->getReviewsUrl() . '#review-form';
?>
<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
<?php $rating = $block->getRatingSummary(); ?>
<div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope
itemtype="http://schema.org/AggregateRating">
<?php if ($rating):?>
<div class="rating-summary">
<span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
<div class="rating-result" title="<?= $block->escapeHtmlAttr($rating); ?>%">
<span>
<span>
<span itemprop="ratingValue"><?= $block->escapeHtml($rating); ?>
</span>% of <span itemprop="bestRating">100</span>
</span>
</span>
</div>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
"width:" . $block->escapeHtmlAttr($rating) . "%",
'div.rating-summary div.rating-result>span:first-child'
) ?>
<?php endif;?>
<div class="reviews-actions">
<a class="action view"
href="<?= $block->escapeUrl($url) ?>">
<span itemprop="reviewCount">(<?= $block->escapeHtml($block->getReviewsCount()) ?>) </span>&nbsp;
</a>
</div>
</div>
<?php endif; ?>
<style>
@media (max-width: 780px){
.product-reviews-summary {
justify-content: flex-end;
}
}
</style>
app/design/frontend/Joshine/breeze/Magento_Review/templates/helper/summary_short.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var \Magento\Review\Block\Product\ReviewRenderer $block */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
$url = $block->getReviewsUrl() . '#reviews';
$urlForm = $block->getReviewsUrl() . '#review-form';
?>
<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
<?php $rating = $block->getRatingSummary(); ?>
<div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
<?php if ($rating):?>
<div class="rating-summary">
<span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
<div class="rating-result"
id="rating-result_<?= /* @noEscape */ $block->getProduct()->getId() ?>"
title="<?= $block->escapeHtmlAttr($rating) ?>%">
<span><span><?= $block->escapeHtml($rating) ?>%</span></span>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
'width:' . $block->escapeHtmlAttr($rating) . '%',
'#rating-result_' . $block->getProduct()->getId() . ' span'
) ?>
</div>
<?php endif;?>
<div class="reviews-actions">
<a class="action view"
href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>
&nbsp;<span><?= ($block->getReviewsCount() == 1) ?
$block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?>
</span>
</a>
</div>
</div>
<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
<div class="product-reviews-summary short empty">
<div class="reviews-actions">
<a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
<?= $block->escapeHtml(__('Be the first to review this product')) ?>
</a>
</div>
</div>
<?php endif; ?>
app/design/frontend/Joshine/breeze/Magento_Theme/layout/breeze_default.xml
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<item name="theme-breeze-blank" xsi:type="string">js/breeze/theme-blank</item> <item name="theme-breeze-blank" xsi:type="string">js/breeze/theme-blank</item>
<item name="theme-breeze-extend" xsi:type="string">js/breeze/extend</item> <item name="theme-breeze-extend" xsi:type="string">js/breeze/extend</item>
<item name="theme-breeze-custom" xsi:type="string">js/breeze/custom</item> <item name="theme-breeze-custom" xsi:type="string">js/breeze/custom</item>
<item name="theme-breeze-custom" xsi:type="string">js/breeze/components/menu</item> <item name="theme-breeze-custom-2" xsi:type="string">js/breeze/components/menu</item>
<item name="Magento_Checkout/js/view/minicart" xsi:type="string">Swissup_Breeze/js/components/minicart</item> <item name="Magento_Checkout/js/view/minicart" xsi:type="string">Swissup_Breeze/js/components/minicart</item>
<item name="Magento_Checkout/js/proceed-to-checkout" xsi:type="string">Swissup_Breeze/js/components/proceed-to-checkout</item> <item name="Magento_Checkout/js/proceed-to-checkout" xsi:type="string">Swissup_Breeze/js/components/proceed-to-checkout</item>
<item name="catalogAddToCart" xsi:type="string">Swissup_Breeze/js/components/catalog-add-to-cart</item> <item name="catalogAddToCart" xsi:type="string">Swissup_Breeze/js/components/catalog-add-to-cart</item>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -1440,7 +1440,7 @@ margin-top: 0px; ...@@ -1440,7 +1440,7 @@ margin-top: 0px;
.copyright a{ .copyright a{
font-weight: 100; font-weight: 100;
font-size: revert; font-size: small;
} }
.copyright img { .copyright img {
...@@ -1449,4 +1449,26 @@ margin-top: 0px; ...@@ -1449,4 +1449,26 @@ margin-top: 0px;
} }
} }
//详情页mobile修改
@media (max-width: 780px){
.product-info-stock-sku{
display: none;
}
.product-info-wrapper .page-title span.base{
color: #999999;
}
.product-social-links{
display: none;
}
.product-info-wrapper .price-final_price .price {
color: #000;
}
.product-info-price .price-box{
margin-top: -35px;
}
}
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