diff --git a/.gitignore b/.gitignore index b92657c..0607221 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules /dist /artifacts package-lock.json +/node_modules # local env files .env.local diff --git a/src/manifest.production.json b/src/manifest.production.json index d522e48..eb45d4d 100644 --- a/src/manifest.production.json +++ b/src/manifest.production.json @@ -22,7 +22,7 @@ "*://*.shein.com/", "*://*.geiwohuo.com/", "*://*.ltwebstatic.com/", - "*://*.rqlis.com*" + "*://*.rqlis.com" ], "permissions": [ "cookies", diff --git a/src/view/product/PriceDown.vue b/src/view/product/PriceDown.vue index 3b3b99d..c752e62 100644 --- a/src/view/product/PriceDown.vue +++ b/src/view/product/PriceDown.vue @@ -182,10 +182,13 @@ import JsonExcel from 'vue-json-excel' this.rejectShow = true }, async toReject() { - this.$refs.rejectForm.validate((valid) => { + this.$refs.rejectForm.validate(async (valid) => { if (valid) { + this.loadingText = '正在拼命处理中~' + this.isLoading = true this.rejectShow = false - this.reject() + await this.reject() + this.isLoading = false } }) }, @@ -203,20 +206,21 @@ import JsonExcel from 'vue-json-excel' return item.skus == obj[0].skus }) let params = {} - if (obj[0].num == 1) { - params = { - adjustId: obj[0].id, - reason: this.rejectForm.reason, - result: 2 - } - } else { + if (obj.length > 1) { params.adjustId = obj[0].id params.adjustResultMap = {} for (let k = 0; k < obj.length; k++) { params.adjustResultMap[obj[k].id] = 2 } params.result = 2 + } else { + params = { + adjustId: obj[0].id, + reason: this.rejectForm.reason, + result: 2 + } } + // console.log(obj[0].mallName, params) let res = await sendChromeAPIMessage({ url: 'gmp/bg/magneto/api/price/purchase-adjust/review', needMallId: true, diff --git a/src/view/sale/ExportSaleStatTemu.vue b/src/view/sale/ExportSaleStatTemu.vue index 72c7cf2..87e7c3e 100644 --- a/src/view/sale/ExportSaleStatTemu.vue +++ b/src/view/sale/ExportSaleStatTemu.vue @@ -548,6 +548,7 @@ import { DualAxes } from '@antv/g2plot' if (item.productSkcId == this.skcList[i].productSkcId) { this.skcList[i].saleAmount = this.skcList[i].saleAmount + item.saleAmount this.skcList[i].costAmount = this.skcList[i].costAmount + item.costAmount + this.skcList[i].saleCount = this.skcList[i].saleCount + item.saleCount this.skcList[i].profitAmount = this.skcList[i].profitAmount + item.profitAmount flag = true break diff --git a/src/view/sale/LogisticFee.vue b/src/view/sale/LogisticFee.vue index b6b625e..ded33c2 100644 --- a/src/view/sale/LogisticFee.vue +++ b/src/view/sale/LogisticFee.vue @@ -3,7 +3,7 @@