Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
This commit is contained in:
commit
e00213be32
|
|
@ -1757,11 +1757,12 @@ export default {
|
||||||
const amount = this.createOrder.data.amount || 0;
|
const amount = this.createOrder.data.amount || 0;
|
||||||
const discount = this.createOrder.discount || 1;
|
const discount = this.createOrder.discount || 1;
|
||||||
// const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
|
// const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
|
||||||
const total = (amount - this.coupdiscount) * this.createOrder.discount;
|
const total = (amount) * this.createOrder.discount - this.coupdiscount;
|
||||||
return total <= 0 ? 0 : total;
|
return total <= 0 ? 0 : total;
|
||||||
},
|
},
|
||||||
yinFuJinE() {
|
yinFuJinE() {
|
||||||
const total = this.currentPayMoney - (this.points.toMoney || 0);
|
const total = this.currentPayMoney - (this.points.toMoney || 0);
|
||||||
|
console.log(total)
|
||||||
if (this.isCreateOrder) {
|
if (this.isCreateOrder) {
|
||||||
return total.toFixed(2);
|
return total.toFixed(2);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -2676,7 +2677,7 @@ export default {
|
||||||
if (!canDiscount) {
|
if (!canDiscount) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const amount = this.createOrder.data.amount - this.coupdiscount;
|
const amount = this.createOrder.data.amount;
|
||||||
this.refToggle("refDiscount", true, {
|
this.refToggle("refDiscount", true, {
|
||||||
amount,
|
amount,
|
||||||
discount: this.createOrder.discount * 100,
|
discount: this.createOrder.discount * 100,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue