页面修改

src/components/mall/newTrip.vue

@@ -25,7 +25,7 @@
 
     .pageViewTrip .sideBarBtns .btnPage {
         cursor: pointer;
-        height:27px;
+        height: 27px;
         margin-bottom: 5px;
     }
 
@@ -532,7 +532,7 @@
         height: 150px;
         color: #fff;
         position: relative;
-        background-size: cover!important;
+        background-size: cover !important;
     }
 
     .tripViewAgendaList .agendaBox .txtCont {
@@ -818,7 +818,8 @@
     .slideHeader .cities i:last-child {
         display: none;
     }
-    .tripViewAgendaList .agendaBox .showMore{
+
+    .tripViewAgendaList .agendaBox .showMore {
         color: #00B2B4;
         margin: 10px auto;
         padding: 4px 2px;
@@ -829,13 +830,14 @@
         font-size: 12px;
         cursor: pointer;
     }
+
     .tripViewAgendaList .agendaBox .hideAgendaDetails {
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;
         -webkit-line-clamp: 3;
-        padding:20px 0 0 0;
-        margin-bottom:20px;
+        padding: 20px 0 0 0;
+        margin-bottom: 20px;
         -webkit-box-orient: vertical;
     }
 </style>
@@ -1111,17 +1113,20 @@
                                                                             disabled></el-rate>
                                                                     </span>
                                                                 </div>
-                                                                <div class="item" v-if="getService(subItem.childItem.facilityServices)!=''">
+                                                                <div class="item"
+                                                                    v-if="getService(subItem.childItem.facilityServices)!=''">
                                                                     <span class="label">设施服务</span>
                                                                     <span
                                                                         class="text">{{getService(subItem.childItem.facilityServices)}}</span>
                                                                 </div>
                                                             </div>
-                                                            <div class="subSection" :class="{'hideAgendaDetails':!subItem.childItem.isShow}"
+                                                            <div class="subSection"
+                                                                :class="{'hideAgendaDetails':!subItem.childItem.isShow}"
                                                                 v-if="subItem.childItem.hotelNewDescriptionText"
                                                                 v-html="subItem.childItem.hotelNewDescriptionText">
                                                             </div>
-                                                            <div class="detailSection" style="margin-top:0;" v-if="subItem.childItem.isShow">
+                                                            <div class="detailSection" style="margin-top:0;"
+                                                                v-if="subItem.childItem.isShow">
                                                                 <div class="item"
                                                                     v-if="subItem.childItem.hotelAddress!=''">
                                                                     <span class="label">地址</span>
@@ -1133,7 +1138,8 @@
                                                                     <span class="text">{{subItem.childItem.url}}</span>
                                                                 </div>
                                                             </div>
-                                                            <div class="showMore" @click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
+                                                            <div class="showMore"
+                                                                @click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
                                                         </div>
                                                         <div class="Divtriangle">
                                                             <span></span>
@@ -1238,7 +1244,7 @@
                                     if (y.childItem.imaArray.length > 0) {
                                         this.images.push(y.childItem.imaArray[0].url);
                                     }
-                                    y.childItem.isShow=true
+                                    y.childItem.isShow = true
                                 }
                             })
                         })
@@ -1400,16 +1406,20 @@
                                     })
                                 }
                             });
-                        }
-                        else
-                        {
-                      
+                        } else {
+                            if (startTrafficArray && startTrafficArray.length > 0) {
+                                Arr.push(...startTrafficArray);
+                            }
                         }
                     }
                     //从酒店出发
                     else {
+                        if (YesterdayHotelArray && YesterdayHotelArray.length > 0) {
+                            Arr.push(...YesterdayHotelArray);
+                        }
                         //最后一天 
                         if (dayNum == this.dataList.dayList[this.dataList.dayList.length - 1].dayNum) {
+
                             if (this.FlightList && this.FlightList.length > 0) {
                                 this.FlightList.forEach(subItem => {
                                     if (subItem.startDate == newDate) {
@@ -1427,9 +1437,9 @@
                                         })
                                     }
                                 });
+                            } else {
+                                Arr.push(...startTrafficArray);
                             }
-                        } else {
-
                         }
                     }
 
@@ -1511,9 +1521,9 @@
                     }
                 } catch (error) {}
             },
-             //隐藏显示
-            getShowMore(item){
-                item.isShow=!item.isShow;
+            //隐藏显示
+            getShowMore(item) {
+                item.isShow = !item.isShow;
                 this.$forceUpdate();
             }
         }