Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/css/tripIndexNew2.css

@@ -161,7 +161,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1453px;
+  top: 1754px;
   right: 0;
 }
 .UpgradedVersion2Line span{
@@ -610,13 +610,13 @@ html, body{
     color: #2A2A2A;
 }
 .UpgradedVersion-boxHeight{
-  width: 1123px;
-  min-height: 1450px;
+  width: 1240px;
+  min-height: 1754px;
   margin: auto;
 }
 .UpgradedVersion-box2 {
-    width: 1123px;
-    min-height: 1478px;
+    width: 1240px;
+    min-height: 1754px;
     height: 100%;
 }
 
@@ -810,17 +810,17 @@ html, body{
   height: 280px;
 }
 .travelDaysMasterMap4_1{
-  width: 696px;
+  width: 772px;
   height: 449px;
 }
 .travelDaysMasterMap4_2{
-  width: 331px;
+  width: 370px;
   height: 214px;
 }
 /* .width331{
   width: 331px;
 } */
 .travelDaysMasterMap5_1{
-  width: 514px;
+  width: 571px;
   height: 291px;
 }

src/components/FinancialModule/addFinancialDocuments.vue

@@ -795,7 +795,7 @@
             </el-option>
           </el-select>
                 </span>
-                <span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，非代收代付则忽略此项</span>
+                <span style="margin-left: 20px;color: red;">注：只有需其他公司帮忙代付的需选择此项，非代收代付则忽略此项</span>
               </p>
             </div>
         
@@ -1877,7 +1877,7 @@
         }
         else if(this.msg.HelpBranchId>-1){
           let that = this
-          let brandName='确认是帮';
+          let brandName='确认是由';
           this.companyList.forEach(item => {
             if(item.Id==this.msg.HelpBranchId){
               brandName+=item.BName;

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -690,7 +690,7 @@
             list.forEach(x=>{
               x.IsBlowUp = false
               if(this.PostConfig.FeaturePageType==2){
-                x.zoom = 0.44
+                x.zoom = 0.40
               }else if(this.PostConfig.FeaturePageType==1){
                 x.zoom = 0.285
               }
@@ -958,7 +958,7 @@
                   list.forEach(x=>{
                     x.IsBlowUp = false
                     if(tempData.FeaturePageType==2){
-                      x.zoom = 0.44
+                      x.zoom = 0.40
                     }else if(tempData.FeaturePageType==1){
                       x.zoom = 0.285
                     }

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -278,7 +278,7 @@
             x.zoom = 0.285
           }
           if(this.dataAll.FeaturePageType==2){
-            x.zoom = 0.44
+            x.zoom = 0.40
           }
         })
         this.$forceUpdate()
@@ -291,7 +291,7 @@
         }
         else{
           if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
-          if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
+          if(this.dataAll.FeaturePageType==2) item.zoom = 0.40
         }
         this.$forceUpdate()
       },