czg_team/management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
魏啾
2024-12-10 11:49:34 +08:00
parent 25761ba734 737c24ddad
commit ac74254ed5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/tool/Instead/index.vue
View File

@@ -2039,7 +2039,7 @@ export default {
}, },
quansConfirm(e, goodsPayPriceMap) { quansConfirm(e, goodsPayPriceMap) {
console.log(e); console.log(e);
this.createOrder.discount = 1; // this.createOrder.discount = 1;
this.points.selected = ""; this.points.selected = "";
e.map((v, index) => { e.map((v, index) => {
return { return {
@@ -3438,7 +3438,8 @@ export default {
}, },
reset() { reset() {
// this.goods.list = []; // this.goods.list = [];
this.isAllWaitCall = false; this.isAllWaitCall=false;
this.selQuan=[];
this.guazhangRen = ""; this.guazhangRen = "";
this.order.status = ""; this.order.status = "";
this.loading = false; this.loading = false;