Skip to content

J
joshine
Commit 3ec6de8b by liumengfei
Options

Merge branch 'developer' into production

parents 5f6d8c99 43e6e7c4
Showing with 37 additions and 45 deletions
app/code/Joshine/CouponPusher/view/frontend/templates/coupon-subscribe-alert.phtml
...@@ -91,7 +91,9 @@ ...@@ -91,7 +91,9 @@
<div class="j-modal-dialog j-modal-fluid"> <div class="j-modal-dialog j-modal-fluid">
<div class="j-modal-content"> <div class="j-modal-content">
<div class="j-modal-header"> <div class="j-modal-header">
<button title="Close (Esc)" type="button" class="sparsh-mfp-close" id="coupon-alert-close"></button> <span class="joshine-close" id="coupon-alert-close" style="z-index: 1001;">
<svg t="1678760827915" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2762" width="200" height="200"><path d="M579.888 512l190.064-190.064a48 48 0 0 0-67.888-67.872L512 444.112 321.936 254.064a48 48 0 1 0-67.872 67.872L444.112 512 254.064 702.064a48 48 0 1 0 67.872 67.872L512 579.888l190.064 190.064a48 48 0 0 0 67.872-67.888L579.888 512z" fill="#000000" p-id="2763" data-spm-anchor-id="a313x.7781069.0.i3" class="selected"></path></svg>
</span>
</div> </div>
<div class="j-modal-body"> <div class="j-modal-body">
<div class="coupon-alt joshine-text-center"> <div class="coupon-alt joshine-text-center">
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml
...@@ -58,34 +58,34 @@ $_helper = $block->getData('outputHelper'); ...@@ -58,34 +58,34 @@ $_helper = $block->getData('outputHelper');
$_objectManager = \Magento\Framework\App\ObjectManager::getInstance(); $_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$imageHelper = $_objectManager->get('\Magento\Catalog\Helper\Image'); $imageHelper = $_objectManager->get('\Magento\Catalog\Helper\Image');
?> ?>
<style> <style>
.mode-list{ .mode-list{
display: none; display: none;
} }
.hoverImg{ .hoverImg{
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
opacity:0; opacity:0;
height: 100%; height: 100%;
-webkit-transition: opacity .5s; -webkit-transition: opacity .5s;
-moz-transition: opacity .5s; -moz-transition: opacity .5s;
-ms-transition: opacity .5s; -ms-transition: opacity .5s;
-o-transition: opacity .5s; -o-transition: opacity .5s;
transition: opacity .5s; transition: opacity .5s;
} }
.hoverImg:hover{ .hoverImg:hover{
opacity: 1; opacity: 1;
-webkit-transition: opacity .5s; -webkit-transition: opacity .5s;
-moz-transition: opacity .5s; -moz-transition: opacity .5s;
-ms-transition: opacity .5s; -ms-transition: opacity .5s;
-o-transition: opacity .5s; -o-transition: opacity .5s;
transition: opacity .5s; transition: opacity .5s;
} }
</style> </style>
<div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>"> <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
<ol class="products list items product-items"> <ol class="products list items product-items">
<?php /** @var $_product \Magento\Catalog\Model\Product */ ?> <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
...@@ -100,22 +100,11 @@ $_helper = $block->getData('outputHelper'); ...@@ -100,22 +100,11 @@ $_helper = $block->getData('outputHelper');
$baseImageUrl = $productImage->getImageUrl(); $baseImageUrl = $productImage->getImageUrl();
$allImage = $_product->getMediaGalleryImages()->getItems(); $allImage = $_product->getMediaGalleryImages()->getItems();
$hoverImg = ''; $hoverImg = '';
foreach ($allImage as $img){
$tm_id = 0; if (basename($baseImageUrl) != basename($img->getUrl())){
$arr = []; $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($img->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
foreach ($allImage as $index => $img){
if (count($arr) > 3) {
break; break;
} }
if (in_array($img->getData('position'),[0,1,2])) {
$arr[$img->getData('position')] = $img;
}
}
if (key_exists("0",$arr)) {
$hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($arr[1]->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
}elseif (key_exists("2",$arr)){
$hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($arr[2]->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
} }
if ($pos != null) { if ($pos != null) {
...@@ -128,7 +117,7 @@ $_helper = $block->getData('outputHelper'); ...@@ -128,7 +117,7 @@ $_helper = $block->getData('outputHelper');
class="product photo product-item-photo" class="product photo product-item-photo"
tabindex="-1"> tabindex="-1">
<?php <?php
$productImageRaw = $imageHelper->init($_product, $imageDisplayArea)->setImageFile($productImage->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl(); $productImageRaw = $imageHelper->init($_product, $imageDisplayArea)->setImageFile($productImage->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
?> ?>
<img class="product-image-photo" src="<?= $productImageRaw ?>" loading="lazy" width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" alt="Image"> <img class="product-image-photo" src="<?= $productImageRaw ?>" loading="lazy" width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" alt="Image">
<?php if ($hoverImg): ?> <?php if ($hoverImg): ?>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
@media (min-width: 780px){ @media (min-width: 780px){
.product-view-description{ .product-view-description{
max-height: 450px; max-height: 250px !important;
overflow: auto; overflow: auto;
} }
......
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?> <?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?>
<?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_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('home_new_arrivals')->toHtml();?>
<?php /*echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->toHtml();*/?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?>
<?php echo $block->getLayout()->createBlock('Joshine\InstagramFeed\Block\MediaFeed')->toHtml();?>
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