fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit cd3e262ceda690443c7a50db3e7178f613ac68cc 2 parents b129b7d1 3c4f1852

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 5 changed files with 129 additions and 104 deletions
... ... @@ -273,9 +273,14 @@ const filterCartData = (result, uid) => {
if (result.data && result.data.ordinary_cart_data) {
ordinaryCartData = result.data.ordinary_cart_data;
totalOrdinaryMoney = ordinaryCartData.shopping_cart_data.last_order_amount;
ordinaryGoods = _.concat(ordinaryGoods, ordinaryCartData.goods_list);
invalidGoods = _.concat(invalidGoods, ordinaryCartData.off_shelves_goods_list);
ordinarySoldOutGoods = _.concat(ordinarySoldOutGoods, ordinaryCartData.sold_out_goods_list);
ordinarySoldOutGoods = ordinaryCartData.sold_out_goods_list; // 库存不足商品
let soldOutWithoutStorage = _.filter(ordinarySoldOutGoods, {storage_number: '0'}); // 库存为0的商品失效
let soldOutWithStorage = _.reject(ordinarySoldOutGoods, {storage_number: '0'}); // 库存不为0的商品归为普通商品并显示库存不足
ordinaryGoods = _.concat(ordinaryGoods, ordinaryCartData.goods_list, soldOutWithStorage); // 正常商品
invalidGoods = _.concat(invalidGoods, ordinaryCartData.off_shelves_goods_list, soldOutWithoutStorage); // 失效商品
_.forEach(ordinaryGoods, function(good) {
buyNumber = parseInt(good.buy_number, 10);
... ... @@ -299,8 +304,7 @@ const filterCartData = (result, uid) => {
hasGoods: advancedGoods.length || ordinaryGoods.length || invalidGoods.length,
preSalePros: (advancedSoldOutGoods.length || advancedGoods.length) ?
_.concat(advancedGoods, advancedSoldOutGoods) : [],
commonPros: (ordinarySoldOutGoods.length || ordinaryGoods.length) ?
_.concat(ordinaryGoods, ordinarySoldOutGoods) : [],
commonPros: ordinaryGoods,
invalidPros: invalidGoods,
selectedNum: selectedAdvanceNum + selectedOrdinaryNum,
checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum),
... ...
{{> sign-header}}
<div class="pay-success-page blk-page">
<div class="center-content">
{{# content}}
<div class="order-info clearfix">
<div class="left">
<p class="success-tip">恭喜您，购买完成！您已成功支付{{round cost 2}}元！</p>
<p class="order-num">订单编号：{{orderNum}}</p>
<p class="payment-online">在线支付：¥{{round onlineCost 2}}</p>
</div>
<div class="btns right">
<a class="btn go-check-order" href="{{orderHref}}">查看订单详情</a>
<a class="btn" href="{{walkHref}}">继续逛逛</a>
</div>
</div>
<div class="tip-info">
<p class="title">温馨提示：</p>
<p>
1.每天15:00以前成功支付的订单将在当天发货，15:00-00:00成功付款的订单将在第二天发货。
2.当订单发货后，您可以登录<a class="blue" href="/me/order">订单中心</a>查询快递发货详情。
3.YOHO!BLK有货支持“开箱验货”和“15天退换货保障”收货后请当面验货，如果发现商品有任何问题请致电客服电话400-889-9646，
<a class="blue" href="/help?id=43">“退换货政策”</a>请点击查看。<em class="blue">4.尊敬的用户：近期为网络诈骗高发期，YOHO!BLK有货郑重声明，不会以任何形式索取客户的账户信息或引导转账，敬请提高警惕，谨防诈骗</em>
</p>
</div>
{{/ content}}
</div>
{{> sign-header}}
<div class="pay-success-page blk-page">
<div class="center-content">
{{# content}}
<div class="order-info clearfix">
<div class="left">
<p class="success-tip">
恭喜您，购买完成！您已成功支付
{{#if cost}}
{{round cost 2}}元
{{#if coin}}
，有货币{{coin}}个
{{/if}}
{{^}}
有货币{{coin}}个
{{/if}}
！
</p>
<p class="order-num">订单编号：{{orderNum}}</p>
{{#if onlineCost}}
<p class="payment-online">在线支付：¥{{round onlineCost 2}}</p>
{{/if}}
{{#if coin}}
<p class="payment-coin">有货币支付：{{coin}}</p>
{{/if}}
</div>
<div class="btns right">
<a class="btn go-check-order" href="{{orderHref}}">查看订单详情</a>
<a class="btn" href="{{walkHref}}">继续逛逛</a>
</div>
</div>
<div class="tip-info">
<p class="title">温馨提示：</p>
<p>
1.每天15:00以前成功支付的订单将在当天发货，15:00-00:00成功付款的订单将在第二天发货。
2.当订单发货后，您可以登录<a class="blue" href="/me/order">订单中心</a>查询快递发货详情。
3.YOHO!BLK有货支持“开箱验货”和“15天退换货保障”收货后请当面验货，如果发现商品有任何问题请致电客服电话400-889-9646，
<a class="blue" href="/help?id=43">“退换货政策”</a>请点击查看。<em class="blue">4.尊敬的用户：近期为网络诈骗高发期，YOHO!BLK有货郑重声明，不会以任何形式索取客户的账户信息或引导转账，敬请提高警惕，谨防诈骗</em>
</p>
</div>
{{/ content}}
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -118,33 +118,33 @@
<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="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="javascript:void(0)">{{product_name}}</a></div>
<div>
{{#if color_name}}
<span class="mr20">颜色: {{color_name}}</span>
{{/if}}
{{#if size_name}}
<span>尺寸: {{size_name}}</span>
{{/if}}
</div>
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round sales_price 2}}</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_id={{product_id}}><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
</div>
</li>
<li>
<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="javascript:void(0)">{{product_name}}</a></div>
<div>
{{#if color_name}}
<span class="mr20">颜色: {{color_name}}</span>
{{/if}}
{{#if size_name}}
<span>尺寸: {{size_name}}</span>
{{/if}}
</div>
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round sales_price 2}}</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_id={{product_id}}><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
</div>
</li>
</ul>
{{/each}}
</div>
... ...
... ... @@ -9,6 +9,9 @@ var $cate = $('.cateId-' + queryId);// 当前分类
var $subsets = $('.subsets');
var parentID = queryId.substr(0, 1);// 一级分类id
require('../common/header');
require('../common/return-top');
/**
* 目录切换
*/
... ...
.pay-success-page {
.order-info {
margin-top: 40px;
padding-bottom: 30px;
}
.success-tip {
font-size: 18px;
font-weight: bold;
margin-bottom: 30px;
}
.order-num,
.payment-online {
font-size: 16px;
font-weight: bold;
line-height: 26px;
}
.btns .btn {
width: 160px;
height: 40px;
line-height: 40px;
}
.go-check-order {
margin-bottom: 20px;
}
.tip-info {
border-top: 1px solid #eee;
font-size: 14px;
color: #666;
line-height: 20px;
margin-bottom: 40px;
.title {
line-height: 50px;
color: #000;
font-weight: bold;
}
}
}
.pay-success-page {
.order-info {
margin-top: 40px;
padding-bottom: 30px;
}
.success-tip {
font-size: 18px;
font-weight: bold;
margin-bottom: 30px;
}
.order-num,
.payment-online,
.payment-coin {
font-size: 16px;
font-weight: bold;
line-height: 26px;
}
.btns .btn {
width: 160px;
height: 40px;
line-height: 40px;
}
.go-check-order {
margin-bottom: 20px;
}
.tip-info {
border-top: 1px solid #eee;
font-size: 14px;
color: #666;
line-height: 20px;
margin-bottom: 40px;
.title {
line-height: 50px;
color: #000;
font-weight: bold;
}
}
}
... ...