wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit dc947366927197ee500a2a6b37bbb56d3cc8273a 2 parents 26feccae c3969d05

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 6 changed files with 10 additions and 10 deletions
... ... @@ -394,9 +394,9 @@ $basicBtnC:#eb0313;
font-size: pxToRem(24px);
}
}
.recommend-for-you {
margin-bottom: pxToRem(30px);
}
// .recommend-for-you {
// margin-bottom: pxToRem(30px);
// }
}
.bottom-blank{
height: pxToRem(120px);
... ...
... ... @@ -4,9 +4,9 @@
<P>您好！</P>
<P>为了向您提供更优质的服务，目前系统正在升级，请您耐心等待。</P>
<P>系统升级期间，部分地区用户体验会有暂 时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。</P>
<P>稍后系统将恢复正常使用，欢迎您继续光顾 YOHO!BUY 有货！</P>
<P>稍后系统将恢复正常使用，欢迎您继续光顾 Yoho!Buy有货！</P>
<P>带来不便之处深表 歉意，请您谅解！</P>
<P>特此公告</P>
<P>YOHO!BUY 有货 客户服务中心。</P>
<P>Yoho!Buy有货 客户服务中心。</P>
</div>
{{> layout/footer}}
... ...
... ... @@ -25,7 +25,7 @@
<a class="international" href={{internationalUrl}}>International Customer</a>
<div class="login-tip">
<div class="info-icon"></div>
Yoho!Family账号可登录YOHO!有货
Yoho!Family账号可登录Yoho!Buy有货
</div>
<div id="retrive-pwd-mask" class="mask"></div>
<ul id="retrive-pwd-ways" class="retrive-pwd-ways">
... ...
... ... @@ -8,7 +8,7 @@
<input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
</div>
<span id="btn-next" class="btn btn-next disable row">下一步</span>
<p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p>
<p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p>
</div>
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -113,8 +113,8 @@
</div>
{{/ enterStore}}
<!-- <div id="productDesc"></div> -->
{{> product/product-description}}
<div id="productDesc"></div>
<!-- {{> product/product-description}} -->
{{> product/recommend-for-you}}
{{#cartInfo}}
... ...
... ... @@ -45,7 +45,7 @@
<body {{#if isPassportPage}}class=passport-body{{/if}}>
{{#if systemUpdate}}
<div class="systemUpdate">
<a href="index/systemUpdate" class="systemHeader">YOHO!BUY关于系统升级的公告</a>
<a href="index/systemUpdate" class="systemHeader">Yoho!Buy有货关于系统升级的公告</a>
<span>X</span>
</div>
{{/if}}
... ...