Skip to content

P
pica.cloud.web-education-admin
提交 0f304d62 编写于 作者: vino's avatar vino
浏览文件
操作

设置分佣优化

上级 94fc9e51
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 278 行增加 和 107 行删除
src/views/goods/goods-manage.vue
浏览文件 @ 0f304d62
此差异已折叠。
src/views/shop/shop-list.vue
浏览文件 @ 0f304d62
...@@ -441,7 +441,9 @@ ...@@ -441,7 +441,9 @@
}, },
confirmSetPrice() { confirmSetPrice() {
if(this.setPriceForm.commission.commissionType == 1 && this.setPriceForm.commission.commissionPrice1 > 100){ if(this.setPriceForm.commission.commissionType == 1
&& (this.setPriceForm.commission.commissionPrice1 == undefined
|| this.setPriceForm.commission.commissionPrice1 > 100)){
this.$message({ this.$message({
message: '请输入按比例分佣0-100', message: '请输入按比例分佣0-100',
type: "warning" type: "warning"
...@@ -449,14 +451,32 @@ ...@@ -449,14 +451,32 @@
return; return;
} }
if(this.setPriceForm.proxyCommission.commissionType == 1 && this.setPriceForm.proxyCommission.commissionPrice1 > 100){ if(this.setPriceForm.commission.commissionType == 2
&& this.setPriceForm.commission.commissionPrice2 == undefined){
this.$message({ this.$message({
message: '请输入按比例分佣0-100', message: '请输入固定分佣金额',
type: "warning" type: "warning"
}); });
return; return;
} }
if(this.setPriceForm.proxyCommission.commissionType == 1
&& (this.setPriceForm.proxyCommission.commissionPrice1 == undefined
|| this.setPriceForm.proxyCommission.commissionPrice1 > 100)){
this.$message({
message: '请输入按比例分佣0-100',
type: "warning"
});
return;
}
if(this.setPriceForm.proxyCommission.commissionType == 2
&& this.setPriceForm.proxyCommission.commissionPrice2 == undefined){
this.$message({
message: '请输入固定分佣金额',
type: "warning"
});
return;
}
// for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){ // for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1 // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
...@@ -572,10 +592,27 @@ ...@@ -572,10 +592,27 @@
this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100; this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
} }
if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1){ if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1){
this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i]; // this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.commission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.commission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.commission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.commission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.commission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.commission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.commission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.commission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
} }
else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 2){ else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 2){
this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i]; // this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.proxyCommission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.proxyCommission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.proxyCommission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.proxyCommission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.proxyCommission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.proxyCommission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.proxyCommission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.proxyCommission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
} }
} }
...@@ -586,8 +623,8 @@ ...@@ -586,8 +623,8 @@
this.setPriceForm.commission = { this.setPriceForm.commission = {
commissionKind: 1, commissionKind: 1,
commissionPrice: "", commissionPrice: "",
commissionPrice1: '', commissionPrice1: undefined,
commissionPrice2: '', commissionPrice2: undefined,
commissionType: 0, commissionType: 0,
goodsId: row.tradeStore.goodsId, goodsId: row.tradeStore.goodsId,
maxPrice: 0, maxPrice: 0,
...@@ -601,9 +638,9 @@ ...@@ -601,9 +638,9 @@
this.setPriceForm.proxyCommission = { this.setPriceForm.proxyCommission = {
commissionKind: 2, commissionKind: 2,
commissionPrice: "", commissionPrice: "",
commissionPrice1: '', commissionPrice1: undefined,
commissionPrice2: '', commissionPrice2: undefined,
commissionType: 1, commissionType: 0,
goodsId: row.tradeStore.goodsId, goodsId: row.tradeStore.goodsId,
maxPrice: 0, maxPrice: 0,
storeId: row.tradeStore.id, storeId: row.tradeStore.id,
...@@ -615,9 +652,9 @@ ...@@ -615,9 +652,9 @@
this.setPriceForm.commission = { this.setPriceForm.commission = {
commissionKind: 1, commissionKind: 1,
commissionPrice: "", commissionPrice: "",
commissionPrice1: '', commissionPrice1: undefined,
commissionPrice2: '', commissionPrice2: undefined,
commissionType: 1, commissionType: 0,
goodsId: row.tradeStore.goodsId, goodsId: row.tradeStore.goodsId,
maxPrice: 0, maxPrice: 0,
storeId: row.tradeStore.id, storeId: row.tradeStore.id,
...@@ -626,9 +663,9 @@ ...@@ -626,9 +663,9 @@
this.setPriceForm.proxyCommission = { this.setPriceForm.proxyCommission = {
commissionKind: 2, commissionKind: 2,
commissionPrice: "", commissionPrice: "",
commissionPrice1: '', commissionPrice1: undefined,
commissionPrice2: '', commissionPrice2: undefined,
commissionType: 1, commissionType: 0,
goodsId: row.tradeStore.goodsId, goodsId: row.tradeStore.goodsId,
maxPrice: 0, maxPrice: 0,
storeId: row.tradeStore.id, storeId: row.tradeStore.id,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或