Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/mall/newTrip.vue

@@ -947,17 +947,23 @@
                                                 <span class="subTitle">酒店安排</span>
                                             </div>
                                             <template v-for="(item,index) in dataList.dayList">
-                                                <template v-for="(subItem,subIndex) in item.dayArray"
-                                                    v-if="subItem.type==3">
-                                                    <div class="col-md-12 col-sm-12">
-                                                        <div class="arrangementSubContainer">
-                                                            <div class="header hotel">
-                                                                <span class="dayIndex">D{{item.dayNum}}</span>
-                                                                <div class="city">
-                                                                    <span>{{subItem.childItem.cityName}}</span>
-                                                                </div>
+                                                <div class="col-md-12 col-sm-12">
+                                                    <div class="arrangementSubContainer">
+                                                        <div class="header hotel">
+                                                            <span class="dayIndex">D{{item.dayNum}}</span>
+                                                            <div class="city">
+                                                                <span>
+                                                                    <template
+                                                                        v-for="(subItem,subIndex) in getHotelArray(item.dayArray)"
+                                                                        v-if="subIndex==0">
+                                                                        {{subItem.childItem.cityName}}
+                                                                    </template>
+                                                                </span>
                                                             </div>
-                                                            <div class="content">
+                                                        </div>
+                                                        <div class="content">
+                                                            <template v-for="(subItem,subIndex) in item.dayArray"
+                                                                v-if="subItem.type==3">
                                                                 <div class="name hotel">
                                                                     <span class="left">
                                                                         <i class="iconfont icon-bed"></i>
@@ -969,10 +975,11 @@
                                                                             v-else>{{subItem.childItem.hotelName}}</template>
                                                                     </span>
                                                                 </div>
-                                                            </div>
+                                                            </template>
                                                         </div>
                                                     </div>
-                                                </template>
+
+                                                </div>
                                             </template>
                                         </div>
                                     </div>
@@ -1186,6 +1193,7 @@
                 this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, res => {
                     if (res.data.resultCode == 1) {
                         this.dataList = res.data.data;
+                        console.log(this.dataList,'datalist');
                         this.isShow = true;
                         this.getAllPoint();
                         //装载景点酒店图片以供预览
@@ -1334,6 +1342,17 @@
                     this.travelLngLat = Arr;
                 }
             },
+            getHotelArray(hotelArray) {
+                var newArray = [];
+                if (hotelArray != null && hotelArray.length > 0) {
+                    hotelArray.forEach(item => {
+                        if (item.type == 3) {
+                            newArray.push(item);
+                        }
+                    })
+                }
+                return newArray;
+            },
             //滚动选中
             handleScroll() {
                 try {