Commit fe0de193 by 王东红

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

parents fd21a588 3071363c
......@@ -183,6 +183,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
$block->getProduct()->getShortDescription(),
'short_description'
);
if ($short_description) :
?>
<div class="joshine-desction">
<div id="accordion" data-mage-init='{
......@@ -205,6 +206,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
</div>
</div>
</div>
<?php endif; ?>
<script>
require([
'jquery'
......@@ -220,7 +222,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
setTimeout(function(){
$("#product-intro-fast-delivery").show();
$("#product-intro-free-return").show();
},3000);
},5000);
});
</script>
......
......@@ -67,11 +67,11 @@
' <a href="javascript:void(0);">Size Guide</a></span></div>';
$(".swatch-attribute.size > span:last").after(size);
}
},1000);
},3000);
setTimeout(function(){
var content = '<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-size-chart')->toHtml();?>';
$("#product-intro-size-chart").html(content);
},3000);
},5000);
});
......
......@@ -41,10 +41,12 @@
require([
'jquery'
], function ($) {
console.log("jquery is work!")
setTimeout(function(){
$("#tab-label-reviews").trigger("click");
},3000);
setTimeout(function(){
$("#tab-label-reviews").trigger("click");
},8000);
});
</script>
......@@ -1720,6 +1720,7 @@ button.action.submit.primary {
.swatch-option.color, .swatch-option.text, .swatch-option.image{
width: 40px !important;
height: 40px !important;
border: 1px solid #000008;
}
.block-minicart .block-content>.actions .action.checkout{
......
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