diff --git a/library/Plugin/Helpers.php b/library/Plugin/Helpers.php
index b9baeb4..8974753 100644
--- a/library/Plugin/Helpers.php
+++ b/library/Plugin/Helpers.php
@@ -639,7 +639,7 @@ class Helpers
$arr[] = $gift;
// 计算加价购商品数目
- $count += $value['max_select_number'];
+ $count += count($value['goods_list']);
}
return $arr;
diff --git a/static/js/cart/cart.js b/static/js/cart/cart.js
index 6832871..70db04f 100644
--- a/static/js/cart/cart.js
+++ b/static/js/cart/cart.js
@@ -22,6 +22,10 @@ require('./good');
lazyLoad($('img.lazy'));
+if ('advance' === cartType) {
+ $cartContent.toggleClass('hide');
+}
+
if ($('.cart-nav').length > 0) {
navHammer = new Hammer(document.getElementsByClassName('cart-nav')[0]);
navHammer.on('tap', function(e) {
diff --git a/static/js/cart/chose-panel.js b/static/js/cart/chose-panel.js
index 4532349..67a9ee6 100644
--- a/static/js/cart/chose-panel.js
+++ b/static/js/cart/chose-panel.js
@@ -21,13 +21,13 @@ var panelTmpl,
re = /\d+/,
leftNum,
$sizeList,
- colorIndex,
confirming,
hasChooseColor = false,
hasChooseSize = false,
curColorIndex,
curSizeIndex,
$curSizeRow,
+ $curSizeBlock = null,
$sizeRowList = $('.size-list ul');
// 读取模板
@@ -98,15 +98,13 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
$('.color-list').on('touchstart', '.block', function(e) {
var $this = $(this),
$that = $(e.target).closest('.chose-items'),
- numArray,
index,
curSelectedSizeBlock,
$sizeChosed,
scindex,
- i;
+ curGoodNum;
- var $siblingBlock = $this.closest('.block-list').siblings(':first'),
- currentNumArray = ($this.data('numstr') + '').split('/');
+ var $siblingBlock = $this.closest('.block-list').siblings(':first');
$this.siblings('.chosed').removeClass('chosed');
index = $this.index();
@@ -132,26 +130,45 @@ $('.color-list').on('touchstart', '.block', function(e) {
}
//把当前选中颜色对应的尺码那一行显示出来
- //$sizeRowList.addClass('hide');
- //$curSizeRow.toggleClass('hide');
+ $sizeRowList.addClass('hide');
+ $curSizeRow.toggleClass('hide');
- //之前选中行 对应的尺码去掉勾选样式
- $sizeChosed.removeClass('chosed');
+ // 之前选中的尺码去掉勾选样式
+ if ($sizeChosed) {
+ $sizeChosed.removeClass('chosed');
+ }
- // 当前选中颜色对应的尺码行，其对应的尺码加上 (前提是要判断下这个尺码是否存在)
+ // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
curSelectedSizeBlock = $curSizeRow.children().get(scindex);
if (curSelectedSizeBlock) {
+ curGoodNum = $(curSelectedSizeBlock).data('num');
$(curSelectedSizeBlock).addClass('chosed');
+
+ //如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式
+ if (curGoodNum > 0) {
+ $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
+ } else {
+ $(curSelectedSizeBlock).removeClass('zero-stock').addClass('zero-stock');
+ $that.find('.num .left-num').html('');
+ }
}
}
+ // 当前颜色块 切换勾选样式
$this.toggleClass('chosed');
curColorIndex = index;
+ // 设置按钮的样式和文字
$chosed = $('.chose-items').find('.chosed');
+ if (2 === $chosed.closest('.zero-stock').length) {
+ $('#chose-btn-sure').css('background-color', '#c0c0c0');
+ $('#chose-btn-sure').html('已售罄');
+ } else {
+ $('#chose-btn-sure').css('background-color', '#eb0313');
+ $('#chose-btn-sure').html('确定');
+ }
-
- if ($chosed.length === 0) {
+ /**if ($chosed.length === 0) {
$this.closest('ul>li').each(function() {
$(this).removeClass('zero-stock');
if ('0' === $(this).data('num')) {
@@ -210,38 +227,74 @@ $('.color-list').on('touchstart', '.block', function(e) {
$('#chose-btn-sure').css('background-color', '#eb0313');
$('#chose-btn-sure').html('确定');
}
- }
+ }**/
});
$('.size-list').on('touchstart', '.block', function(e) {
var $this = $(this),
$that = $(e.target).closest('.chose-items'),
- numArray,
index,
- i;
+ $colorChosed,
+ selectedColorindex,
+ curGoodNum;
- var $siblingBlock = $this.closest('.block-list').siblings(':first'),
- currentNumArray = ($this.data('numstr') + '').split('/');
+ var $siblingBlock = $this.closest('.block-list').siblings(':first');
$this.siblings('.chosed').removeClass('chosed');
index = $this.index();
+ $colorChosed = $siblingBlock.find('.chosed');
+ selectedColorindex = $colorChosed.index();
+ $curSizeRow = $sizeRowList.eq(index);
+
+ // 当前尺码已经是选中状态,再点击时
if ($this.hasClass('chosed')) {
//尺码原来已经是勾选时，要清空剩余件数的提示
$that.find('.num .left-num').html('');
hasChooseSize = false;
+
+ // 去掉已经选中颜色的 数量为0的样式
+ if ($colorChosed) {
+ $colorChosed.removeClass('zero-stock').addClass('zero-stock');
+ }
+
+ // 当前尺码不是选中状态,选中时
} else {
hasChooseSize = true;
+
+ curGoodNum = $this.data('num');
+
+ // 之前选中的尺码去掉勾选样式
+ if ($curSizeBlock) {
+ $curSizeBlock.removeClass('chosed');
+ }
+
+ // 如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式, 否则显示剩余件数
+ if (curGoodNum > 0) {
+ $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
+ } else {
+ $colorChosed.removeClass('zero-stock').addClass('zero-stock');
+ $that.find('.num .left-num').html('');
+ }
}
$this.toggleClass('chosed');
curSizeIndex = index;
+ $curSizeBlock = $this;
+ // 设置按钮的样式和文字
$chosed = $('.chose-items').find('.chosed');
+ if (2 === $chosed.closest('.zero-stock').length) {
+ $('#chose-btn-sure').css('background-color', '#c0c0c0');
+ $('#chose-btn-sure').html('已售罄');
+ } else {
+ $('#chose-btn-sure').css('background-color', '#eb0313');
+ $('#chose-btn-sure').html('确定');
+ }
- if ($chosed.length === 0) {
+ /**if ($chosed.length === 0) {
$this.closest('ul>li').each(function() {
$(this).removeClass('zero-stock');
if ('0' === $(this).data('num')) {
@@ -280,13 +333,13 @@ $('.size-list').on('touchstart', '.block', function(e) {
$('#chose-btn-sure').css('background-color', '#eb0313');
$('#chose-btn-sure').html('确定');
- /**$siblingBlock.find('ul>li').each(function() {
+ $siblingBlock.find('ul>li').each(function() {
$(this).removeClass('zero-stock');
if ('0' === $(this).data('num')) {
$(this).addClass('zero-stock');
}
});
- $that.find('.num .left-num').html('');*/
+ $that.find('.num .left-num').html('');
} else if ($chosed.length === 2) {
$siblingBlock.find('.block').removeClass('zero-stock');
for (i = 0; i < currentNumArray.length; i++) {
@@ -303,7 +356,7 @@ $('.size-list').on('touchstart', '.block', function(e) {
$('#chose-btn-sure').css('background-color', '#eb0313');
$('#chose-btn-sure').html('确定');
}
- }
+ }**/
});
diff --git a/template/m.yohobuy.com/partials/cart/chose-panel.phtml b/template/m.yohobuy.com/partials/cart/chose-panel.phtml
index 1f65f7c..ccefe21 100644
--- a/template/m.yohobuy.com/partials/cart/chose-panel.phtml
+++ b/template/m.yohobuy.com/partials/cart/chose-panel.phtml
@@ -34,15 +34,18 @@
<div class="size-list block-list">
<span>尺码</span>
{{# sizes}}
+
+ <ul class="size-row clearfix hide">
{{# size}}
- <ul class="size-row clearfix" data-type="size" >
- <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-id={{id}} data-colorid="{{colorId}}" data-num="{{sizeNum}}" data-numstr="{{colorNumStr}}" data-skuid="{{skuId}}" data-goodid="{{goodsId}}">
- {{name}}
- </li>
- </ul>
- {{/ size}}
- {{/ sizes}}
+ <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-id={{id}} data-colorid="{{colorId}}" data-num="{{sizeNum}}" data-numstr="{{colorNumStr}}" data-skuid="{{skuId}}" data-goodid="{{goodsId}}">
+ {{name}}
+ </li>
+ {{/ size}}
+ </ul>
+
+ {{/ sizes}}
</div>
+ <p>
<div class="num">
<span>数量</span>
<div class="clearfix">
diff --git a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
index 8f2e222..98c41bc 100644
--- a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
+++ b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
@@ -769,12 +769,27 @@ class CartModel
$result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift'], $result['advanceBuyCount']);
}
+ // 已参加的活动
+ if (!empty($data['promotion_info'])) {
+ $result['promotionInfo'] = array();
+ $info = array();
+ foreach ($data['promotion_info'] as $val) {
+ $info = array();
+ $info['id'] = $val['promotion_id'];
+ $info['name'] = $val['promotion_title'];
+
+ $result['promotionInfo'][] = $info;
+ }
+
+ $result['promotionFormula'] = $data['shopping_cart_data']['promotion_formula'];
+ }
+
// 结算数据
$result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
$result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
$result['count'] = $data['shopping_cart_data']['selected_goods_count'];
$result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0);
- $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
+ $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);
}while(0);
return $result;