修改

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -73,6 +73,7 @@
     margin: 20px 0 0px 15px;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
   }
 
   .TravelMyTicket ._ol_list>li:hover {
@@ -100,9 +101,9 @@
   .TravelMyTicket ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     position: absolute;
-    left: 5px;
+    left: 0;
     top: 0;
     z-index: 50;
     background: rgba(233, 82, 82, 1);
@@ -634,8 +635,8 @@
   /*航班详情*/
   .TravelMyTicket .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelMyTicket ._flightList {
@@ -728,11 +729,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.Id">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="2" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div class="TM_AirUrl">
                   <span class="TICK_Code">{{$t('op.PurchaseNumber')}}：{{item.Id}}</span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" src="../../../assets/img/bg_z1@2x.png">

src/components/TravelManager/Ticket/TravelticketManager.1.vue

@@ -67,6 +67,7 @@
     overflow: hidden;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
   }
 
   .TravelticketManager ._ol_list>li:hover {
@@ -94,11 +95,11 @@
   .TravelticketManager ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     z-index: 50;
     position: absolute;
     top: 0;
-    left: 5px;
+    left: 0;
     background: rgba(233, 82, 82, 1);
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
@@ -116,6 +117,7 @@
   .TravelticketManager ._oll_info {
     padding-left: 20px;
     overflow: hidden;
+    margin-top:-15px;
   }
 
   .TravelticketManager ._oll_img {
@@ -567,7 +569,7 @@
   .TravelticketManager .vmiddle {
     display: flex;
     align-items: Center;
-    height: 78px;
+    /* height: 78px; */
   }
 
   .TM_btm {
@@ -577,7 +579,7 @@
   .TravelticketManager .TICK_Code {
     position: absolute;
     left: 25px;
-    top: 5px;
+    /* top: 5px; */
   }
 
   .TravelticketManager .TCID_cont {
@@ -600,8 +602,8 @@
   /*航班详情*/
   .TravelticketManager .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelticketManager ._flightList {
@@ -669,11 +671,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.ID">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="3" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div>
                   <span class="TICK_Code">编号：{{item.ID}}</span>
                   <img class="_oll_img" v-if="item.AirlineUrl" :src="item.AirlineUrl" :onerror="defaultImg" />

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -67,6 +67,7 @@
     overflow: hidden;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
   }
 
   .TravelticketManager ._ol_list>li:hover {
@@ -94,11 +95,11 @@
   .TravelticketManager ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     z-index: 50;
     position: absolute;
     top: 0;
-    left: 5px;
+    left: 0;
     background: rgba(233, 82, 82, 1);
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
@@ -116,6 +117,7 @@
   .TravelticketManager ._oll_info {
     padding-left: 20px;
     overflow: hidden;
+    margin-top:-15px;
   }
 
   .TravelticketManager ._oll_img {
@@ -183,56 +185,56 @@
     border-right: 1px dashed #dcdfe6;
   }
 
-  .SeatList {
+  .SeatListTM {
     width: 120px;
     height: 60px;
     background-color: #f9f9f9;
-    margin: 9px 15px 0 0;
+    margin-right:15px;
   }
 
-  .SeatList>ul>li:nth-child(1) {
+  .SeatListTM>ul>li:nth-child(1) {
     margin-left: 16px;
   }
 
-  .SeatList>ul>li {
+  .SeatListTM>ul>li {
     float: left;
     text-align: center;
     margin: 5px 10px 0 0;
   }
 
-  .SeatList>ul>li:last-child {
+  .SeatListTM>ul>li:last-child {
     margin-right: 0;
   }
 
-  .SeatList .iconfont {
+  .SeatListTM .iconfont {
     color: #d1d1d1;
     display: inline-block;
     margin-top: 5px;
   }
 
-  .SeatList ._num1 {
+  .SeatListTM ._num1 {
     font-size: 16px;
     color: #333333;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._num2 {
+  .SeatListTM ._num2 {
     font-size: 16px;
     color: #47bf8c;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._num3 {
+  .SeatListTM ._num3 {
     font-size: 16px;
     color: #e95252;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._wz {
+  .SeatListTM ._wz {
     color: #666666;
   }
 
-  .SeatList ._yiyong {
+  .SeatListTM ._yiyong {
     cursor: pointer;
     text-decoration: underline;
   }
@@ -567,7 +569,7 @@
   .TravelticketManager .vmiddle {
     display: flex;
     align-items: Center;
-    height: 78px;
+    /* height: 78px; */
   }
 
   .TM_btm {
@@ -577,7 +579,7 @@
   .TravelticketManager .TICK_Code {
     position: absolute;
     left: 25px;
-    top: 5px;
+    /* top: 5px; */
   }
 
   .TravelticketManager .TCID_cont {
@@ -600,8 +602,8 @@
   /*航班详情*/
   .TravelticketManager .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelticketManager ._flightList {
@@ -701,11 +703,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.ID">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="3" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div>
                   <span class="TICK_Code">{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}</span>
                   <img class="_oll_img" v-if="item.AirlineUrl" :src="item.AirlineUrl" :onerror="defaultImg" />
@@ -754,7 +756,7 @@
               </el-col>
               <el-col :span="3" class="vmiddle">
                 <div class="_Seat">
-                  <div class="SeatList">
+                  <div class="SeatListTM">
                     <ul class="clearfix">
                       <li>
                         <span class="iconfont icon-img_yizi"></span>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -482,7 +482,7 @@
                     <el-popover width="700" trigger="click" popper-class="TC_customerInfo">
                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
                         <tr>
-                          <td rowspan="2" style="text-align:center" width="60">
+                          <td rowspan="3" style="text-align:center" width="60">
                             <i>{{$t('Operation.Op_standard')}}</i>
                           </td>
                           <td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
@@ -516,6 +516,10 @@
                             <b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b>
                           </td>
                         </tr>
+                        <tr>
+                            <td style="text-align:right;">非中国大陆护照报价</td>
+                            <td colspan="6"><b>{{item.ForeignPassportPrice}}</b></td>
+                        </tr>
                         <tr>
                           <td rowspan="2" style="text-align:center">
                             <i>{{$t('Operation.Op_Income')}}</i>