设置分佣优化

src/views/shop/shop-list.vue

@@ -441,7 +441,9 @@
       },
       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({
             message: '请输入按比例分佣0-100',
             type: "warning"
@@ -449,14 +451,32 @@
           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({
-            message: '请输入按比例分佣0-100',
+            message: '请输入固定分佣金额',
             type: "warning"
           });
           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++){
         //   if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
@@ -572,10 +592,27 @@
               this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
             }
             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){
-              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 @@
             this.setPriceForm.commission = {
               commissionKind: 1,
               commissionPrice: "",
-              commissionPrice1: '',
-              commissionPrice2: '',
+              commissionPrice1: undefined,
+              commissionPrice2: undefined,
               commissionType: 0,
               goodsId: row.tradeStore.goodsId,
               maxPrice: 0,
@@ -601,9 +638,9 @@
             this.setPriceForm.proxyCommission = {
               commissionKind: 2,
               commissionPrice: "",
-              commissionPrice1: '',
-              commissionPrice2: '',
-              commissionType: 1,
+              commissionPrice1: undefined,
+              commissionPrice2: undefined,
+              commissionType: 0,
               goodsId: row.tradeStore.goodsId,
               maxPrice: 0,
               storeId: row.tradeStore.id,
@@ -615,9 +652,9 @@
           this.setPriceForm.commission = {
             commissionKind: 1,
             commissionPrice: "",
-            commissionPrice1: '',
-            commissionPrice2: '',
-            commissionType: 1,
+            commissionPrice1: undefined,
+            commissionPrice2: undefined,
+            commissionType: 0,
             goodsId: row.tradeStore.goodsId,
             maxPrice: 0,
             storeId: row.tradeStore.id,
@@ -626,9 +663,9 @@
           this.setPriceForm.proxyCommission = {
             commissionKind: 2,
             commissionPrice: "",
-            commissionPrice1: '',
-            commissionPrice2: '',
-            commissionType: 1,
+            commissionPrice1: undefined,
+            commissionPrice2: undefined,
+            commissionType: 0,
             goodsId: row.tradeStore.goodsId,
             maxPrice: 0,
             storeId: row.tradeStore.id,