fe / yoho-blk · Commits

Go to a project

Authored by jinhu.tung
Commit e317a880f71547347db24c9ce1d139c87ff35204 2 parents fda8275b d79b2f93

Merge branch 'feature/shopping' into release/1.0

Inline Side-by-side
Showing 4 changed files with 19 additions and 50 deletions
... ... @@ -294,12 +294,13 @@ const filterCartData = (result, uid) => {
});
}
// _.groupBy(_.concat(advancedGoods, advancedSoldOutGoods), 'brand_id')
return _.merge(resData, {
hasGoods: advancedGoods.length || ordinaryGoods.length || invalidGoods.length,
preSalePros: (advancedSoldOutGoods.length || advancedGoods.length) ?
_.groupBy(_.concat(advancedGoods, advancedSoldOutGoods), 'brand_id') : [],
_.concat(advancedGoods, advancedSoldOutGoods) : [],
commonPros: (ordinarySoldOutGoods.length || ordinaryGoods.length) ?
_.groupBy(_.concat(ordinaryGoods, ordinarySoldOutGoods), 'brand_id') : [],
_.concat(ordinaryGoods, ordinarySoldOutGoods) : [],
invalidPros: invalidGoods,
selectedNum: selectedAdvanceNum + selectedOrdinaryNum,
checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum),
... ...
... ... @@ -7,7 +7,7 @@
<div class="pro-list">
{{#each preSalePros}}
<div class="pros-group">
{{# each this}}
{{!-- {{# each this}} --}}
<ul>
<li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'>
<label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}">
... ... @@ -24,7 +24,7 @@
<li class="pro-info">
{{!-- <div class="brand-name">{{brand_name}}</div> --}}
<div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
<div class="color-size editable" data-productId={{product_id}} id="edit_{{product_id}}" data-productSkn={{product_skn}}>
<div class="color-size editable" data-productId="{{product_id}}" id="edit_{{product_id}}" data-productSkn="{{product_skn}}">
{{#if color_name}}
<span class="mr20">颜色: <span class="default-color">{{color_name}}</span></span>
{{/if}}
... ... @@ -49,7 +49,7 @@
</div>
</li>
</ul>
{{/each}}
{{!-- {{/each}} --}}
</div>
{{/each}}
</div>
... ... @@ -64,7 +64,7 @@
<div class="pro-list">
{{#each commonPros}}
<div class="pros-group">
{{# each this}}
{{!-- {{# each this}} --}}
<ul>
<li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'>
<label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}">
... ... @@ -81,7 +81,7 @@
<li class="pro-info">
{{!-- <div class="brand-name">{{brandName}}</div> --}}
<div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
<div class="color-size editable" data-productId={{product_id}} id="edit_{{product_id}}" data-productSkn={{product_skn}}>
<div class="color-size editable" data-productId="{{product_id}}" id="edit_{{product_id}}" data-productSkn="{{product_skn}}">
{{#if color_name}}
<span class="mr20">颜色: <span class="default-color">{{color_name}}</span></span>
{{/if}}
... ... @@ -103,7 +103,7 @@
</div>
</li>
</ul>
{{/each}}
{{!-- {{/each}} --}}
</div>
{{/each}}
</div>
... ...
... ... @@ -193,8 +193,6 @@ var Cart = {
var dialog;
if (products.length) {
// Cart.showRemovedProducts(products, extraInfos);
dialog = new _confirm({
content: '您确定要从购物车中删除该商品吗？',
cb: function() {
... ... @@ -269,10 +267,6 @@ var Cart = {
}
// 刷新
// template = hbs.compile($('#removed-products').html());
// $('#removed_products').html(template({
// removedProducts: removedProsInfo
// }));
$('#removed_products').html(removedGoodsTpl({
removedProducts: removedProsInfo
}));
... ... @@ -341,7 +335,6 @@ var Cart = {
* @params { Function } setEditable 编辑商品回调
*/
editColorOrSize: function(productId, skn, defaultColor, defaultSize, setEditable) {
// var template;
var index = 0;
var colors;
var colorsLen;
... ... @@ -391,31 +384,6 @@ var Cart = {
}
}
// helpers start
// hbs.registerHelper('isEqual', function(v1, v2, options) {
// if (v1 === v2) {
// return options.fn(this);
// }
// return options.inverse(this);
// });
// hbs.registerHelper('image', function(url, width, height, mode) {
// mode = parseInt(mode, 10) ? mode : 2;
// url = url || '';
// return url.replace(/{width}/g, width).replace(/{height}/g, height).replace(/{mode}/g, mode);
// });
// helpers end
// template = hbs.compile($('#edit-color-size-tpl').html());
// editTarget.append(
// template({
// colors: filterSet,
// defaultColor: defaultColor,
// defaultSize: defaultSize,
// defaultImg: defaultImg
// })
// );
editTarget.append(editTpl({
colors: filterSet,
defaultColor: defaultColor,
... ...
... ... @@ -23,7 +23,7 @@
<div class="pro-list">
{{#each preSalePros}}
<div class="pros-group">
{{# each this}}
{{!-- {{# each this}} --}}
<ul>
<li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'>
<label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}">
... ... @@ -40,12 +40,12 @@
<li class="pro-info">
{{!-- <div class="brand-name">{{brand_name}}</div> --}}
<div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
<div class="color-size editable" data-product_id={{product_id}} id="edit_{{product_id}}">
<div class="color-size editable" data-productId="{{product_id}}" id="edit_{{product_id}}" data-productSkn="{{product_skn}}">
{{#if color_name}}
<span class="mr20">颜色: {{color_name}}</span>
<span class="mr20">颜色: <span class="default-color">{{color_name}}</span></span>
{{/if}}
{{#if size_name}}
<span>尺寸: {{size_name}}</span>
<span>尺寸: <span class="default-size">{{size_name}}</span></span>
{{/if}}
<span class="iconfont">&#xe63c;</span>
</div>
... ... @@ -78,7 +78,7 @@
</div>
</li>
</ul>
{{/each}}
{{!-- {{/each}} --}}
</div>
{{/each}}
</div>
... ... @@ -93,7 +93,7 @@
<div class="pro-list">
{{#each commonPros}}
<div class="pros-group">
{{# each this}}
{{!-- {{# each this}} --}}
<ul>
<li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'>
<label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}">
... ... @@ -110,12 +110,12 @@
<li class="pro-info">
{{!-- <div class="brand-name">{{brandName}}</div> --}}
<div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
<div class="color-size editable" data-product_id={{product_id}} id="edit_{{product_id}}">
<div class="color-size editable" data-productId="{{product_id}}" id="edit_{{product_id}}" data-productSkn="{{product_skn}}">
{{#if color_name}}
<span class="mr20">颜色: {{color_name}}</span>
<span class="mr20">颜色: <span class="default-color">{{color_name}}</span></span>
{{/if}}
{{#if size_name}}
<span>尺寸: {{size_name}}</span>
<span>尺寸: <span class="default-size">{{size_name}}</span></span>
{{/if}}
<span class="iconfont">&#xe63c;</span>
</div>
... ... @@ -145,7 +145,7 @@
</div>
</li>
</ul>
{{/each}}
{{!-- {{/each}} --}}
</div>
{{/each}}
</div>
... ...