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

src/components/confirmationOrderDownLoad.vue

@@ -141,12 +141,14 @@
                 <tr>
                   <td width="140">出发时间<span>(当地)</span></td>
                   <td width="160">抵达时间<span>(当地)</span></td>
-                  <td width="206">起飞机场</td>
+                  <td width="160">起飞机场</td>
                   <td width="18" class="gap">&nbsp;</td>
-                  <td>抵达机场</td>
+                  <td width="160">抵达机场</td>
                   <td width="18" class="gap">&nbsp;</td>
                   <td width="140">航空公司</td>
                   <td width="90">航班编号</td>
+                  <td width="18" class="gap">&nbsp;</td>
+                  <td width="100">经停城市</td>
                 </tr>
               </tbody>
             </table>
@@ -156,24 +158,28 @@
                 <tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
                   <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
                   <td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
-                  <td width="206">{{flight.departureAirPortName}}<span class="citycode"></span></td>
+                  <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
-                  <td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
+                  <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
                   <td width="140">{{flight.alName}}</td>
                   <td width="110">{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})</td>
+                  <td width="18" class="gap">&nbsp;</td>
+                  <td width="100">{{flight.stopoverAirPortName}}</td>
                 </tr>
               </tbody>
               <tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0">
                 <tr v-for="(flight,ftIndex) in priceList[0].priceFlight" :key="ftIndex">
                   <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
                   <td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
-                  <td width="206">{{flight.departureAirPortName}}<span class="citycode"></span></td>
+                  <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
-                  <td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
+                  <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
                   <td width="140">{{flight.alName}}</td>
                   <td width="110">{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})</td>
+                  <td width="18" class="gap">&nbsp;</td>
+                  <td width="100">{{flight.stopoverAirPortName}}</td>
                 </tr>
               </tbody>
               <tbody v-else>
@@ -1069,6 +1075,7 @@
           })
         }
         this.priceList = data.priceList;
+        console.log(this.priceList,'pricelist')
         this.dataList = data;
         this.tripList.forEach((x, j) => {
           let useDinnerTypeBy = ''