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

src/assets/css/tripIndexNew.css

@@ -112,6 +112,12 @@ html, body{
     align-items: center;
     justify-content: center;
 }
+.flexG{
+  flex-grow: 1;
+}
+.flexS{
+  flex-shrink: 0;
+}
 
 .marginL20 {
     margin-left: 20px;
@@ -267,8 +273,12 @@ html, body{
     right: 0;
     bottom: 0;
 }
-
+.travelDaysTitlle{
+  margin-top: 47px;
+  overflow: hidden;
+}
 .travelDaysTitlle-left {
+    width: 173px;
     flex-shrink: 0;
     margin-left: 22px;
 }
@@ -276,8 +286,16 @@ html, body{
 .travelDaysTitlle-left-text {
     width: 173px;
     height: 173px;
-    background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center;
+    /* background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center #FFF; */
+    background: url('../img/trip/xclogo.png')no-repeat center;
     background-size: 100% 100%;
+    overflow: hidden;
+    border-radius: 50%;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    -ms-border-radius: 50%;
+    -o-border-radius: 50%;
+    top:-92px
 }
 
     .travelDaysTitlle-left-text span {
@@ -307,8 +325,8 @@ html, body{
 .travelDaysTitlle-right {
     flex-grow: 1;
     margin-left: 21px;
+    font-weight: bold;
 }
-
 .travelDaysTitlle-right-text {
     min-height: 124px;
     /* padding: 25px 25px 25px 36px; */
@@ -318,10 +336,11 @@ html, body{
     -moz-border-radius: 100px 0px 0px 100px;
     -ms-border-radius: 100px 0px 0px 100px;
     -o-border-radius: 100px 0px 0px 100px;
+    font-family: 'Microsoft JhengHei UI Ligh';
 }
 
 .travelDaysMasterMap {
-    margin-top: 14px;
+    margin-top: 45px;
     margin-bottom: 41px;
     height: 632px;
     /* flex:1; */
@@ -387,45 +406,46 @@ html, body{
      /* min-height: 360px;
      max-height:600px; */
     min-height: 20px;
-    line-height: 38px;
+    /* 38 */
+    line-height: 25px;
     padding: 0 36px;
     margin-bottom: 20px;
+    font-weight: 500;
     /* margin: 41px 0 47px 0; */
 }
 
 .travelDaysContent-text {
-    font-size: 21px;
-    font-weight: 10;
-    color: #2A2A2A;
-    font-family: math;
+    font-size: 18px;
+    font-weight: 500;
+    color: #444444;
+    font-family: 'Microsoft JhengHei UI';
 }
 
   .textBold {
         font-size: 21px;
-        line-height: 38px;
-        font-weight: bold;
-        font-family: FZCuSong-B09S !important;
+        line-height: 25px;
+        font-weight: 800;
+        font-family: 'Microsoft JhengHei UI Ligh';
     }
 
 .travelDaysdetails {
     left: 0;
     right: 0;
     bottom: 115px;
-    margin: 0 36px;
+    margin: 0 32px;
     /* padding: 0 0 115px 0; */
 }
 .travelDaysdetails-tsTextBox{
-  padding: 0 36px 20px 36px;
-  /* margin-top: 20px; */
+  padding: 0 32px 24px 32px;
 }
 .travelDaysdetails-tsText{
   width: 100%;
-  padding: 15px;
-  border-radius: 14px;
-  -webkit-border-radius: 14px;
-  -moz-border-radius: 14px;
-  -ms-border-radius: 14px;
-  -o-border-radius: 14px;
+  padding: 25px 38px;
+  border-radius: 18px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
 }
 .travelDaysdetails-tsText p{
   padding: 0;
@@ -434,17 +454,17 @@ html, body{
 .travelDaysdetailsBJ {
     border-radius: 100px;
     padding: 20px 35px;
-    -webkit-border-radius: 100px;
-    -moz-border-radius: 100px;
-    -ms-border-radius: 100px;
-    -o-border-radius: 100px;
+    -webkit-border-radius: 18px;
+    -moz-border-radius: 18px;
+    -ms-border-radius: 18px;
+    -o-border-radius: 18px;
 }
 .travelDaysdetails-textBox{
   flex-wrap: wrap;
 }
     .travelDaysdetails-text0 {
         font-size: 21px;
-        font-family: PingFang SC;
+        font-family: 'Microsoft JhengHei UI Ligh';
         font-weight: 800;
         color: #2A2A2A;
         line-height: 34px;
@@ -458,18 +478,21 @@ html, body{
     .travelDaysdetails-tsText{
       display: inline-block;
       white-space: wrap;
+      font-size: 14px;
+      font-family: 'Microsoft JhengHei UI';
+      line-height: 22px;
     }
     .travelDaysdetails-tsText,.travelDaysdetails-text {
-        font-size: 21px;
         font-weight: 100;
         color: #2A2A2A;
-        line-height: 34px;
     }
     .travelDaysdetails-text {
+      font-size: 21px;
       flex-wrap: nowrap;
       padding: 0;
       margin: 0;
       margin-right: 46px;
+      font-family: 'Microsoft JhengHei UI';
   }
   .travelDaysdetails-text.right0{
     margin-right: 0;
@@ -658,3 +681,124 @@ html, body{
   left: 0;
   top: 0;
 }
+
+
+.color2A2A2A{
+  color: #2A2A2A;
+}
+.color444{
+  color: #444444;
+}
+.fz18{
+  font-size: 18px;
+}
+.fz21{
+  font-size: 21px;
+}
+.fz26{
+  font-size: 26px;
+}
+
+.fontBold{
+  font-weight: bold;
+}
+.fontFamilyLigh{
+  font-family: 'Microsoft JhengHei UI Ligh';
+}
+.fontFamilyUI{
+  font-family: 'Microsoft JhengHei UI';
+}
+.lineHeight25{
+  line-height: 25px;
+}
+.lineHeight38{
+  line-height: 38px;
+}
+.MT19{
+  margin-top: 19px;
+}
+.MT28{
+  margin-top: 28px;
+}
+.MT41{
+  margin-top: 41px;
+}
+.ML26{
+  margin-left: 26px;
+}
+.ML33{
+  margin-left: 33px;
+}
+.ML37{
+  margin-left: 37px;
+}
+.MB25{
+  margin-bottom: 25px;
+}
+.MB31{
+  margin-bottom: 31px;
+}
+.MB32{
+  margin-bottom: 32px;
+}
+.MB35{
+  margin-bottom: 35px;
+}
+.MB36{
+  margin-bottom: 36px;
+}
+.MB41{
+  margin-bottom: 41px;
+}
+.MB47{
+  margin-bottom: 47px;
+}
+.MR33{
+  margin-right: 33px;
+}
+.img100{
+  width: 100%;
+}
+.hidden{
+  overflow: hidden;
+}
+.absoluteLR{
+  left: 0;
+  right: 0;
+}
+.borderRadius18{
+  border-radius: 18px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+.travelDaysMasterMap2-box{
+  padding: 45px 32px 0 32px;
+}
+.travelDaysMasterMap2{
+  height: 538px;
+}
+.travelDaysMasterMap2_2{
+  width: 524px;
+  height: 250px;
+}
+.travelDaysMasterMap3_1{
+  width: 517px;
+  height: 300px;
+}
+.travelDaysMasterMap4_1{
+  width: 696px;
+  height: 449px;
+}
+.travelDaysMasterMap4_2{
+  width: 331px;
+  height: 214px;
+}
+/* .width331{
+  width: 331px;
+} */
+.travelDaysMasterMap5_1{
+  width: 514px;
+  height: 291px;
+}

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -222,7 +222,7 @@
                 </li>
               </ul>
             </div>
-            <div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0">
+            <div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0&&dayObj.ScenicArray.length==1">
               <span v-if="ishasScenic">默认展示图</span>
               <el-select v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
                 :placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic">

src/components/scenicSpot/reservation/OrderList.vue

@@ -612,6 +612,11 @@
             <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="平台在途" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.PlatformMoney ? scope.row.PlatformMoney : "-" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold"

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -440,10 +440,11 @@ export default {
                   Income: item.Income,
                   CostMoney: item.CostMoney,
                   PlatformTax: item.PlatformTax,
-                  Refund: item.Refund
+                  Refund: item.Refund,
+                  PlatformMoney: item.PlatformMoney
                 }
                 let DaiShou
-                DaiShou = Number(item.Money-item.Income-item.PlatformTax+item.Refund)
+                DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)
                 item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
                 item.list.push(datas)
               })