Authored by OF1706

优化

... ... @@ -79,7 +79,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
storageNum: Number(it.storage_number),
isVipPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'V',
isStuPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'S',
yohoIcon: Number(it.get_yoho_coin) || 0,
yohoIcon: Number(it.yoho_coin_num) || 0,
productSubtotal: transPrice(it.last_vip_price * it.buy_number),
promotionId: it.promotion_id || 0,
isLimitSkn: it.is_limit_skn === 'Y', // is_limit_skn=Y 不支持7天无理由退货
... ...
... ... @@ -61,7 +61,7 @@
</div>
{{#advanceCart}}
<div class="mb20">
<div class="mb40">
<!-- 预售商品 -->
<div class="pre-sell">
<code>预售商品</code>预售商品不参加活动,不可使用优惠券,不同上市期的商品我们将为您先到先发。
... ...
... ... @@ -78,7 +78,7 @@
<div style="width:160px;" class="sub-total red td">
¥{{productSubtotal}}
{{#if yohoIcon}}
<p class="tip-message tip-message-coin"><i class="yoho-coin"></i>{{yohoIcon}}有货</p>
<p class="tip-message tip-message-coin"><i class="yoho-coin"></i>{{yohoIcon}}YOHO</p>
{{/if}}
</div>
<div style="width:100px;" class="cart-operation td">
... ...
... ... @@ -338,7 +338,7 @@ Cart = {
},
submit: function() {
var content = '<div><i class="iconfont">&#xe6c2;</i>您还未选择赠品</div><p>是否去选择赠品?</p>';
var content = '<div><i class="iconfont icon-tip">&#xe6c2;</i>您还未选择赠品</div><p>是否去选择赠品?</p>';
var $this = $(this);
if ($this.hasClass('btn-account-disable')) {
... ...
... ... @@ -290,7 +290,6 @@ GoodsWinAction = {
return false;
} else {
console.log('收藏' + 9999);
capi.productCollect(pid).done(function(obj) {
if (!obj && obj.code !== 200) {
... ...
... ... @@ -213,7 +213,7 @@ $('body').on('click', '.cut, .add', function() {
$('#num').val(shopNum);
}
});*/
});
// 凑单弹框 商品信息弹出框,加入收藏夹
$cartGoodsDetail.on('click', '.btn-favCount', function() {
... ...
... ... @@ -128,6 +128,7 @@
width: 355px;
color: #000;
font-size: 18px;
height: 20px;
color: #444;
font-weight: 500;
white-space: nowrap;
... ...
... ... @@ -99,6 +99,10 @@
margin-bottom: 20px;
}
.mb40 {
margin-bottom: 40px;
}
.left {
text-align: left;
}
... ... @@ -1238,6 +1242,7 @@
}
.btn-account-disable {
background-color: #b0b0b0;
cursor: not-allowed;
}
}
... ... @@ -1537,16 +1542,27 @@
display: inline-block;
color: #d0021b;
font-size: 26px;
margin-right: 20px;
vertical-align: baseline;
margin-right: 15px;
margin-bottom: 7px;
vertical-align: middle;
-webkit-text-stroke-width: 0;
}
.icon-tip {
font-size: 32px;
margin-right: 15px;
margin-bottom: 7px;
vertical-align: middle;
-webkit-text-stroke-width: .2px;
}
h3 {
margin-top: 35px;
height: 35px;
line-height: 35px;
}
p{
margin-top: 40px;
margin-top: 30px;
margin-bottom: 30px;
font-size: 14px;
color: #444;
... ... @@ -1556,8 +1572,11 @@
.btn {
width: 130px;
height: 33px;
line-height: 33px;
line-height: 31px;
margin-left: 10px;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
&:nth-child(2) {
margin-left: 20px;
}
... ...