修改页面

src/components/newConfimationOrder.vue

@@ -61,7 +61,7 @@
     .newTrip_Main .newTripTable tr td{
         vertical-align: top;
     }
-    .newTrip_Main .newTripTable span{
+    .newTrip_Main .newTripTable label{
         font-weight: bold;
     }
     .newTrip_Main .tripLeftCan,.newTrip_Main .tripRightCan{
@@ -367,12 +367,11 @@
             <div class="newtripList" v-for="(item,index) in tripList" :key="index">
                 <div class="newTripFly">DAY {{item.dayNum}}</div>
                 <div class="newTripDateTime">{{item.dateTime}}</div>
-                <!-- <div class="newTripFly">西安&nbsp;&nbsp;<i class="iconfont icon-Shape1"></i>&nbsp;&nbsp;东京成田 参考航班 HU7927 08:15---14:25</div> -->
                 <div class="newTripFly">
-                    {{item.title}}
+                    {{getTitle(item.title)}}
                 </div>
                 <div class="newTripDay" style="margin-bottom:0;" v-for="(subItem,subIndex) in item.details" :key="subIndex">
-                    <div class="newTripTutle">{{subItem.title}}</div>
+                    <div class="newTripTutle">{{getTitle(subItem.title)}}</div>
                     <div>{{subItem.content}}</div>
                 </div>
                 <div class="newTripDay">
@@ -382,17 +381,19 @@
                     <table class="newTripTable">
                         <tr>
                             <td style="width:45%">
-                                <span>酒店：</span>
+                                <label>酒店：</label>
                                 <template v-if='item.jiu2.length>0'>
                                     <span v-for="(t,k) in item.jiu2" style="cursor: pointer" :key="k">
                                     {{k==item.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
                                     </span>
                                 </template>
-                                {{getHotelSuffix(item)}}
+                                <template v-if="item.jiu2.length>0&&item.jiu2[0].name!=''">
+                                  {{getHotelSuffix(item)}}
+                                </template>
                             </td>
                             <td style="width:30%">
                                 <div class="tripLeftCan" style="vertical-align:top;">
-                                    <span>用餐：</span>
+                                    <label>用餐：</label>
                                 </div>
                                 <div class="tripRightCan">
                                     <!-- <div>无</div> -->
@@ -401,7 +402,7 @@
                                     <div>晚({{item.can.dinner}})</div>
                                 </div>
                             </td>
-                            <td style="width:25%"><span>交通：</span>飞机、酒店/机场班车</td>
+                            <td style="width:25%"><label>交通：</label>飞机、酒店/机场班车</td>
                         </tr>
                     </table>
                 </div>
@@ -920,8 +921,7 @@
                  this.airLineSelectChange(fItem.airLineID, fItem);
               });
             }
-
-            this.title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游'
+            this.title = this.getTitele(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
 
             document.title = this.title;
             //初始化行程
@@ -1173,6 +1173,26 @@
            console.log(this.tripList,'triplistttt');
         })
       },
+      //遍历字符串书否有null
+      getTitle(item){
+        if(item!=null&&item!=''){
+          if(item.indexOf('null')>-1){
+            return ''
+          }else{
+            return item
+          }
+        }
+      },
+      //去掉null
+      getTitele(item){
+        if(item!=null&&item!=''){
+          if(item.indexOf('null')>-1){
+            return item.replace('null','')
+          }else{
+            return item
+          }
+        }
+      }
     },
     components: {
       newTripCommon