页面修改

src/components/StoreDesign/liveManage.vue

@@ -151,7 +151,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
           this.getIntegraStatisticslList();
         },
         imgupload(row){
-          console.log(row)
+
           this.imgMsg.ID = row.HouseImgID;
           this.imgMsg.roomid = row.roomid;
           this.changeState = true;

src/components/mallIndex.vue

@@ -671,8 +671,6 @@
         var orderIncome = []; //支付金额
         var userArray = []; //支付人数
         var goodArray = []; //商品件数
-        console.log(this.salesData,'this.salesData');
-        console.log(this.activeSell,'activeSell');
         //今日
         var now = new Date();
         var year = now.getFullYear();        //年

src/components/pintuan/pintuanActive.vue

@@ -682,7 +682,7 @@
           this.addMsg.IsCustomSpecification = 1;
         }
         this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
-          console.log("res", res.data);
+          console.log("SetGroupbuyActivity", res.data);
           if (res.data.resultCode == 1) {
             this.CommonJump("pintuanList", {});
             this.Success(res.data.message);
@@ -814,7 +814,13 @@
             if (disCommissionArray && disCommissionArray.length > 0) {
               disCommissionArray.forEach(subItem => {
                 if (item.People_Num == subItem.People_Num) {
-                  item.DistributioncommissionList = subItem.DistributioncommissionList;
+                  if (this.addMsg.SeparateDistributionType == 1) {
+                    item.DistributioncommissionList = subItem.DistributioncommissionList;
+                    item.DistributionCommissionTreeList = [];
+                  } else {
+                    item.DistributioncommissionList = [];
+                    item.DistributionCommissionTreeList = subItem.DistributioncommissionList
+                  }
                 }
               })
             }

src/components/pintuan/pintuanPlugin/distributePrice.vue

@@ -19,8 +19,8 @@
         <el-radio v-model="addMsg.SeparateDistributionType" :label="2" @change="checkedChange">详细设置</el-radio>
       </el-form-item>
       <el-form-item label="分销佣金类型" size="small">
-        <el-radio v-model="addMsg.SeparateDistributionMoneyType" :label="2" >固定金额</el-radio>
-        <el-radio v-model="addMsg.SeparateDistributionMoneyType" :label="1" >百分比</el-radio>
+        <el-radio v-model="addMsg.SeparateDistributionMoneyType" :label="2">固定金额</el-radio>
+        <el-radio v-model="addMsg.SeparateDistributionMoneyType" :label="1">百分比</el-radio>
       </el-form-item>
       <!--普通设置-->
       <el-form-item v-if="addMsg.SeparateDistributionType==1">
@@ -90,7 +90,8 @@
       <!--详细设置-->
       <el-form-item v-else>
         <div class="pintuan-share">
-          <el-card v-for="(rootItem,rootIndex) in DistributioncommissionList" :key="rootIndex+500" style="margin-bottom:20px;">
+          <el-card v-for="(rootItem,rootIndex) in DistributioncommissionList" :key="rootIndex+500"
+            style="margin-bottom:20px;">
             <div slot="header" class="clearfix">
               <div class="box">
                 <div style="display:inline-block;">
@@ -129,21 +130,24 @@
                     <el-table-column width="100" v-if="butorTier > 0" label="一级分销">
                       <template slot-scope="scope">
                         <template v-if="scope.row.GradeCommissionList">
-                          <el-input v-model="scope.row.GradeCommissionList[index3].OneCommission" size="small"></el-input>
+                          <el-input v-model="scope.row.GradeCommissionList[index3].OneCommission" size="small">
+                          </el-input>
                         </template>
                       </template>
                     </el-table-column>
                     <el-table-column width="100" v-if="butorTier > 1" label="二级分销">
                       <template slot-scope="scope">
                         <template v-if="scope.row.GradeCommissionList">
-                          <el-input v-model="scope.row.GradeCommissionList[index3].TwoCommission" size="small"></el-input>
+                          <el-input v-model="scope.row.GradeCommissionList[index3].TwoCommission" size="small">
+                          </el-input>
                         </template>
                       </template>
                     </el-table-column>
                     <el-table-column width="100" v-if="butorTier > 2" label="三级分销">
                       <template slot-scope="scope">
                         <template v-if="scope.row.GradeCommissionList">
-                          <el-input v-model="scope.row.GradeCommissionList[index3].ThreeCommission" size="small"></el-input>
+                          <el-input v-model="scope.row.GradeCommissionList[index3].ThreeCommission" size="small">
+                          </el-input>
                         </template>
                       </template>
                     </el-table-column>
@@ -177,9 +181,38 @@
     },
     watch: {
       'SpecificationPriceList': {
+        immediate: true,
         handler: function (val, oldval) {
+          console.log("val", this.SpecificationPriceList);
           if (val != oldval) {
-            this.checkedChange()
+            this.DistributioncommissionList = [];
+            if (this.SpecificationPriceList && this.SpecificationPriceList.length > 0) {
+              if (this.SpecificationPriceList[0].DistributioncommissionList && this.SpecificationPriceList[0]
+                .DistributioncommissionList.length > 0) {
+                this.SpecificationPriceList.forEach(item => {
+                  var obj = {
+                    People_Num: item.People_Num,
+                    DistributioncommissionList: item.DistributioncommissionList,
+                  };
+                  this.DistributioncommissionList.push(obj);
+                })
+                this.$forceUpdate();
+              } else if (this.SpecificationPriceList[0].DistributionCommissionTreeList && this.SpecificationPriceList[
+                  0].DistributionCommissionTreeList.length > 0) {
+                  this.SpecificationPriceList.forEach(item => {
+                  var obj = {
+                    People_Num: item.People_Num,
+                    DistributionCommissionTreeList: item.DistributionCommissionTreeList,
+                  };
+                  this.DistributioncommissionList.push(obj);
+                })
+                this.$forceUpdate();
+              } else {
+                this.checkedChange();
+              }
+            } else {
+              this.checkedChange();
+            }
           }
         }
       },
@@ -189,6 +222,9 @@
         },
         deep: true
       },
+    },
+    created() {
+
     },
     methods: {
       //切换显示
@@ -220,13 +256,14 @@
                 SpecificationSort: tempObj.SpecificationSort,
                 GradeCommissionList: [],
               };
-              this.tempGeneralArray.forEach(childItem => {
-                commissionObj.GradeCommissionList.push({
-                  DistributorGrade: childItem.Id,
+              this.tempGeneralArray.forEach((childItem, childIndex) => {
+                var tempObj = {
+                  DistributorGrade: childItem.DistributorGrade,
                   OneCommission: 0,
                   TwoCommission: 0,
                   ThreeCommission: 0,
-                });
+                }
+                commissionObj.GradeCommissionList.push(tempObj);
               });
               obj.DistributioncommissionList.push(commissionObj);
             });

src/components/statistics/cutomerStatistics.vue

@@ -168,7 +168,6 @@
         this.loading=true;
         this.apipost("/api/Tenant/MallDistributorDayStatistics", this.msg, res => {
           this.loading=false
-          console.log(res,'列表数据');
           if(res.data.resultCode==1){
             this.tableData = res.data.data;
           }else {