fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit e454b06510a64e6958e0ff13174376b3e33bde82 2 parents 1da08464 012c34ef

handle merge

Inline Side-by-side
Showing 4 changed files with 23 additions and 9 deletions
... ... @@ -231,16 +231,16 @@
<div class="pro-list">
\{{#each invalidPros}}
<ul>
<li class="chk">
<li class="chk" data-product_info='{"goods_type": "invalid", "buy_number": \{{buy_number}}, "selected": "\{{selected}}", "product_sku": "\{{product_sku}}", "promotion_id": 0}'>
<span class="iconfont warning">&#xe625;</span>
</li>
<li>
<a href="/product/pro_\{{product_id}}_\{{goods_id}}/\{{cn_alphabet}}.html" target="_blank">
<a href="javascript:void(0)">
<img src="\{{image goods_images 100 134}}" alt="\{{product_name}}">
</a>
</li>
<li class="pro-info">
<div class="pro-name"><a href="/product/pro_\{{product_id}}_\{{goods_id}}/\{{cn_alphabet}}.html" target="_blank">\{{product_name}}</a></div>
<div class="pro-name"><a href="javascript:void(0)">\{{product_name}}</a></div>
<div>
\{{#if color_name}}
<span class="mr20">颜色: \{{color_name}}</span>
... ...
... ... @@ -111,16 +111,16 @@
<div class="pro-list">
{{#each invalidPros}}
<ul>
<li class="chk">
<li class="chk" data-product_info='{"goods_type": "invalid", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'>
<span class="iconfont warning">&#xe625;</span>
</li>
<li>
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<a href="javascript:void(0)">
<img src="{{image goods_images 100 134}}" alt="{{product_name}}">
</a>
</li>
<li class="pro-info">
<div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
<div class="pro-name"><a href="javascript:void(0)">{{product_name}}</a></div>
<div>
{{#if color_name}}
<span class="mr20">颜色: {{color_name}}</span>
... ... @@ -131,7 +131,7 @@
</div>
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round salesPrice 2}}</span>
<span class="price sale-price">¥ {{round sales_price 2}}</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
... ...
... ... @@ -77,7 +77,7 @@ var Stepper = {
currNum = $input.val();
plus = $input.parent().next();
if (!$target.hasClass('disable')) {
if (!$target.hasClass('disable') && !$target.parents('.cart-pro-list').hasClass('invalid-pros')) {
sku = $.parseJSON($target.parents('ul').children().first().attr('data-product_info')).product_sku;
goodType = $target.parent().attr('data-producttype');
_this.decrease(goodType, sku, currNum, function(num, changed) {
... ... @@ -103,7 +103,7 @@ var Stepper = {
currNum = $input.val();
minus = $input.parent().prev();
if (!$target.hasClass('disable')) {
if (!$target.hasClass('disable') && !$target.parents('.cart-pro-list').hasClass('invalid-pros')) {
sku = $.parseJSON($target.parents('ul').children().first().attr('data-product_info')).product_sku;
goodType = $target.parent().attr('data-producttype');
_this.increase(goodType, sku, currNum, function(num, changed, overflow) {
... ...
... ... @@ -223,6 +223,20 @@ $hoverColor: #379ed6;
border-top: 1px solid #eee;
color: #999;
input {
color: #999 !important;
}
a {
color: #999 !important;
}
.stepper {
.warning {
display: none;
}
}
.warning {
font-size: 18px !important;
color: #666;
... ...