fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit 5710e410a6389ffe4460e34e679aeb234a3b0ada 1 parent 6ee44462

购物车

Inline Side-by-side
Showing 4 changed files with 100 additions and 50 deletions
... ... @@ -6,6 +6,7 @@
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
<button>加入购物车</button>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
... ... @@ -15,6 +16,7 @@
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
<button>加入购物车</button>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
... ... @@ -25,6 +27,7 @@
<span class="sale-price sale-price-new">8888{{salePrice}}</span>
<span class="market-price">7777{{marketPrice}}</span>
</p>
<button>加入购物车</button>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
... ... @@ -34,6 +37,7 @@
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
<button>加入购物车</button>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
... ... @@ -43,6 +47,7 @@
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
<button>加入购物车</button>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
... ... @@ -52,4 +57,5 @@
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
<button>加入购物车</button>
</div>
... ...
... ... @@ -119,7 +119,6 @@ function cartDel(data, delUrl, cookieList) {
});
}
<<<<<<< HEAD
//购物车表单 删除商品
$payWapper.on('click', '.cart-del-btn', function() {
// new Confirm({
... ... @@ -127,10 +126,9 @@ $payWapper.on('click', '.cart-del-btn', function() {
// content: '<h4><i class="iconfont">&#xe684;</i>删除商品</h4>' +
// '<small>确定要从购物车中删除该商品吗？</small>'
// }).show();
console.log(99);
RConfirm(
'<i class="iconfont tip-icon">&#xe61f;</i>确定要解除绑定',
'您确定要解除绑定？',
'<h3><i class="iconfont">&#xe684;</i>删除商品</h3>'+'<p>确定要从购物车中删除该商品吗？</p>',
function() {
$.ajax({
url: url,
... ... @@ -141,8 +139,6 @@ $payWapper.on('click', '.cart-del-btn', function() {
);
});
=======
>>>>>>> 3a2b8fa435f608cc40704e327ea3ee303f3c3da4
// 凑单图片懒加载
var togetherDialog = {};
var dialogTpl = require('hbs/cart/cart-togetherGoods.hbs');
... ... @@ -179,7 +175,6 @@ function showTogetherGoods(id) {
// 凑单弹框 详情切换
$('body').on('click', '.piclist li', function() {
console.log(99999);
pacList = $(this).index();
$('.detail-bigpic:not(.none) .piclist li').removeClass('active');
$(this).addClass('active');
... ... @@ -266,30 +261,29 @@ $('body').on('click', '.cut, .add', function() {
// 凑单弹框 商品信息弹出框，加入收藏夹
$cartGoodsDetail.on('click', '.btn-favCount', function() {
$.ajax({
type: 'POST',
dataType: 'json',
url: '',
data: {
productId: productId,
type: 'add'
}
}).then(function(d) {
if (d.code === 200) {
new Alert(d.message).show();
} else if (d.code === 403) {
if (d.data.url) {
window.location = d.data.url;
}
} else {
new Alert(d.message).show();
}
});
// $.ajax({
// type: 'POST',
// dataType: 'json',
// url: '',
// data: {
// productId: productId,
// type: 'add'
// }
// }).then(function(d) {
// if (d.code === 200) {
// new Alert(d.message).show();
// } else if (d.code === 403) {
// if (d.data.url) {
// window.location = d.data.url;
// }
// } else {
// new Alert(d.message).show();
// }
// });
});
// 购物车列表 赠品
<<<<<<< HEAD
//购物车列表 显示
$('.shop-cart').on('click', '.gift-sell .btn-clear', function() {
... ... @@ -297,9 +291,8 @@ $('.shop-cart').on('click', '.gift-sell .btn-clear', function() {
showPromotion(tid);
});
=======
// 购物车列表 显示
>>>>>>> 3a2b8fa435f608cc40704e327ea3ee303f3c3da4
function showPromotion(id) {
if (!id) {
... ... @@ -423,13 +416,9 @@ $goodsChoose.on('click', '.choose-color .dt', function() {
$('.bigImg').addClass('none').eq($(this).index()).removeClass('none');
});
<<<<<<< HEAD
//结算
$paySum.on('click','.btn-account', function() {
=======
// 结算
$paySum.on('click', '.btn-account', function() {
>>>>>>> 3a2b8fa435f608cc40704e327ea3ee303f3c3da4
understock = '';
// if ($('.pay-wapper .cart-item-checked').parents('.tr').find('.tipNoStore').length > 0) {
... ... @@ -479,8 +468,5 @@ $('.shop-cart').on('click', giftBtn, function() {
console.log(htmlJson);
});
<<<<<<< HEAD
=======
>>>>>>> 3a2b8fa435f608cc40704e327ea3ee303f3c3da4
require('./cart-action');
// require('./cart-action');
... ...
... ... @@ -29,14 +29,14 @@ function RConfirm(content, ok, cancel) {
content: content,
btns: [{
btnClass: ['alert-sure'],
// name: '确定',
name: '确定',
cb: function() {
rd.close();
(typeof ok === 'function') && ok();
}
}, {
btnClass: ['btn-cancel'],
// name: '取消',
name: '取消',
cb: function() {
that.close();
}
... ...
... ... @@ -859,17 +859,16 @@
position: absolute;
top: 50%;
left: 50%;
margin-top: -96px;
margin-left: -70px;
margin-top: -90px;
margin-left: -80px;
padding: 30px 15px;
border: 1px solid #000;
background-color: #fff;
z-index: 20;
&:after{
position: absolute;
top: 50%;
top: 100px;
left: -16px;
margin-top: -7px;
content: '';
display: inline-block;
width: 0;
... ... @@ -880,9 +879,8 @@
}
&:before{
position: absolute;
top: 50%;
top: 101px;
left: -14px;
margin-top: -6px;
z-index: 20;
content: '';
display: inline-block;
... ... @@ -925,12 +923,14 @@
}
.choose-size {
margin-bottom: 13px;
min-height: 56px;
.dd{
height:18px;
line-height:18px;
}
.dt {
width: 25px;
padding-left: 6px;
padding-right: 6px;
height: 16px;
font-size: 12px;
color: #000;
... ... @@ -979,14 +979,14 @@
margin-left:37px;
button{
width: 50px;
height: 20px;
height: 22px;
border-radius: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
font-size: 12px;
padding: 0;
border: none;
line-height: 20px;
line-height: 22px;
cursor: pointer;
outline: none;
}
... ... @@ -1377,7 +1377,7 @@
.individual-slide {
width: 990px;
height: 330px;
height: 386px;
overflow: hidden;
.individual-item {
width:100%;
... ... @@ -1386,7 +1386,7 @@
.goods {
width: 990px;
height: 310px;
height: 346px;
margin: 20px 0;
overflow: hidden;
}
... ... @@ -1437,6 +1437,64 @@
.market-price {
text-decoration: line-through;
}
button {
display: block;
margin: 0 auto;
color: #3a3a3a;
font-size: 14px;
width: 110px;
height: 28px;
line-height: 28px;
border:1px solid #b0b0b0;
border-radius: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
background-color: #fff;
}
}
}
.r-dialog{
min-width: 420px;
padding: 40px 20px;
.close {
top: 20px;
right: 20px;
}
.dialog-content{
font-size: 24px;
color: #444;
font-weight: 300;
i {
display: inline-block;
color: #d0021b;
font-size: 24px;
margin-right: 20px;
vertical-align: middle;
}
h3 {
margin-top: 35px;
height: 35px;
line-height: 35px;
}
p{
margin-top: 40px;
margin-bottom: 30px;
font-size: 14px;
color: #444;
}
}
.btn {
width: 130px;
height: 33px;
line-height: 33px;
margin-left: 10px;
&:nth-child(2) {
margin-left: 20px;
}
}
}
... ...