Compare commits

..

No commits in common. "c19bd7b33fa68313b6f9ed4e7111e18a933c056d" and "a6e0a3022cb4bf0895a7ccb411f9cf327aa5d9ae" have entirely different histories.

View File

@ -602,6 +602,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
}, },
methods:{ methods:{
changeSeekZero(){ changeSeekZero(){
this.seekZero = (this.authCode - this.allAmout).toFixed(2) this.seekZero = (this.authCode - this.allAmout).toFixed(2)
}, },
@ -659,11 +660,13 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
flag = true flag = true
} }
}) })
if (data.exchangeMethod == "积分+加钱购" || flag) { if (data.exchangeMethod == "积分+加钱购" || flag) {
flag = false flag = false
this.shoppingCart.forEach(res => { this.shoppingCart.forEach(res => {
if (res.id != data.id ) { if (res.id != data.id ) {
flag = true flag = true
return return
} }
}) })
@ -673,6 +676,8 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
return return
} }
} }
if (data.markPurchases) { if (data.markPurchases) {
if (data.markPurchases>=data.remainingInventory){ if (data.markPurchases>=data.remainingInventory){
this.$message.error('库存不足'); this.$message.error('库存不足');
@ -688,8 +693,16 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
} }
this.markPurchasesAll++ this.markPurchasesAll++
console.log("addGift",data) console.log("addGift",data)
// //
this.dataChange(data); this.dataChange(data);
if (this.shoppingCart.length === 0) { if (this.shoppingCart.length === 0) {
this.shoppingCart.push(data); this.shoppingCart.push(data);
} else { } else {
@ -704,6 +717,8 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
} }
} }
this.allData(); this.allData();
// //
}, },
handleClick(tab, event){ handleClick(tab, event){
@ -727,6 +742,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
} }
}else { }else {
this.$message.error('请先选择会员'); this.$message.error('请先选择会员');
} }
}, },
@ -1785,11 +1801,12 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50px;
box-sizing: border-box; box-sizing: border-box;
padding: 10px 15px; padding: 10px 15px;
border: 1px solid #13ce66;
font-size: 20px; font-size: 20px;
background: linear-gradient( 312deg, #9CDCA0 0%, #5BC557 100%); background: #13ce66;
border-radius: 6px 6px 6px 6px;
color: white; color: white;
margin: 8px 10px; margin: 8px 10px;
cursor: pointer; cursor: pointer;
@ -1801,9 +1818,9 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
border-radius: 50px; border-radius: 50px;
box-sizing: border-box; box-sizing: border-box;
padding: 10px 25px; padding: 10px 25px;
border: 1px solid #FF9655;
font-size: 20px; font-size: 20px;
background: linear-gradient( 312deg, #70CAFD 0%, #0BADFE 100%, #02AAFE 100%); background: #FF9655;
border-radius: 6px 6px 6px 6px;
color: white; color: white;
margin: 8px 10px; margin: 8px 10px;
cursor: pointer; cursor: pointer;