diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 585a1fc..8166d3f 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -625,7 +625,10 @@ Page({ } th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2); - th.data.cartlist[i].coupon_price=coupon_price.toFixed(2); + + if (coupon_price>0) th.data.cartlist[i].coupon_price=coupon_price.toFixed(2); + else th.data.cartlist[i].coupon_price = coupon_price + th.data.cartlist[i].goods_price = o_price.toFixed(2); th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money; //会员使用余额 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 2bacd30..ae16b54 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -331,7 +331,7 @@ Page({ var th=this; var order_id=t.currentTarget.dataset.order_id; wx.showModal({ - title: "是否取消订单?", + title: "是否删除订单?", success: function(tt) { t.confirm && rq.put("/api/weshop/order/updatebyId", { data: { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 8a0cec5..9697ba9 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -252,7 +252,7 @@ Page({ var th=this; var order_id=t.currentTarget.dataset.order_id; wx.showModal({ - title: "是否取消订单?", + title: "是否删除订单?", success: function(tt) { tt.confirm && rq.put("/api/weshop/order/updatebyId", { data: {