Commit 0ba9436b by 朱继来

去掉优惠金额

parent 2301f6f6
......@@ -131,7 +131,7 @@
$('.address-detail').text(data.province_val + data.city_val + data.district_val + data.detail_address);
if (cart_ids.length > 0) {
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type); // 确认订单信息
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online); // 确认订单信息
}
}
}
......@@ -141,7 +141,7 @@
$('.address_id').val('');
if (cart_ids.length > 0) {
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type); // 确认订单信息
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online); // 确认订单信息
}
}
})
......@@ -520,7 +520,7 @@
$('.user_coupon_id').val('');
}
loading.confirm(user_id, address_id, cart_ids, coupon_id, goods_type); // 确认订单信息
loading.confirm(user_id, address_id, cart_ids, coupon_id, goods_type, is_online); // 确认订单信息
})
// 切换销售类型
......@@ -890,15 +890,17 @@
$('.goods_amount_val').empty().text(data.goods_total_format); // 商品总额
$('.order_amount').empty().text(data.order_amount_format); // 订单总额
// 若优惠券ID存在,则不用再推荐
if (!user_coupon_id) {
$('.preferential_price').hide();
$('.preferential_price_val').empty();
self.getCoupon(user_id, goods_type, cart_ids); // 获取最优的优惠券
} else {
$('.preferential_price').show();
$('.preferential_price_val').empty().text(data.preferential_price_format);
// 联营和自营线上
if (is_online != 2) {
if (!user_coupon_id) { // 若优惠券ID不存在,则推荐
$('.preferential_price').hide();
$('.preferential_price_val').empty();
self.getCoupon(user_id, goods_type, cart_ids); // 获取最优的优惠券
} else {
$('.preferential_price').show();
$('.preferential_price_val').empty().text(data.preferential_price_format);
}
}
if (data.extend_fee) {
......@@ -906,7 +908,7 @@
$('.extend_fee_val').empty().text(data.extend_fee_format); // 附加费
}
if (goods_type == 2) {
if (goods_type == 2 && business_type != 2) { // 自营仓库损耗不需要运费
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
}
} else {
......
......@@ -349,7 +349,7 @@
<p class="con-val goods_amount_val"></p>
</div>
<div class="row">
<!-- <div class="row">
<input type="hidden" class="user_coupon_id" name="user_coupon_id" value="">
<p class="con-title"><span style="margin-top: 5px;">选择优惠券:</span></p>
<p class="con-val">
......@@ -362,7 +362,7 @@
<div class="row preferential_price">
<p class="con-title"><span>优惠金额:</span></p>
<p class="con-val preferential_price_val">0.00</p>
</div>
</div> -->
<div class="row extend_fee">
<p class="con-title"><span>附加费:</span></p>
......
......@@ -519,7 +519,7 @@
<table>
<tr>
<td>商品总额:</td>
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price'] ? $order_price_info['goods_price'] : $order_info['order_amount']}}</span></td>
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price']}}</span></td>
</tr>
@if (isset($order_price_info['ext_price']))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment