Skip to content

J
joshine
Commit 0ce74771 by 王东红
Options

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

parents 3a3b2c32 c17ed3d5
Showing with 73 additions and 129 deletions
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/flashsaleproduct.phtml 0 → 100644
<?php
if(!$id = $block->getProductIds()){
return ;
}
$ids = explode(',',$id);
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
$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;
?>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
......@@ -23,7 +23,6 @@
}
}
</style>
<div class="banner1"></div>
<script>
require([
......@@ -196,7 +195,6 @@
if (isMobile()) {
img_arr = ["/media/wysiwyg/2_M_1_.jpg", "/media/wysiwyg/1_M_1_.jpg"];
}
$(".banner1").banner({
img: img_arr,
href: ["/hotsale.html", "/newarrivals.html"],
......@@ -227,70 +225,7 @@
return mobile_flag;
}
</script>
<div class="categories_tab">
<p class="shopbycate-title"> Shop By Cateogry</p>
<div class="shopcatewpt">
<div class="shop-by-cata" >
<a href="/bodysuits/strap-control-shorts.html"><img src="/media/wysiwyg/shopbycategory/1-strap.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/bodysuits/underbust-bodysuits.html"><img src="/media/wysiwyg/shopbycategory/2-underbust.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/bodysuits/overbust-bodysuits.html"><img src="/media/wysiwyg/shopbycategory/3-overbust.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/bodysuits/sleeved-underbust-bodysuits.html"><img src="/media/wysiwyg/shopbycategory/4-sleeved.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/bodysuits/full-body-shaper.html"><img src="/media/wysiwyg/shopbycategory/5-fullbody.jpg" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/bodysuits/thongs-bodysuits.html"><img src="/media/wysiwyg/shopbycategory/6-thongs.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/control-panties.html"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/corsets-waist-trainer.html"><img src="/media/wysiwyg/shopbycategory/8-waisttrainer.png" alt="" /></a>
</div>
</div>
</div>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail')->toHtml();?>
\ No newline at end of file
<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>
</span> <p><a href="/size-guide">Size Inclusive </a></p></div>
</div>
</div> </div>
</div>
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/homenewproduct.phtml 0 → 100644
<?php
$ids = array();
if($id = $block->getProductIds()){
$ids = explode(',',$id);
}
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
$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' );
if (empty($ids)){
$connection = $objectManager->get('Magento\Framework\App\ResourceConnection')->getConnection();
$sql = "Select entity_id FROM `catalog_product_entity` WHERE type_id = 'configurable' ORDER BY entity_id DESC limit 6";
$catalog_ids = $connection->fetchAll($sql);
if ($catalog_ids){
foreach ($catalog_ids as $id){
$ids[] = $id['entity_id'];
}
}
}
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;
?>
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
......@@ -142,6 +142,7 @@
.actions .subscribe {
margin-left: -16px;
width: 30%;
font-size: 16px;
}
.newsletter-list > span {
text-transform: uppercase;
......
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
......@@ -4,68 +4,8 @@
* See COPYING.txt for license details.
*/
/**
* @var \Magento\Theme\Block\Html\Header\Logo $block
*/
$storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();
/**
* @var \Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolverInterface|null $logoSizeResolver
*/
$logoSizeResolver = $block->getLogoSizeResolver();
$logoWidth = $logoSizeResolver !== null && $logoSizeResolver->getWidth()
? $logoSizeResolver->getWidth()
: $block->getLogoWidth();
$logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
? $logoSizeResolver->getHeight()
: $block->getLogoHeight();
?>
<div class="footer-container">
<div class="footer_link">
<div style="text-align: center;color: #ffffff;padding-bottom: 30px;" >
<img src="/media/wysiwyg/joshine_logo_1.png" width="200px;" class="logo_img" id="footer_logo">
</div>
<div>
<h4>ABOUT JOSHINE <span> > </span></h4>
<ul>
<li><a href="/about-us">About Us</a></li>
<li><a href="/about-our-products">About Our Products</a></li>
<li><a href="/contact-us">Contact Us</a></li>
<li>Our Blog</li>
</ul>
</div>
<div>
<h4>HELP & SUPPORT<span> > </span></h4>
<ul>
<li><a href="/size-guide">Size Guide</a></li>
<li><a href="/payment-methods">Payment Methods</a></li>
<li><a href="/faqs">FAQs</a></li>
<li><a href="/how-to-order">How to Order</a></li>
<li><a href="/track-order">Track My Order</a></li>
</ul>
</div>
<div>
<h4>OUR POLICY<span> > </span></h4>
<ul>
<li><a href="/shipping-policy">Shipping Policy</a></li>
<li><a href="/return-exchange-policy">Return & Exchange</a></li>
<li><a href="/365-days-warranty">365-Days Warranty</a></li>
</ul>
</div>
</div>
<div class="copyright" >
<span class="copyright_left">Copyright © JOSHINE all rights reserved</span>
<span class="copyright_right">
<img src="/media/wysiwyg/footerpay.png" height="40px;">
<a title="Copy Right" href="/copy-right" >Copy Right</a>
<a title="Terms of Use" href="/terms-of-use" >Terms of Use</a>
<a title="Security & Privacy Policy" href="/security-privacy-policy" >Security & Privacy Policy</a>
</span>
</div>
</div>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('public_footer')->toHtml();?>
<script>
require([
'jquery'
......
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