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

src/assets/css/tripIndexNew2.css

@@ -159,8 +159,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  /* 1347 */
-  top: 1439px;
+  top: 1538px;
   right: 0;
 }
 .UpgradedVersion2Line span{
@@ -784,7 +783,7 @@ html, body{
 }
 .travelDaysMasterMap3_1{
   width: 517px;
-  height: 300px;
+  height: 280px;
 }
 .travelDaysMasterMap4_1{
   width: 696px;

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1245,7 +1245,6 @@
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }
                 if (x.CostTypeName.indexOf('房费送客手数料') != -1 && y.Type == 5) {
-                 
                   if(x.UnitPrice<0){  y.Unit_Price=- x.UnitPrice}
                   else{
                     y.Unit_Price=x.UnitPrice
@@ -1254,9 +1253,7 @@
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }
                 if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) {
-                
                   y.Num=x.Number
-                  console.log("UnitPriceTo",x.UnitPrice)
                   if(x.UnitPrice<0){  
                     y.Unit_Price=-x.UnitPrice;   }
                   else{
@@ -1265,7 +1262,6 @@
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }
                 if (x.CostTypeName.indexOf('门票送客手数料') != -1 && y.Type == 7) {
-                
                   y.Num=x.Number
                   if(x.UnitPrice<0){  y.Unit_Price=-x.UnitPrice}
                   else{

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -174,11 +174,11 @@
                         <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                           <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
                             :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
-                            :x="517" :y="300"></FeatureControls>
+                            :x="517" :y="280"></FeatureControls>
                           <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
                         </div>
                         <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                          :w="517" :h="300" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
+                          :w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                           :active="false" :parent="false" axis="y" @activated="onActivated(1)"
                           :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                           :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -223,11 +223,11 @@
                         <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                           <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
                             :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
-                            :x="517" :y="300"></FeatureControls>
+                            :x="517" :y="280"></FeatureControls>
                           <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
                         </div>
                         <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                          :w="517" :h="300" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
+                          :w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
                           :active="false" :parent="false" axis="y" @activated="onActivated(1)"
                           :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                           :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -256,11 +256,11 @@
                         <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                           <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
                             :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
-                            :x="517" :y="300"></FeatureControls>
+                            :x="517" :y="280"></FeatureControls>
                           <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
                         </div>
                         <VueDraggableResizable v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                          :w="517" :h="300" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
+                          :w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
                           :active="false" :parent="false" axis="y" @activated="onActivated(2)"
                           :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                           :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -734,10 +734,10 @@
         </div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1464?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1538?'超出内容分割到下一页':'底线'}}</span>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc"
-      :style="{'top': pageHeight>1464&&pageHeight<2878?pageHeight+'px':'2878px'}">
+      :style="{'top': pageHeight>1538&&pageHeight<3076?pageHeight+'px':'3076px'}">
         <span>底线</span>
       </div>
     </div>