no message

src/components/sale/ExpectedCommission.vue

@@ -164,7 +164,7 @@
             </div>
           </div>
           <div style="display: flex;">
-            <div class="CommissionLadder Line" style="margin: 0 10px 0 0;">
+            <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
               <div class="title">
                 <span>日本及其他线小包团、落地团以及单项提成</span>
               </div>
@@ -190,7 +190,7 @@
                 <progressComm :commissionratioList="JapaneseProfit"></progressComm>
               </div>
             </div>
-            <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
+            <div class="CommissionLadder Line" style="margin: 0 0 0 10px;">
               <div class="title">
                 <span>欧洲小包团、落地团以及单项提成</span>
               </div>
@@ -218,7 +218,7 @@
             </div>
           </div>
           <div style="display: flex;">
-            <div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
+            <div class="CommissionLadder Line" style="margin: 0 0 10px 0;">
               <p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
               <div class="CommissionInfor">
                 <span>
@@ -232,7 +232,7 @@
                 <progressComm :commissionratioList="JapaneseLine"></progressComm>
               </div>
             </div>
-            <div class="CommissionLadder Line">
+            <div class="CommissionLadder Line" style="margin: 0 0 10px 10px;">
               <p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
               <div class="CommissionInfor">
                 <span>
@@ -369,7 +369,7 @@
           2.增加境外散拚提成(日本线.欧洲线分别奖励计算)</br>
           3.增加人头奖励(日本线与其他.欧洲线2种)</br>
           4.所有业绩结算皆以出发日.尾款收齐为基准</br>
-          5.人头奖励包含归属各线所有产品(散拚.一日游.多日游.签证等)</br>
+          5.人头奖励包不含门票、包车、国内游以及单团(独立成团)</br>
           6.人头奖励每月至少20条方可进行奖励!</br>
           7.以上所有核算皆以月为单位.核算基础为出发日或签证收取日算起!</br>
           8.直客部门归属直客业务编制.不参与同业部门业务销售!</br>
@@ -621,13 +621,10 @@
                 this.GNEopleNum+=Number(item.PeopleNum)
                 this.GNCommission+=Number(item.Commission)
               })
-              setTimeout(()=>{
               let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
               let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
               this.CommissionJJ = this.CalculatePrice(arr1,0)
               this.CommissionTC = this.CalculatePrice(arr2,2)
-              },500)
-
             }
           })
       },

src/components/sale/components/progressComm.vue

@@ -200,7 +200,7 @@
             }
           }else{
             return () => {
-              return `连续${row.StartValue}月`
+              return `达标${row.StartValue}月`
             }
           }
 

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -506,7 +506,7 @@
           detailsObj: {},
           beforeCheck: {
             disabledDate: time => {
-                let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")));
+                let endTime = new Date(this.getBeforeDate(1,new Date().Format("yyyy-MM-dd")));
                 return time && endTime.getTime() >= time.getTime();
             }
           },
@@ -720,4 +720,3 @@
     };
 
   </script>
-  
\ No newline at end of file

src/components/scenicSpot/Singleticket/SingleticketList.vue

@@ -306,7 +306,7 @@ export default {
       ViewType: 2,
       beforeCheck: {
         disabledDate: time => {
-          let endTime = new Date(this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
+          let endTime = new Date(this.getBeforeDate(1, new Date().Format("yyyy-MM-dd")));
           return time && endTime.getTime() >= time.getTime();
         }
       },