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

src/pages/travel/components/addOrder.vue

@@ -14,7 +14,7 @@
 <template>
   <q-card flat class="q-pa-md" style="background: #fff; width: 600px; min-width: 375px">
     <div class="bacakground">
-      <div class="heading">{{ $t("travel.addTitle") }}</div>
+      <div class="heading">{{ $t('travel.buy') }} </div>
       <q-form @submit="saveOrder">
         <div class="row">
           <div class="col">

src/pages/travel/components/productList.vue

@@ -245,14 +245,13 @@
               <th width="80">{{ $t('system.query_flightNum') }}</th>
               <th width="150">{{ $t('system.ph_flightTime') }}</th>
               <th width="80">{{ $t('system.query_arrivalTime') }}</th>
-              <!-- <th width="100">{{ $t('system.query_stopCity') }}</th> -->
             </tr>
             <tr v-for="(fItem, fIndex) in dialogObj.SelfFlightList" :key="fIndex" style="text-align: center">
               <td class="_d_name _color_666">
-                <span v-if="fIndex == 0">{{ $t('Airticket.Air_go') }}</span>
-                <span v-else-if="fIndex == dialogObj.SelfFlightList.length - 1">{{ $t('Airticket.Air_returnTrip')
+                <span v-if="fItem.FlightType==1">{{ $t('Airticket.Air_go') }}</span>
+                <span v-else-if="fItem.FlightType==2">{{ $t('Airticket.Air_returnTrip')
                   }}</span>
-                <span v-else-if="fIndex > 0 && fIndex != dialogObj.SelfFlightList.length - 1">{{
+                <span v-else-if="fItem.FlightType==3">{{
                   $t('Airticket.Air_transit')
                   }}</span>
               </td>