diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index f6f6cacf0..661c460ff 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -139,6 +139,7 @@ +
@@ -179,6 +180,8 @@
+ +
非油商品
@@ -751,6 +754,19 @@ export default { this.disTotal = 0.00; this.disTotal = (parseFloat(this.disGoods) + parseFloat(this.disOil)).toFixed(2); + }else { + this.disGoods = 0.00; + // 计算商品会员价 + console.log("走了啊", this.goodsList); + this.goodsList.forEach(item => { + const memberPrice = Number(item.retailPrice - item.memberPrice); + const num = Number(item.num); + const product = (memberPrice * num).toFixed(2); // 固定为两位小数 + this.disGoods = (parseFloat(this.disGoods) + parseFloat(product)).toFixed(2); + }); + + // 优惠总金额赋值 + this.disTotal = 0.00; } }, deep: true, @@ -1276,6 +1292,7 @@ export default { }, //表单重置 resetting1() { + console.log("表单重置") this.realAmount = 0.00 //优惠合计金额 this.disTotal = 0.00 @@ -1299,8 +1316,9 @@ export default { // "234520231228115544f073f4" cashierOrderByOrderNo({orderNo: _this.orderNo}).then(response => { if (response.data) { + console.log(1318,response) if (response.data.status == "paid") { - _this.isPay = true; + _this.isPay = false; _this.isPaySuccess = true; _this.isQuery = false; _this.amount = 0 @@ -1460,6 +1478,7 @@ export default { } }) this.loading = true; + console.log(1480,isPaySuccess) if (!isPaySuccess) { await _this.queryPayStatus(); _this.resetting1();