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