|
|
@@ -12,10 +12,10 @@ var totalCoupons = [];
|
|
|
// 当前商品可用优惠券
|
|
|
var selectCoupons = [];
|
|
|
// 勾选后的优惠金额
|
|
|
-var couponPrice = $("#couponAmount").val() ? $("#couponAmount").val()*1 : 0;
|
|
|
+var couponPrice = 0;
|
|
|
// 添加订单true,修改订单false
|
|
|
var initFlag = true;
|
|
|
-var orderStatus = $("#orderStatus").val() ? $("#orderStatus").val()*1 : 0;
|
|
|
+var orderStatus = 0;
|
|
|
|
|
|
$(function() {
|
|
|
/** 发票信息 start * */
|
|
|
@@ -793,6 +793,7 @@ function showSencondHandSelect(iframe) {
|
|
|
function setProductList(data) {
|
|
|
console.log("设置" + JSON.stringify(data));
|
|
|
var userId = $("#inputForm").find("[name*='bpOrderUserinfo.userId']").val();
|
|
|
+ var orderStatus = $("#orderStatus").val() ? $("#orderStatus").val()*1 : 0;
|
|
|
data.productType = 0;
|
|
|
var shopFee = data.shopFee;
|
|
|
var cmPromotion = '';
|
|
|
@@ -1215,6 +1216,7 @@ function setOrderFee() { //不考虑经理折扣、运费，此时 商品总金
|
|
|
orderTotalFee = 0, //订单总额
|
|
|
reducedPrice = 0, //促销满减
|
|
|
payTotalFee = 0; //应付总额
|
|
|
+ var couponPrice = $("#couponAmount").val() ? $("#couponAmount").val()*1 : 0;
|
|
|
$('.productTable tbody tr:not(.gift)').each(function(index, element) {
|
|
|
var obj = JSON.parse($(this).attr("data-value"));
|
|
|
productTotalFee = ((Number(productTotalFee) * 100 + Number(obj.num * obj.price) * 100 + Number(obj
|
plf