Authored by hf

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

... ... @@ -191,7 +191,7 @@ class Helpers
*/
public static function transPrice($price)
{
return (!empty($price) && !is_float($price)) ? $price . '.00' : number_format($price, 2, '.', '');
return number_format($price, 2, '.', '');
}
/**
... ...
... ... @@ -133,15 +133,16 @@ if ($('.freebie').length > 0) {
}
$('.btn-balance').on('touchend', function() {
if (shouldSelectGift()) {
showChooseGifDialog();
return false;
}
if (shouldLowStocks()) {
tip.show('库存不足无法结算');
return false;
}
if (shouldSelectGift()) {
showChooseGifDialog();
return false;
}
if (hasChecked) {
window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
} else {
... ...
... ... @@ -190,6 +190,10 @@ function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
//全选按钮点击事件
$selectAllBtn.on('touchend', function() {
if ($('.low-stocks').length > 0) {
tip.show('所选商品中含有库存不足的商品');
return false;
}
bottomCheckBoxHandeler($(this).hasClass('icon-cb-checked'), $('#cartType').val(), didUpdateAllGoodsCheckStatus);
});
... ...
... ... @@ -41,7 +41,7 @@ optHammer.on('tap', function(e) {
}
}).then(function(res) {
$('#dialog-wrapper').hide();
if (!res) {
if ($.type(res) !== 'object') {
return;
}
if (res.message) {
... ... @@ -70,7 +70,7 @@ optHammer.on('tap', function(e) {
}
}).then(function(res) {
$('#dialog-wrapper').hide();
if (!res) {
if ($.type(res) !== 'object') {
return;
}
if (res.message) {
... ...
... ... @@ -28,9 +28,9 @@
}
.few-tag{
width: 132rem / $pxConvertRem;
width: 148rem / $pxConvertRem;
position: absolute;
left: 100rem / $pxConvertRem;
left: 92rem / $pxConvertRem;
text-align: center;
top: 75%;
color: #fff;
... ...
... ... @@ -5,7 +5,7 @@
.icon-cb-checked:before { content: "\e61d"; }
.shopping-cart-page {
padding-bottom: 120rem / $pxConvertRem;
margin-bottom: 120rem / $pxConvertRem;
overflow-x: hidden;
background: #f0f0f0;
... ...
... ... @@ -138,6 +138,13 @@
}
}
.checkbox {
display: inline-block;
width: 80rem / $pxConvertRem;
text-align: center;
margin-right: -20rem / $pxConvertRem;
}
.coin-check {
float: right;
color: #999;
... ...
... ... @@ -412,7 +412,7 @@ class CartModel
$oneGoods['name'] = $single['product_name'];
$oneGoods['color'] = $single['color_name'];
$oneGoods['size'] = $single['size_name'];
$oneGoods['price'] = Helpers::transPrice($single['sales_price']);
$oneGoods['price'] = Helpers::transPrice($single['last_price']);
$oneGoods['count'] = $single['buy_number'];
//gift=>是否赠品,advanceBuy=>是否加价购;
... ...