Commit efdde045 by 王东红

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

parents 47067ebd c01849b4
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php
/**
* Template for displaying new products widget
*
* @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
*/
// phpcs:disable Magento2.Files.LineLength.MaxExceeded
// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) {
$type = 'widget-new-grid';
$mode = 'grid';
$image = 'new_products_content_widget_grid';
$title = __('New Products');
$items = $block->getProductCollection()->getItems();
$showWishlist = true;
$showCompare = true;
$showCart = true;
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
$description = false;
}
?>
<?php if ($exist) :?>
<div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
<div class="block-title">
<strong role="heading" aria-level="2">NEW ARRIVALS</strong>
</div>
<div class="block-content">
<?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
<div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
<ol class="product-items <?= /* @noEscape */ $type ?>">
<?php foreach ($items as $_item) :?>
<li class="product-item">
<div class="product-item-info">
<a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
class="product-item-photo">
<?= $block->getImage($_item, $image)->toHtml() ?>
</a>
<div class="product-item-details">
<strong class="product-item-name">
<a title="<?= $block->escapeHtml($_item->getName()) ?>"
href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
class="product-item-link">
<?= $block->escapeHtml($_item->getName()) ?>
</a>
</strong>
<?= $block->getProductPriceHtml($_item, $type); ?>
<?php if ($templateType) :?>
<?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
<?php endif; ?>
<?php if ($showWishlist || $showCompare || $showCart) :?>
<div class="product-item-actions">
<?php if ($showCart) :?>
<div class="actions-primary">
<?php if ($_item->isSaleable()) :?>
<?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)) :?>
<button class="action tocart primary"
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
</button>
<?php else :?>
<?php
$postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
$postData = $postDataHelper->getPostData(
$block->escapeUrl($block->getAddToCartUrl($_item)),
['product' => (int) $_item->getEntityId()]
)
?>
<button class="action tocart primary"
data-post='<?= /* @noEscape */ $postData ?>'
type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
</button>
<?php endif; ?>
<?php else :?>
<?php if ($_item->isAvailable()) :?>
<div class="stock available">
<span><?= $block->escapeHtml(__('In stock')) ?></span>
</div>
<?php else :?>
<div class="stock unavailable">
<span><?= $block->escapeHtml(__('Out of stock')) ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($showWishlist || $showCompare) :?>
<div class="actions-secondary" data-role="add-to-links">
<?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
<a href="#"
data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
class="action towishlist"
data-action="add-to-wishlist"
title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
<span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
</a>
<?php endif; ?>
<?php if ($block->getAddToCompareUrl() && $showCompare) :?>
<?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
<a href="#" class="action tocompare"
data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
<span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
</a>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
</div>
</li>
<?php endforeach ?>
</ol>
</div>
<?= $block->getPagerHtml() ?>
</div>
</div>
<?php endif;?>
......@@ -56,6 +56,47 @@
</div>
</div>
<?php
//<p>{{widget type="Magento\Catalog\Block\Product\Widget\NewWidget" display_type="new_products" show_pager="0" products_count="3" template="product/widget/new/content/new_list.phtml"}}</p>
echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWidget")->setDisplayType("all_products")->setProductsCount("3")->setTemplate("product/widget/new/content/home_news_product.phtml")->toHtml(); ?>
<div class="flash_sale">
<a href="https://www.joshine.com/flashsale-0422?product_list_order=price_low"><p class="flashsale-title">⚡FLASH SALE⚡</p> </a>
<div class="flash-sale-wpt row" style="background: linear-gradient(to right, #ffffff, #ffffff);" >
<div class="flash-sale-inner">
<?php
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
$ids = explode(',',"133,138,148,158,167,172");
//$ids = explode(',',"1,2");
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$pr = $objectManager->create('Magento\Catalog\Model\ProductRepository');
$blocklist = $objectManager->get('\Magento\Catalog\Block\Product\ListProduct');
$imageHelper = $objectManager->get( 'Magento\Catalog\Helper\Image' );
foreach($ids as $pid):
$product = $pr->getById($pid);
if(!$product) continue;
$productImage = $imageHelper->init( $product, 'category_page_list' ) ->getUrl();
?>
<div class="flash-sale-item">
<a href="<?php echo $product->getProductUrl()?>" >
<img src="<?php echo $productImage;?>" /></a>
<div class="flash-sale-info">
<a class="product-name" href="<?php echo $product->getProductUrl()?>"><?php echo $product->getName();?></a>
<?= $blocklist->getReviewsSummaryHtml($product, $templateType) ?>
<?= /* @noEscape */ $blocklist->getProductPrice($product) ?>
</div>
</div>
<?php
endforeach;
?>
</div>
<div class="view-more-flashsale"><a href="https://www.joshine.com/flashsale-0422?product_list_order=price_low">View More</a></div>
</div>
</div>
<div class="top-content-home">
<div class="banner-4-cate">
<a href="https://www.joshine.com/shapewear" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a>
......@@ -71,39 +112,33 @@
</div>
</div>
<div class="select-element section-before-footer clearfix">
<div class="container-before-footer clearfix">
<div data-content-type="html" data-appearance="default" data-element="main" data-decoded="true"><div class="row">
<div class="baozhang_before_footer">
<span>
<picture><img src="/media/wysiwyg/freeshipping.png" alt=""></picture>
</span> <p> <a href="/shipping-policy">Free Shipping $69+ </a></p>
</div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/15-dayreturns.png" alt=""> </picture>
</span> <p> <a href="/return-exchange-policy">15-Days Returns </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/365-daywarranty.png" alt=""> </picture>
</span> <p> <a href="/365-days-warranty">365-Days Warranty </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/secureshopping.png" alt=""> </picture>
</span> <p><a href="/security-privacy-policy">Secure Shopping </a></p></div>
<div class="baozhang_before_footer"> <span> <picture>
<img src="/media/wysiwyg/impeccablequality.png" alt=""> </picture>
</span> <p> <a href="/about-our-products">Impeccable Quality </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/size.png" alt=""> </picture>
<img src="/media/wysiwyg/15-dayreturns.png" alt=""> </picture>
</span> <p> <a href="/return-exchange-policy">15-Days Returns </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/365-daywarranty.png" alt=""> </picture>
</span> <p> <a href="/365-days-warranty">365-Days Warranty </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/secureshopping.png" alt=""> </picture>
</span> <p><a href="/security-privacy-policy">Secure Shopping </a></p></div>
<div class="baozhang_before_footer"> <span> <picture>
<img src="/media/wysiwyg/impeccablequality.png" alt=""> </picture>
</span> <p> <a href="/about-our-products">Impeccable Quality </a></p></div>
<div class="baozhang_before_footer"><span> <picture>
<img src="/media/wysiwyg/size.png" alt=""> </picture>
</span> <p><a href="/size-guide">Size Inclusive </a></p></div>
</div>
</div> </div>
</div>
</span> <p><a href="/size-guide">Size Inclusive </a></p></div>
</div>
</div> </div>
</div>
......@@ -201,7 +201,7 @@
margin: 0;
}
footer{
margin-top: 20px;
margin-top: 18px;
background: #000;
color: #fff;
padding: 10px ;
......@@ -625,6 +625,9 @@ ul {
.box-moblie{
display: block;
}
.categories_tab {
height: 330px;
}
}
.categories_tab {
......@@ -632,6 +635,7 @@ ul {
margin: 30px 0 ;
padding: 50px;
width: 100%;
height: 500px;
}
.section-element.shop_by_categories .container {
padding-bottom: 15px;
......@@ -646,6 +650,7 @@ ul {
width: 80%;
margin: 0 auto;
text-align:center;
height: 200px;
}
p.shopbycate-title {
background: #fff;
......@@ -808,4 +813,87 @@ p.shopbycate-title {
margin-bottom: 20px;
text-transform:uppercase;
background:none;
}
//home hot product 6
.flash_sale{
max-width: fit-content;
width:100%;
}
p.flashsale-title:hover {
text-decoration: underline;
}
p.flashsale-title {
background: #fff;
font-size: 24px;
font-weight: bold;
color: #000000;
margin: 0px;
padding: 40px;
text-align: center;
}
.view-more-flashsale {
clear: both;
width: 100%;
text-align: center;
display: block;
float: left;
margin-bottom: 20px;
padding: 50px;
}
.view-more-flashsale a {
padding: 10px 20px;
background: #000000;
color: #fff;
font-weight: bold;
width: 120px;
margin: 0 auto;
}
.flash-sale-wpt{padding:10px; }
.flash-sale-inner{width:100%;margin:0 auto;}
.flash-sale-item {
margin-bottom: 0px;
padding: 2px;
float: left;
width: 16.66%;
}
.flash-sale-info {
background: #fff;
padding: 10px;
color: #000;
height: 90px;
}
.flash-sale-info .special-price {
font-size: larger;
font-weight: 600;
}
.flash-sale-info .price {
font-size: larger;
font-weight: 600;
}
.flash-sale-info .product-name {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
width: 100%;
display: inline-block;
color: #222222;
}
.flash-sale-inner .product-reviews-summary.short {
padding: 0;
margin: 0;
}
@media(max-width:789px){
.flash-sale-inner{width:100%;}
.flash-sale-wpt {
padding: 30px 10px;
}
.flash-sale-info .product-reviews-summary .reviews-actions {
display: none;
}
.flash-sale-item{
width:50%;
}
}
\ No newline at end of file
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