Authored by biao

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

... ... @@ -89,8 +89,10 @@
float: left;
color: #fff;
font-size: pxToRem(32px);
width: pxToRem(213px);
p{
width: pxToRem(320px);
// width: pxToRem(213px); 三栏宽度
p {
font-size: pxToRem(22px);
}
... ...
... ... @@ -28,10 +28,14 @@
{{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
<p>收藏的品牌</p>
</a>
{{!
<a class="link-item" href="/home/record">
{{#isLogin}}{{product_browse}}{{/isLogin}}
<!-- product_browse -->
<p>浏览记录</p>
</a>
}}
</div>
<div class="my-order">
<div class="order-title">
... ... @@ -102,6 +106,7 @@
<span class="iconfont num">&#xe604;</span>
</a>
</div>
{{!
<div class="group-list">
<a class="list-item" href="/help.html">
<span class="iconfont icon">&#xe639;</span>
... ... @@ -109,6 +114,7 @@
<span class="iconfont num">&#xe604;</span>
</a>
</div>
}}
{{> product/recommend-for-you}}
{{> product/suspend-cart}}
... ...