Skip to content

J
joshine
Commit 01c12085 by 王东红
Options

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

parents eaa35497 7acd637c
Showing with 92 additions and 211 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
......@@ -10,213 +10,80 @@
<?= $block->getChildHtml() ?>
</div>
<style>
@media (max-width: 780px){
*{ margin: 0;padding: 0;list-style: none}
.mask{background-color:rgba(0,0,0,0.2); width:100%; height:100%;position:fixed;top:0;left:0;z-index: 999;}
.prompt_box{
width: 80%;
background: #ffffff;
border-radius: 6px;
position: fixed;
top: 15%;
left: 10%;
overflow: hidden;
height: auto;
padding: 10px;
}
.prompt_box .prompt_title{height:20px;line-height:20px;padding-left:20px;position: relative;}
.prompt_box .prompt_title h3{font-size:16px;color: #333333; margin-top:0;}
.prompt_box .prompt_cancel{width:24px;height:24px;background: url("img/cancel.png") no-repeat;position: absolute;right:0;top:0;}
.prompt_box .prompt_cont{position: relative;}
.prompt_box .prompt_cont .prompt_text{line-height:140px;padding-left:100px;}
.prompt_box .prompt_cont .prompt_sure{position: absolute;right:20px;bottom:34px;
width:50px;height: 26px;background:#1a9ebf;border-radius:5px;color:#ffffff;
font-size: 14px;line-height:26px;text-align: center;}
.hide{display:none;}
.show{display:block;}
@media (max-width: 780px){
.product-social-links .product-addto-links{
display: none;
}
.product-view-freeshipping{
margin-top: -30px;
}
.prompt_box{
width: 100%;
left: 0;
}
}
</style>
<div class="mask hide">
<div class="prompt_box">
<div class="prompt_title product-intro-prompt_cancel">
<span class="prompt_cancel">X</span>
</div>
<div class="prompt_cont f1" style="display: none">
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-fast-delivery')->toHtml();?>
</div>
<div class="prompt_cont f2" style="display: none">
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-free-return')->toHtml();?>
</div>
<div class="prompt_cont f3" style="display: none">
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-size-chart')->toHtml();?>
</div>
</div>
</div>
<div id="product-intro__freeshipping-more-3"><a href="#">Size Chart</a></div>
<div style="width: 100%" class="product-view-freeshipping">
<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-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="free-wrapper">
<p> Estimated to be delivered on <span id="deliveredTime">11/25/2021 - 12/03/2021</span>.</p> </div></div>
<div data-bind="mageInit: {
'Magento_Ui/js/modal/modal':{
'type': 'popup',
'title': '',
'trigger': '[data-trigger=trigger-shipping]',
'responsive': true,
'buttons': []
}}">
<div class="content" style="display: none;">
<div>
<p style="text-align: center;"><h1>SHIP METHODS</h1></p>
<h4 style="text-align: left;">Ship to US</h4>
<table>
<thead>
<tr>
<th>
<p><span>Country</span></p>
</th>
<th>
<p><span>Method</span></p>
</th>
<th>
<p><span>Costs</span></p>
</th>
<th>
<p><span>Shipping time</span></p>
</th>
</tr>
</thead>
<tbody>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;">
<p><span>US</span></p>
</td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Standard</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$6.99</span></div>
<div class="free"><span style="color: #4d9306;"><strong>Free on Orders $69</strong></span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>6 - 15</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;"><span>US</span></td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Express</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$12.99</span></div>
<div class="free"><span>Free on Orders $149</span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>3 - 8</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
</tbody>
</table>
<h4 style="text-align: center;"></h4>
<h4 style="text-align: left;">Ship to <span>international </span></h4>
<table>
<thead>
<tr>
<th>
<p><span>Country</span></p>
</th>
<th>
<p><span>Method</span></p>
</th>
<th>
<p>Costs</p>
</th>
<th>
<p><span>Shipping time</span></p>
</th>
</tr>
</thead>
<tbody>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;">
<p><span>Other countries</span></p>
</td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Standard</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$6.99</span></div>
<div class="free"><strong><span style="color: #4d9306;">Free on Orders $79</span></strong></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>8 - 20</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;"><span>Other countries</span></td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Express</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$19.99</span></div>
<div class="free"><span>Free on Orders $199</span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>4 - 10</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
</tbody>
</table>
<p style="padding-left: 30px;">  We use outside delivery companies (UPS, FedEx, DHL, and USPS), we cannot guarantee these delivery times. Please allow 1-3 business days for your order to dispatch. Please allow <strong>3-12</strong> business days for orders to arrive.</p>
</div>
<div class="page-conteng-h3" id="page-conteng-h37"></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" id="product-intro__freeshipping-more"></span>
</div>
<div class="free-wrapper">
<p> Estimated to be delivered on <span id="deliveredTime">11/25/2021 - 12/03/2021</span>.</p> </div>
</div>
<div class="product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action" data-trigger="trigger2">
<div class="product-intro__freeshipping-icon">
<i class="svgicon svgicon-gd-freereturn"></i><p>Free Return &amp; Exchange</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div> <div class="product-intro__freeshipping-desc">
<i class="svgicon svgicon-gd-freereturn"></i><p>Free Return &amp; Exchange</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more" id="product-intro__freeshipping-more-2" ></span> </div> <div class="product-intro__freeshipping-desc">
Learn More
</div>
<div data-bind="mageInit: {
'Magento_Ui/js/modal/modal':{
'type': 'popup',
'title': '',
'trigger': '[data-trigger=trigger2]',
'responsive': true,
'buttons': []
}}">
<div class="content" style="display: none;">
<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>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><strong>Outbound shipping fees from the original order are not refundable.</strong></p>
<p>Products must be returned <strong>unworn, unwashed, in their original condition and with all tags attached</strong>. Please include the original order packing slip in your return package.</p>
<p>We reserve the right to refuse returns that show signs of wear or do not meet the above criteria.</p>
<p><strong>We cannot accept off-line return</strong>. Please email to our customer care team first. Please do not go straight to the warehouse.</p>
<p>For instructions on how to ship the returned products, refer to the email received after placing the return request.</p>
<p>There is no service charge but you will be responsible for the shipping cost of your return.</p>
<p>Return shipping and any reverse duties are the responsibility of the customer.</p>
<p>To request a return, email to: <strong>support@joshine.com</strong></p>
</div>
</div>
</div>
</div>
<script>
require(['jquery'],function($){
$('.mod-sizechart .content .sizechart-table').append($('.common-sizeinfo').clone());
let start = new Date();
start.setDate(start.getDate()+3);
let smonth = (start.getMonth()+1) < 10 ? "0"+ (start.getMonth()+1) : (start.getMonth()+1);
let sdate = start.getDate() < 10 ? "0"+ start.getDate() : start.getDate();
let end = new Date();
end.setDate(end.getDate()+15);
let emonth = (end.getMonth()+1) < 10 ? "0"+ (end.getMonth()+1) : (end.getMonth()+1);
let edate = end.getDate() < 10 ? "0"+ end.getDate() : end.getDate();
let startTime = smonth + "/" + sdate +"/" +(start.getFullYear());
let endTime = emonth + "/" + edate + "/" + (end.getFullYear());
$('#deliveredTime').text(startTime+"-"+endTime);
$('.swatch-opt').on('swatch.initialized',function(){ $('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action')); })
if($('.swatch-attribute.size .swatch-attribute-selected-option').length > 0){
$('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action'));
}else{
$('.product-options-wrapper').after($('.sizechart.action'));
}
$( "body" ).on( "click", ".common-sizetable__title-s", function() {
$('.common-sizetable__title-s').removeClass('active');
$(this).addClass('active');
$('.sg-table-base').removeClass('active');
$('.'+$(this).attr('data-type')+'-'+$('.common-sizetable__button-item.common-sizetable__button-item_active').attr('data-type')+'-table').addClass('active');
});
$( "body" ).on( "click", ".common-sizetable__button-item", function() {
$('.common-sizetable__button-item').removeClass('common-sizetable__button-item_active');
$(this).addClass('common-sizetable__button-item_active');
$('.sg-table-base').removeClass('active');
$('.'+$('.common-sizetable__title-s.active').attr('data-type')+'-'+$(this).attr('data-type')+'-table').addClass('active');
});
});
</script>
<style>
.product-intro__freeshipping-icon .svgicon {
width: 15px;
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto/compare.phtml
......@@ -6,11 +6,9 @@
/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
?>
<?php $viewModel = $block->getData('addToCompareViewModel'); ?>
<?php if ($viewModel->isAvailableForCompare($block->getProduct())) :?>
<a href="#" data-post='<?= /* @noEscape */ $block->getPostDataParams() ?>'
data-role="add-to-links"
class="action tocompare"><span><?= $block->escapeHtml(__('Add to Compare')) ?></span></a>
<?php endif; ?>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
......@@ -7,13 +7,13 @@
<div id="box">
<ul class="list">
<li class="current">
<a href="https://www.joshine.com/on-sale">
<a href="/on-sale">
<img src="/media/wysiwyg/2_1_.jpg" alt="Joshine Flash Sale" class="box-pc">
<img src="/media/wysiwyg/2_M_1_.jpg" alt="Joshine Flash Sale" class="box-moblie">
</a>
</li>
<li>
<a href="https://www.joshine.com/on-sale">
<a href="/on-sale">
<img src="/media/wysiwyg/1_1_.jpg" alt="" class="box-pc">
<img src="/media/wysiwyg/1_M_1_.jpg" alt="" class="box-moblie">
</a></li>
......@@ -46,7 +46,6 @@
<a href="/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/6-thongs.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/shapewear/pamaleta-luggage"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
</div>
......@@ -57,23 +56,10 @@
</div>
<?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
$type = 'widget-new-grid';
$mode = 'grid';
$image = 'new_products_content_widget_grid';
?>
<div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
<div class="block-title">
<strong role="heading" aria-level="2" >NEW ARRIVALS</strong>
......@@ -82,8 +68,6 @@ $image = 'new_products_content_widget_grid';
<?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
<div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
<ol class="product-items <?= /* @noEscape */ $type ?>">
<?php
$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
$news_ids = explode(',',"366,244,188,193");
......@@ -255,7 +239,7 @@ $image = 'new_products_content_widget_grid';
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 class="view-more-flashsale"><a href="/flashsale-0422?product_list_order=price_low">View More</a></div>
</div>
</div>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -1538,6 +1538,9 @@ margin-top: 0px;
}
.product-info-wrapper .page-title span.base{
color: #999999;
font-size: initial;
float: left;
margin-left: -10px;
}
.product-info-wrapper .price-final_price .price {
......@@ -1545,12 +1548,9 @@ margin-top: 0px;
}
.product-info-price .price-box{
margin-top: -35px;
margin-top: -30px;
}
.product-add-form .box-tocart {
display: none;
}
.price-final_price .old-price .price{
color: #999999;
}
......@@ -1570,7 +1570,19 @@ margin-top: 0px;
.product-info-wrapper .page-title-wrapper{
margin-top: -20px;
}
.swatch-option-tooltip{
display: none;
}
.product-info-wrapper .page-title-wrapper h1{
margin-left: 10px;
margin-top:10px;
}
}
//关闭选中颜色和尺码提示
.breeze .swatch-option-tooltip {
display: none !important;
}
......
app/design/frontend/Joshine/breeze/web/js/breeze/custom.js
......@@ -43,4 +43,24 @@
},function(){
timer = setInterval(autoPlay,3000);
})
//产品详情调取block
$('#product-intro__freeshipping-more').click(function () {
$('.mask').removeClass('hide');
$('.prompt_cont.f1').css('display','block');
});
$('#product-intro__freeshipping-more-2').click(function () {
$('.mask').removeClass('hide');
$('.prompt_cont.f2').css('display','block');
});
$('#product-intro__freeshipping-more-3').click(function () {
$('.mask').removeClass('hide');
$('.prompt_cont.f3').css('display','block');
});
$('.product-intro-prompt_cancel').click(function () {
$('.mask').addClass('hide');
$('.prompt_cont.f1').css('display','none');
$('.prompt_cont.f2').css('display','none');
$('.prompt_cont.f3').css('display','none');
})
})();
\ 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