fe / yoho-blk · Commits

Go to a project

Authored by xuqi
Commit 9ac4c50c6042a4e53b87d90d187d24810eab87c3 1 parent 30512600

balance compute

Inline Side-by-side
Showing 3 changed files with 33 additions and 25 deletions
... ... @@ -174,23 +174,13 @@
支付方式：<em id="balance-pay-type">在线支付</em>
</p>
</div>
<ul class="balance-list right">
<li>
<span class="balance-title">商品金额：</span>
<span class="balance-cost">{{str_order_amount}}</span>
</li>
<li>
<span class="balance-title">有货币：</span>
<span class="balance-cost">-¥<em id="balance-coin" class="balance-coin">{{round balanceCoin 2}}</em></span>
</li>
<li>
<span class="balance-title">运费：
{{#isY is_multi_package}}
<em class="package-shipping-tip">(原价{{../shippingOrigin}}元，优惠{{../shippingDiscount}}元)</em>
{{/isY}}
</span>
<span class="balance-cost">¥{{round shipping_cost 2}}</span>
</li>
<ul id="balance-list" class="balance-list right">
{{#each promotion_formula_list}}
<li>
<span class="balance-title">{{promotion}}</span>
<span class="balance-cost">{{promotion_amount}}</span>
</li>
{{/each}}
<li class="need-pay">
<span class="balance-title">应付金额{{#if shipping_cost}}（含运费）{{/if}}：</span>
<span id="balance-cost" class="balance-cost" data-cost="{{last_order_amount}}">¥<em>{{round last_order_amount 2}}</em></span>
... ... @@ -202,6 +192,22 @@
{{/ shopping_cart_data}}
</div>
<script id="balance-tpl" type="text/html">
\{{#each promotion_formula_list}}
<li>
<span class="balance-title">\{{promotion}}</span>
<span class="balance-cost">\{{promotion_amount}}</span>
</li>
\{{/each}}
<li class="need-pay">
<span class="balance-title">应付金额\{{#if shipping_cost}}（含运费）\{{/if}}：</span>
<span id="balance-cost" class="balance-cost" data-cost="{{last_order_amount}}">¥<em>\{{last_order_amount}}</em></span>
</li>
<li>
<span id="submit-order" class="btn submit-order">提交订单</span>
</li>
</script>
<script id="address-list-tpl" type="text/html">
\{{#each address}}
<li class="address\{{#isY is_default}} default\{{/isY}}\{{#if focus}} focus\{{/if}}"
... ...
... ... @@ -5,6 +5,7 @@
*/
var $ = require('yoho-jquery'),
Hbs = require('yoho-handlebars'),
lazyLoad = require('yoho-jquery-lazyload');
var Alert = require('../plugins/dialog').Alert;
... ... @@ -27,13 +28,14 @@ var $coin = $('#input-coin'),
maxUse: '您最多使用',
muPostfix: '个有货币'
};
var $balanceCost = $('#balance-cost'),
$balanceCoin = $('#balance-coin');
var $balanceCost = $('#balance-cost');
var $printPrice = $('#print-price');
var $invoice = $('#invoice-content');
var balanceTpl = Hbs.compile($('#balance-tpl').html());
require('yoho-jquery-dotdotdot');
require('../plugins/check'); // before 地址和发票
... ... @@ -127,15 +129,14 @@ function compute(coin) {
coin: coin
}
}).then(function(data) {
var usedCoin,
cost;
var cost;
if (data.code === 200) {
usedCoin = data.data.use_yoho_coin;
cost = data.data.last_order_amount;
$balanceCost.children('em').text(cost);
$balanceCoin.text(usedCoin);
cost = cost.toFixed(2);
$('#balance-list').html(balanceTpl(data.data));
}
});
}
... ...
.blk-cart-page {
.blk-cart-page,
.shopping-order-page {
.cart-bc {
width: 100%;
position: relative;
... ...