Authored by xuqi

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

... ... @@ -166,7 +166,7 @@ function didUpdateAllGoodsCheckStatus() {
$(checkedBox).removeClass('icon-cb-checked').addClass('icon-checkbox');
});
}
window.history.go(0);
window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
}
function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
... ...
... ... @@ -119,7 +119,7 @@
}
.coupon-use {
box-sizing: border-box;
@include box-sizing(border-box);
position: relative;
float: right;
padding-right: 30rem / $pxConvertRem;
... ... @@ -137,7 +137,7 @@
color: #999;
}
}
.checkbox {
display: inline-block;
width: 80rem / $pxConvertRem;
... ...
... ... @@ -15,9 +15,7 @@
{{# navBtn}}
<!-- <span class="nav-btn">{{.}}</span> -->
<!-- <i class="iconfont nav-home">&#xe638;</i> -->
{{/ navBtn}}
</header>
<div class="homebuttom none">
<!-- <div class="homebuttom none">
<ul>
<li>
<i class="iconfont">&#xe62a;</i>
... ... @@ -36,5 +34,8 @@
<span>我的</span>
</li>
</ul>
</div>
</div> -->
{{/ navBtn}}
</header>
{{/pageHeader}}
... ...