fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit a66fe672156adb8e14fe00a69b7c5ae95dcc933d 1 parent a676800c

view

Inline Side-by-side
Showing 16 changed files with 785 additions and 320 deletions
... ... @@ -271,6 +271,26 @@ const getRecommendProductAction = (req, res) => {
});
};
/**
* 凑单 加价购异步请求
*/
const getIncreasePurchase = (req, res) => {
co(function * () {
let page = req.query.page;
/* let ret = {
code: 200,
message: '凑单商品'
};*/
ret = yield service.getTogetherProduct(page);
return res.send(ret);
});
};
module.exports = {
getProductInfo,
cart,
... ... @@ -283,5 +303,6 @@ module.exports = {
moveToFav,
checkFav,
getTogetherProduct,
getRecommendProductAction
getRecommendProductAction,
getIncreasePurchase
};
... ...
... ... @@ -205,8 +205,8 @@
<!-- 加价购 -->
<div class="gift-sell mt40">
<p><code class="order-pay-mark-white">加价购</code>【全场热销】活动商品已购满¥398.00，可加价换购商品<a>去换购</a><button class="btn-clear blue">去凑单&nbsp;></button></p>
<p><code class="order-pay-mark-white">满减</code>【热销满减】活动商品已购满¥498.00，享优惠¥49<button class="btn-clear blue">去凑单&nbsp;></button></p>
<p><code class="order-pay-mark-white">加价购</code>【全场热销】活动商品已购满¥398.00，可加价换购商品<a>去换购</a><button class="btn-clear blue" data-together-id="1" >去凑单&nbsp;></button></p>
<p><code class="order-pay-mark-white">满减</code>【热销满减】活动商品已购满¥498.00，享优惠¥49<button class="btn-clear blue" data-together-id="2" >去凑单&nbsp;></button></p>
</div>
<div class="cart-table">
<ul class="table">
... ... @@ -305,7 +305,7 @@
<!-- 折扣 -->
<div class="gift-sell mt20">
<p><code>折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear">去凑单&nbsp;></button></p>
<p><code>折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="3" >去凑单&nbsp;></button></p>
</div>
<div class="cart-table">
<ul class="table">
... ... @@ -388,8 +388,8 @@
<!-- 折扣 赠品 -->
<div class="gift-sell mt20">
<p><code class="order-pay-mark-white">折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear">去凑单&nbsp;></button></p>
<p><code>赠品</code>【Life·After Life】活动商品已购满1件，可领取赠品<a>领赠品</a><button class="btn-clear">去凑单&nbsp;></button></p>
<p><code class="order-pay-mark-white">折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="4" >去凑单&nbsp;></button></p>
<p><code>赠品</code>【Life·After Life】活动商品已购满1件，可领取赠品<a>领赠品</a><button class="btn-clear" data-together-id="5" >去凑单&nbsp;></button></p>
</div>
<div class="cart-table">
<ul class="table">
... ... @@ -642,8 +642,8 @@
<!-- 失效 -->
<div class="gift-sell mt20">
<p><code>加价购</code>【全场热销】活动商品已购满¥398.00，可加价换购商品<a>去换购</a><button class="btn-clear blue">去凑单&nbsp;&gt;</button></p>
<p><code>赠品</code>【热销满减】活动商品已购满¥498.00，享优惠¥49<a>领赠品</a><button class="btn-clear blue">去凑单&nbsp;&gt;</button></p>
<p><code>加价购</code>【全场热销】活动商品已购满¥398.00，可加价换购商品<a>去换购</a><button class="btn-clear blue" data-together-id="6">去凑单&nbsp;&gt;</button></p>
<p><code>赠品</code>【热销满减】活动商品已购满¥498.00，享优惠¥49<a>领赠品</a><button class="btn-clear blue" data-together-id="7" >去凑单&nbsp;&gt;</button></p>
<p><code>免运费</code>【热销满减】活动商品已购满¥498.00，享优惠¥49</p>
</div>
{{/cartEnsure}}
... ... @@ -705,57 +705,51 @@
{{/if}}
</div>
</div>
<!--凑单商品模板-->
<div class="together"></div>
<div class="histroy givePoint"></div>
{{> cart-medley}}
<!-- 商品信息详情 -->
<div class="goods-detail"></div>
<div class="loading"><span></span>请稍后...</div>
</div>
</div>
{{#unless @root.pc.product.removeRecentView}}
<div class="lazy-load-object">
<textarea class="datalazyload" style="visibility: hidden;">
<script>
fetchRecommend();
</script>
</textarea>
</div>
<div class="bottom-tab">
<p>
<span class="bottom-title bottom-cur">店铺推荐</span>
<span class="bottom-title">最近浏览</span>
<span class="bottom-title change">换一批
<span class="iconfont change-icon">&#xe639;</span>
</span>
</p>
</div>
{{#unless @root.pc.product.removeRecentView}}
<div class="lazy-load-object">
<textarea class="datalazyload" style="visibility: hidden;">
<script>
fetchRecommend();
</script>
</textarea>
</div>
<div class="individual-comment info-block info-bottom">
{{#if latestWalk}}
<div class="latest-walk">
<input id="latest-walk-count" type="hidden" value="{{latestWalk}}">
<div id="latest-walk-goods" class="goods clearfix"></div>
{{> product/latest-walk-tpl}}
</div>
{{/if}}
<div class="bottom-tab bottom-tab-slide">
<span class="bottom-title cur">凑单商品</span>
<span class="bottom-title">为您优选</span>
<span class="bottom-title">最近浏览</span>
<span class="change">换一批
<span class="iconfont change-icon">&#xe639;</span>
</span>
</div>
<div id="recommend-shop" class="hide">
<div class="recommend-content clearfix">
<div class="recommend-slider">
<ul class=" img-list" id="recommend-content"></ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
<div class="individual-slide">
<div class="individual-item individual-item-togetherGoods">
<input id="" type="hidden" value="">
<div id="" class="goods clearfix">
{{>individual-slide}}
</div>
</div>
<div class="individual-item individual-item-recommendGoods none">
<input id="" type="hidden" value="{{latestWalk}}">
<div id="" class="goods clearfix">
{{>individual-slide}}
</div>
</div>
<div class="individual-item individual-item-latestWalk none">
<input id="latest-walk-count" type="hidden" value="">
<div id="latest-walk-goods" class="goods clearfix">
{{>individual-slide}}
</div>
</div>
</div>
</div>
</div>
{{/unless}}
<div class="loading"><span></span>请稍后...</div>
</div>
</div>
{{/unless}}
</div>
<!-- 商品详细信息窗口 -->
... ...
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price sale-price-new">8888{{salePrice}}</span>
<span class="market-price">7777{{marketPrice}}</span>
</p>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
</div>
<div class="good">
<a href="{{href}}" target="_blank">
<img class="lazy" data-original="{{img}}"/>
</a>
<a class="name" href="{{href}}" target="_blank">哈哈哈哈哈哈哈哈哈哈{{name}}</a>
<p class="price">
<span class="sale-price">8888{{salePrice}}</span>
</p>
</div>
... ...
{{> individual-slide-tpl}}
<div class="lazy-load-object">
<textarea class="latest-walk-datalazyload" style="visibility: hidden;">
<script> fetchLatestWalk(); </script>
</textarea>
</div>
... ...
<!-- 凑单 -->
<div class="detail-body">
<div class="detail-bigpic">
<div class="bigpic">
<img src="../../../public/img/product/after-service-1.png">
</div>
<div class="piclist">
<span class="pre"></span>
<div class="con">
<ul>
<li><img src="../../../public/img/product/after-service-1.png"></li>
<li><img src="../../../public/img/product/after-service-1.png"></li>
<li><img src="../../../public/img/product/after-service-1.png"></li>
<li><img src="../../../public/img/product/after-service-1.png"></li>
<li><img src="../../../public/img/product/after-service-1.png"></li>
</ul>
</div>
<span class="next"></span>
</div>
</div>
<div class="detail-info">
<div class="title">
<h2>哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈{{name}}</h2>
</div>
<div class="price">
<span class="newprice">现价：<b class="promotion-price">¥7777{{salePrice}}</b></span>
<span class="activityprice">活动价：<b class="promotion-price">¥5555{{marketPrice}}</b></span>
</div>
<div class="order">
<dl>
<dd class="colorBox">选颜色：</dd>
<dt>
<div class="colorBox">
<ul>
<li class="color active">
<p class="{{#if focus}}atcive{{/if}}"><span></span><img src="../../../public/img/product/after-service-1.png"></p>
<span>{{name}}</span>
</li>
<li class="color">
<p class="{{#if focus}}atcive{{/if}}"><span></span><img src="../../../public/img/product/after-service-1.png"></p>
<span>{{name}}</span>
</li>
</ul>
</div>
</dt>
</dl>
<dl>
<dd class="showSizeBox">选尺码：</dd>
<dt>
<div class="showSizeBox">
<span data-sku="{{sku}}" data-num="{{num}}" class="disabled">40码{{name}}</span>
<span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
<span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
<span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
</div>
</dt>
</dl>
<dl>
<dd>选件数：</dd>
<dt>
<div class="amount_wrapper">
<input type="text" id="num" class="num" value="1" readonly="readonly">
<i class="amount cut"></i>
<i class="amount add"></i>
</div>
</dt>
</dl>
</div>
<div class="submit">
<button class="btn-red"><i class="addCart"></i>添加到购物车</button>
<button><i class="favCount"></i>收藏商品</button>
</div>
</div>
<div class="detail-size">
<h3>尺码信息（单位：厘米）</h3>
<table>
<thead>
<tr>
<th width="{{width}}">吊牌吃吗</th>
<th width="{{width}}">吊牌吃吗</td>
<th width="{{width}}">吊牌吃吗</td>
<th width="{{width}}">吊牌吃吗</td>
<th width="{{width}}">吊牌吃吗</td>
<th width="{{width}}">吊牌吃吗</td>
</tr>
</thead>
<tbody>
<tr>
<td>6666{{.}}</td>
</tr>
<tr>
<td>4444{{.}}</td>
</tr>
</tbody>
</table>
<div class="size-info">
※ 以上尺寸为实物实际测量，因测量方式不同会有略微误差，相关数据仅作参考，以收到实物为准。
</div>
</div>
</div>
<input value="{{addToCart}}" id="addToCart" type="hidden" />
... ...

1.4 KB | W: | H:

1.19 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.43 KB | W: | H:

1.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

48.3 KB | W: | H:

48.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
/**
* 订单结算页
* @author: gxh<xuhui.ge@yoho.cn>
* @date: 2016/12/24
* @date: 2016/12/27
*/
var $ = require('yoho-jquery');
var order = {};
var lazyLoad = require('yoho-jquery-lazyload');
var Dialog = require('../common/dialog').Dialog;
var payWay,
deliveryWay;
$('.sale-info').mouseover(function() {
// 优惠券 显示和隐藏
$('.sale-info').mouseenter(function() {
$(this).addClass('active').children('ul').removeClass('none');
}).mouseleave(function() {
$(this).removeClass('active').children('ul').addClass('none');
});
// 推荐、优选、浏览切换
$('.bottom-tab-slide').on('click', '.bottom-title', function() {
var $this = $(this),
index = $this.index();
console.log(index);
var $togetherGoods = $('.individual-item-togetherGoods'),
$latestWalk = $('.individual-item-latestWalk'),
$recommendGoods = $('.individual-item-recommendGoods');
// var cart = {};
//
// var saleInfo;
//
// saleInfo = {
// $saleInfo: $('.sale-info '),
// init: function() {
// var that = this;
//
// this.$saleInfo.each(function() {
// var $this = $(this);
//
// });
// }
// }
// 支付方式
payWay = {
$payType: $('.pay-wrap .check-btn'),
init: function() {
var that = this;
this.payType = {};
this.$payType.each(function() {
var $this = $(this),
data = $this.data();
that.payType[data.id] = {
dom: $this,
id: data.id,
type: data.type
};
// 更新订单支付数据
if ($this.hasClass('checked')) {
that.updateOrder(data);
}
});
this.eventBind();
},
eventBind: function() {
var that = this;
this.$payType.click(function() {
var $this = $(this);
if ($this.hasClass('cur')) {
return;
}
if ($this.hasClass('checked')) {
return;
}
$this.addClass('cur');
$this.siblings('.cur').removeClass('cur');
that.$payType.removeClass('checked');
$this.addClass('checked');
switch (index) {
case 0: {
// 更新订单支付数据
that.updateOrder($this.data());
});
},
updateOrder: function(info) {
if (!info) {
return;
$togetherGoods.removeClass('none');
$recommendGoods.addClass('none');
$latestWalk.addClass('none');
console.log(4);
break;
}
if (info.id) {
order.paymentId = info.id;
case 1: {
$togetherGoods.addClass('none');
$recommendGoods.removeClass('none');
$latestWalk.addClass('none');
console.log(5);
break;
}
if (info.type) {
order.paymentType = info.type;
case 2: {
$togetherGoods.addClass('none');
$recommendGoods.addClass('none');
$latestWalk.removeClass('none');
console.log(6);
break;
}
}
};
deliveryWay = {
$deliveryType: $('.delivery-way-wrap .check-btn'),
$deliveryTime: $('.delivery-time-wrap .check-btn'),
init: function() {
var that = this;
this.deliveryType = {};
this.$deliveryType.each(function() {
var $this = $(this),
data = $this.data();
that.deliveryType[data.id] = {
dom: $this,
id: data.id
};
// 更新订单配送方式数据
if ($this.hasClass('checked')) {
that.updateOrder({way: data.id});
}
});
this.$deliveryTime.each(function() {
var $this = $(this);
// 更新订单送货时间数据
if ($this.hasClass('checked')) {
that.updateOrder({time: $this.data('id')});
}
});
this.eventBind();
},
eventBind: function() {
var that = this;
this.$deliveryType.click(function() {
var $this = $(this);
if ($this.hasClass('checked')) {
return;
}
that.$deliveryType.removeClass('checked');
$this.addClass('checked');
// 更新订单配送方式数据
that.updateOrder({way: $this.data('id')});
});
this.$deliveryTime.click(function() {
var $this = $(this);
if ($this.hasClass('checked')) {
return;
}
that.$deliveryTime.removeClass('checked');
$this.addClass('checked');
// 更新订单送货时间数据
that.updateOrder({time: $this.data('id')});
});
}
// 仅前端展示，该数据无作用，接口不接受此参数
$('.delivery-time-wrap .radio-btn').click(function() {
var $this = $(this);
});
if ($this.hasClass('on')) {
return;
}
$this.siblings('.on').removeClass('on');
$this.addClass('on');
});
},
updateOrder: function(info) {
if (!info) {
return;
}
if (info.time) {
order.deliveryTime = info.time;
}
// 凑单图片懒加载
var togetherDialog = {};
var dialogTpl = require('hbs/cart/cart-togetherGoods.hbs');
if (info.way) {
order.deliveryWay = info.way;
}
}
};
payWay.init();
deliveryWay.init();
lazyLoad($('#details-html img'));
$('.shop-cart').on('click', '.gift-sell .btn-clear', function() {
// 凑单商品、为您优选、最近浏览
$('.bottom-tab').on('click', '.bottom-title', function() {
var $this = $(this),
index = $this.index();
var tid = $(this).attr('data-together-id');
showTogetherGoods(tid);
var $latestWalk = $('.individual-comment .latest-walk'),
$recommendComment = $('.individual-comment #recommend-shop');
});
if ($this.hasClass('change')) {
return;
}
// 凑单
function showTogetherGoods(id) {
if ($this.hasClass('bottom-cur')) {
if (!id) {
return;
}
$this.addClass('bottom-cur');
$this.siblings('.bottom-cur').removeClass('bottom-cur');
if (index === 0) {
// 店铺推荐
$recommendComment.slideDown(SLIDETIME);
$latestWalk.slideUp(SLIDETIME);
$('.change').removeClass('hide');
} else {
// 最近游览
fetchLatestWalk(); // eslint-disable-line
$recommendComment.slideUp(SLIDETIME);
$latestWalk.slideDown(SLIDETIME);
var dialog = togetherDialog[id];
if (!dialog) {
dialog = new Dialog({
content: dialogTpl(),
className: 'cart-togetherGoods'
});
$('.change').addClass('hide');
togetherDialog[id] = dialog;
}
});
dialog.show();
$('.recommend-content').find('.iconfont').mouseenter(function() {
$(this).addClass('focus');
}).mouseleave(function() {
$(this).removeClass('focus');
});
}
// 清空失效商品
... ...
.cart-togetherGoods {
margin-left: -350px;
width: 700px;
height: auto;
overflow: hidden;
background: #fff;
&.yoho-dialog {
.close {
top: 10px;
right: 10px;
.iconfont {
font-size: 20px;
}
}
}
.detail-body {
width: 610px;
padding: 15px;
margin: 0 auto;
.none {
display: none;
}
}
.detail-bigpic {
width: 180px;
padding-bottom: 30px;
float: left;
.bigpic {
border: 1px solid red;
width: 180px;
height: 240px;
display: block;
margin: 0 auto 10px;
img {
width: 100%;
height: auto;
}
}
.piclist {
height: 55px;
cursor: pointer;
span {
width: 15px;
height: 55px;
}
.pre {
background: url(/cart/pre.png);
float: left;
}
.next {
background: url(/cart/next.png);
float: right;
}
.con {
width: 145px;
height: 55px;
overflow: hidden;
float: left;
margin-left: 5px;
li {
float: left;
width: 40px;
height: 55px;
border: 1px red solid;
margin: 0 5px 0 0;
vertical-align: top;
overflow: hidden;
text-align: center;
}
img {
width: auto;
height: 100%;
display: inline-block;
}
.active {
width: 40px;
height: 55px;
border: 2px #333 solid;
}
}
}
}
.detail-info {
width: 355px;
float: right;
.title {
h2 {
width: 355px;
color: #000;
font-size: 18px;
color: #444;
font-weight: 500;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
}
.price {
padding: 0px 0px 20px 0px;
margin-bottom: 20px;
border-bottom: 1px solid #e0e0e0;
.newprice {
display: block;
color: #b0b0b0;
font-size: 12px;
font-weight: normal;
height: 25px;
line-height: 25px;
text-align: left;
b {
font-size: 13px;
font-family: arial;
}
}
.activityprice {
display: block;
color: #444;
font-size: 13px;
font-weight: normal;
height: 22px;
line-height: 22px;
text-align: left;
b {
font-size: 22px;
}
}
}
.order{
color: #999;
font-size: 13px;
zoom: 1;
&:after {
content: '';
display:block;
clear: both;
height: auto;
}
dl {
zoom: 1;
&:after {
content: '';
display: block;
clear: both;
height: auto;
}
}
dd {
width: 55px;
float: left;
padding-bottom: 15px;
text-align: left;
}
dt {
width: 300px;
float: left;
padding-bottom: 15px;
text-align: left;
}
dd.colorBox {
line-height: 40px;
}
dd.showSizeBox {
line-height: 23px;
}
.colorBox {
&>ul {
zoom: 1;
&:after {
content: '';
display: block;
clear: both;
height: auto;
}
}
li {
width: 40px;
height: 40px;
overflow: hidden;
text-align: center;
margin-right: 5px;
display: inline;
float: left;
cursor: pointer;
.active {
width: 40px;
height: 40px;
border: 2px #232323 solid;
}
p {
width: 38px;
height: 38px;
margin: 0px;
display: inline-block;
border: 1px #f5f6f5 solid;
position: relative;
img {
width: 100%;
height: auto;
}
}
}
}
.showSizeBox{
span {
cursor: pointer;
min-width:38px;
height: 23px;
line-height: 23px;
padding: 0px 12px;
border: 1px #f5f6f5 solid;
margin: 1px 5px 5px 1px;
display: inline;
float: left;
overflow: hidden;
font-size: 14px;
color: #444;
&.disabled {
color: #999;
}
}
}
.amount_wrapper {
position: relative;
width: 52px;
height: 23px;
line-height: 23px;
display: inline-block;
.amount {
position: absolute;
right: 0;
border: 1px solid #eaeceb;
width: 10px;
height: 10px;
display: inline;
cursor: pointer;
background-position: center center;
background-repeat: no-repeat;
}
.cut {
top: 0;
background: url(/cart/minus.png);
}
.add {
bottom: 0;
background: url(/cart/plus.png);
}
.num {
width: 38px;
height: 21px;
line-height: 16px;
border: #eaeceb solid 1px;
text-align: center;
overflow: hidden;
float: left;
font-size: 15px;
color: #666;
}
}
}
.submit {
text-align: left;
button {
width: 140px;
height: 40px;
font-size: 15px;
color: #444;
margin-right: 20px;
border: 1px solid #b0b0b0;
background-color: #fff;
box-sizing: border-box;
i{
width: 16px;
height: 16px;
display: inline-block;
vertical-align: top;
margin-right: 8px;
margin-top: 2px;
background-repeat: no-repeat;
background-position: middle middle;
&.addCart{
background-image: url(/cart/addCart.png);
}
&.favCount{
background-image: url(/cart/pavCount.png);
}
}
&.btn-grey {
background-color: #b0b0b0;
}
&.btn-red {
color: #fff;
border-color: #d0021b;
background-color: #d0021b;
}
}
}
}
.detail-size {
float: left;
border-top: 1px solid #e0e0e0;
width: 100%;
height: auto;
padding-bottom: 15px;
h3 {
height: 35px;
line-height: 35px;
font-size: 14px;
color: #444;
text-align: left;
margin-bottom: 10px;
}
table {
width: 100%;
height: auto;
border: none;
margin-bottom: 5px;
font-size: 14px;
border-bottom: 1px dashed #eaeceb;
td {
font-weight: normal;
background: #fff;
text-align: center;
padding: 8px 3px;
color: #444;
height: 30px;
line-height: 30px;
}
tr{
th{
text-align: center;
background: #f5f7f6;
color: #999;
font-weight: 800;
height: 30px;
line-height: 30px;
}
}
}
.size-info {
margin-top: 20px;
font-size: 14px;
color: #444;
text-align: left;
}
}
}
... ...
... ... @@ -246,8 +246,6 @@
}
}
.cart-add-btn{
width: 118px;
height: 32px;
... ... @@ -706,7 +704,7 @@
}
li {
position: relative;
padding: 0 30px;
padding: 0 30px 0 60px;
}
.tr{
border-bottom: 1px solid #e0e0e0;
... ... @@ -734,6 +732,8 @@
}
.cart-item-check {
position: absolute;
left: 15px;
width: 15px;
height: 15px;
float: left;
... ... @@ -749,6 +749,8 @@
}
}
.cart-item-disabled {
position: absolute;
left: 15px;
width: 16px;
height: 15px;
float: left;
... ... @@ -808,15 +810,15 @@
color: #9a9a9a;
text-align: left;
b {
display: inline-block;
vertical-align: bottom;
max-width: 130px;
margin-right: 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
display: inline-block;
vertical-align: bottom;
max-width: 130px;
margin-right: 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
}
... ... @@ -1054,6 +1056,7 @@
}
}
.cartnew-submit {
height: 50px;
line-height: 50px;
... ... @@ -1081,82 +1084,117 @@
cursor: pointer;
float: right;
}
}
}
.bottom-tab{
.bottom-title{
font-size: 14px;
display: inline-block;
padding-bottom: 12px;
margin: 10px 2px -2px 10px;
font-weight: bold;
cursor: pointer;
}
.bottom-cur{
border-bottom: 2px solid #000;
}
.bottom-tab-slide {
.change{
float: right;
&.bottom-tab {
height: 40px;
line-height:40px;
border-bottom: 1px solid #dcdcdc;
.change-icon{
.bottom-title {
width: 80px;
text-align: center;
margin:0 13px;
font-size: 18px;
color: #444;
display: inline-block;
font-weight: normal;
cursor: pointer;
}
.change {
color: #444;
display: inline-block;
font-weight: normal;
cursor: pointer;
float: right;
font-size: 16px;
margin-right: 0;
&.cur {
border-bottom: none;
}
.change-icon {
font-size: 24px;
-webkit-text-stroke-width: .5px;
}
}
.cur {
border-bottom: 2px solid #3a3a3a;
}
}
}
.latest-walk {
overflow: inherit;
border-top: none;
display: none;
.goods {
width: 1150px;
margin: 0 auto;
height: 410px;
margin-top: 20px;
> div {
float: left;
width: 222px;
margin-right: 10px;
.individual-slide {
width: 990px;
height: 343px;
overflow: hidden;
.individual-item {
width:100%;
overflow: hidden;
font-size: 12px;
&:nth-child(5n) {
margin-right: 0;
}
}
}
.goods {
width: 990px;
height: 300px;
margin: 20px 0;
overflow: hidden;
}
img {
height: 300px;
width: 222px;
display: block;
}
.good {
float: left;
margin-right: 10px;
width: 190px;
&:nth-child(5n) {
margin-right: 0;
}
}
.name {
display: block;
margin-top: 5px;
color: #222;
line-height: 16px;
margin: 0 auto;
}
img {
display: block;
width: 190px;
height: 251px;
}
.price {
color: #222;
font-weight: bold;
margin-top: 5px;
text-align: center;
}
.name {
display: block;
font-size: 12px;
color: #222;
text-align: center;
height: 12px;
line-height: 12px;
margin: 15px 0 10px;
padding-left: 2px;
padding-right: 2px;
@mixin ellipsis;
}
.market-price {
margin-right: 5px;
}
.price {
text-align: center;
}
.sale-price,.market-price {
color: #000;
font-weight: normal;
}
.sale-price-new {
color: #d0021b;
margin-right: 15px;
}
.has-sale {
text-decoration: line-through;
color: #999;
.market-price {
text-decoration: line-through;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -2,3 +2,4 @@
@import "order-ensure2016";
@import "cart";
@import "goods-detail";
@import "cart-togetherGoods";
\ No newline at end of file
... ...