fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 3f28976babc374b2b9ddf03999cdcffbc8f07cf6 1 parent a1348c03

套餐样式

Inline Side-by-side
Showing 4 changed files with 103 additions and 9 deletions
... ... @@ -17,9 +17,9 @@ module.exports = {
cookieDomain: '.yohobuy.com',
domains: {
// test3
// singleApi: 'http://api-test3.yohops.com:9999/',
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/',
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
// prod
// singleApi: 'http://single.yoho.cn/',
... ... @@ -32,8 +32,9 @@ module.exports = {
// service: 'http://service.gray.yohops.com/',
// dev
api: 'http://dev-api.yohops.com:9999/',
service: 'http://dev-service.yohops.com:9999/',
// singleApi: 'http://dev-api.yohops.com:9999/',
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
imSocket: 'ws://socket.yohobuy.com:10240',
imCs: 'http://im.yohobuy.com/api',
... ...
... ... @@ -82,6 +82,32 @@
{{#pools}}
<div class="promotion-pool {{#unless @first}}mt20{{/unless}}" data-role="promotion-pool">
<div class="cart-table promotion-pool-title-group">
<ul class="table table-group">
<li class="pre-sell-box tr">
<div class="pay-pro td line-height" style="width: 516px;">
<i class="cart-item-check iconfont cart-item-checked" data-role="cart-item-check" data-goodstype="ordinary" checked=""></i>
<code class="cart-label">优惠套餐</code>
单中的商品不保留库存，请及时结算。 2. 商品的价格、相关活动信息及库存以订单
</div>
<div style="width:128px;" class="adjust-cart-num td">
<div class="cart-num-cont">
<span class="minus cart-num-btn
disabled">
<i class="iconfont icon-minus"></i>
</span>
<input type="text" value="1" readonly="readonly">
<span class="plus cart-num-btn disabled"><i class="iconfont icon-plus"></i></span>
</div>
</div>
<div style="width:260px;" class="cart-operation td line-height">
<span class="cart-del-btn" data-role="cart-del-btn">删除</span>
</div>
</li>
</ul>
</div>
{{#if promotionInfos}}
<div class="gift-sell mt20">
{{#promotionInfos}}
... ...
... ... @@ -1666,9 +1666,14 @@ $('.package-box').on('click', '#buy-detail', function() {
// 如果只有套餐中商品，都只有一个颜色一个尺码，就直接跳转结算页
if (isSingle) {
// window.location.href = '//www.yohobuy.com/cart/easypay?bundle=' +
// pkgData.bundleId + '&sku=' + singleSkuList.join(',');
return true;
return addBundle({
bundleId: bundleId,
pSkuList: JSON.stringify(pSkuList)
}).then(function(d) {
if (d.code === 200) {
return window.location.href = '//www.yohobuy.com/cart/cart';
}
});
}
var pkgDetailTpl = require('hbs/product/package-dialog.hbs'); //eslint-disable-line
... ... @@ -1789,7 +1794,9 @@ $('.package-box').on('click', '#buy-detail', function() {
bundleId: bundleId,
pSkuList: JSON.stringify(skuList)
}).then(function(d) {
if (d.code === 200) {
return window.location.href = '//www.yohobuy.com/cart/cart';
}
});
}
});
... ...
... ... @@ -261,6 +261,57 @@
}
}
.promotion-pool-title-group {
height: 60px;
.line-height {
line-height: 60px;
}
.pay-pro {
text-align: left !important;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.td {
padding: 0 !important;
top: 0 !important;
margin-top: 0 !important;
}
.cart-num-cont {
margin-top: 15px!important;
}
.cart-item-check {
top: 0 !important;
}
span.cart-del-btn {
width: 60px;
float: right;
clear: both;
overflow: hidden;
height: 60px;
}
}
.cart-label {
width: 66px;
height: 18px;
line-height: 18px;
display: inline-block;
margin-right: 20px;
background-color: #ff575c;
color: #fff;
font-size: 12px;
font-weight: 300;
text-align: center;
}
.pre-sell {
background: #fff;
color: #818181;
... ... @@ -322,6 +373,15 @@
&:last-child {
margin-bottom: 0;
}
.promotion-title-ellipsis {
display: inline-block;
width: 516px;
height: 18px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.order-pay-link {
... ...