no message

src/components/temp/operation.vue

@@ -106,6 +106,10 @@
   .CommissionLadder:last-child{
     margin-right: 0;
   }
+  .commissionProject{
+    padding: 0 0 10px 0;
+    border-bottom: 1px dashed #BDBDBD;
+  }
   .commissionProject>div{
     margin-right: 40px;
     margin-top: 10px;
@@ -153,9 +157,10 @@
     font-size: 14px;
   }
   .headerTitle{
-    margin-bottom: 40px;
+    margin-bottom: 10px;
     display: flex;
     flex-wrap: wrap;
+    align-items: center;
   }
   .headerTitle p{
     font-weight: bold;
@@ -273,7 +278,7 @@
                         @click="clickActive(item)"></input>
                       </template>
                     </div>
-                    <div style="display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;">
+                    <div style="display: flex;flex-direction: column; padding: 20px 20px 0 20px;">
                       <div class="headerTitle">
                         <!-- <p><span>总团队数：</span> <span>{{groupNum}}</span></p> -->
                         <p><span>总订单数：</span> <span>{{OrderNum}}</span></p>
@@ -281,6 +286,7 @@
                         <p><span>总预期奖金：</span><span>{{CommissionJJ}}</span></p>
                         <p><span>总预期提成：</span><span>{{CommissionTC}}</span></p>
                     </div>
+                    <p style="color: red;font-size: 14px;text-align: right;">注:操作提成需已结团后方可发放提成，以下预期提成均为已结团统计</p>
                   </div>
                   </div>
                 </el-col>
@@ -312,7 +318,7 @@
                     </div>
                   </div>
                 </template>
-                <template v-if="isVisa">
+                <div class="commissionProject" v-if="isVisa">
                 <p style="font-size: 16px;font-weight: bold;color: black;">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
                 <template v-for="(s,indexs) in item.BranchList">
                   <div class="ladder-form">
@@ -356,7 +362,7 @@
                   </div>
                 </template>
 
-                </template>
+                </div>
                 <div class="commissionProject" style="display: flex;flex-wrap: wrap;">
                   <div>
                   <div style="display: flex;">
@@ -386,7 +392,8 @@
                     </div>
                   </div>
                   </div>
-                  <template v-if="isVisa||!isBranchCompany">
+                </div>
+                <div class="commissionProject" style="display: flex;flex-wrap: wrap;border: 0;" v-if="isVisa||!isBranchCompany">
                   <div v-if="!index">
                     <div style="display: flex;">
                       <div>
@@ -415,9 +422,7 @@
                       </div>
                     </div>
                   </div>
-                  </template>
                 </div>
-
               </div>
             </div>
             </template>
@@ -688,7 +693,7 @@
           }else{
             this.Error(res.data.message)
           }
-          this.loading = false;
+
         })
       },
       GetGNSaleExpectCommission(){
@@ -717,8 +722,11 @@
               let arr2 =[this.GNCommission,this.yuqiticheng]
               this.CommissionJJ = this.CalculatePrice(arr1,0)
               this.CommissionTC = this.CalculatePrice(arr2,2)
+              this.loading = false;
+            }else{
+              this.loading = false;
             }
-          })
+          },err => {this.loading = false} )
       },
       // 未结团数据
       GetOrderPageList(){
@@ -736,9 +744,8 @@
             }else {
               this.Error(res.data.message);
             }
-            this.loading = false
           },
-          err => {this.loading = false}
+          err => {}
         )
 
       },