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

src/assets/css/tripIndex.css

@@ -193,6 +193,7 @@
 }
 .trip-block .block-item .item .up img{
     width: 490px;
+    height: 295px;object-fit: cover;
     /* width: 100%; */
     /* zk新增 */
     position: relative;

src/components/commonPage/fiveday.vue

@@ -24,7 +24,7 @@
               </template>
               <template v-else>
                 <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
-                  :style="{'top':day.details[0].scenicJson.y+'px'}"
+                  :style="{'top':day.details[0].scenicJson.y+'px', 'height': (295-day.details[0].scenicJson.y) +'px'}"
                   :src='compressImg(day.details[0].img, "filt", 663, "")' />
                 <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
               </template>

src/components/commonPage/fourday.vue

@@ -26,7 +26,7 @@
                                     </video>
                                 </template>
                                 <template v-else>
-                                  <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")' />
+                                  <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px', 'height': (295-day.details[0].scenicJson.y) +'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")' />
                                   <img  v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
                                 </template>
                             </div>

src/components/commonPage/oneday.vue

@@ -27,7 +27,7 @@
                     </template>
                     <template v-else>
                       <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
-                        :style="{'top':day.details[0].scenicJson.y+'px'}"
+                        :style="{'top':day.details[0].scenicJson.y+'px', 'height': (295-day.details[0].scenicJson.y) +'px'}"
                         :src='compressImg(day.details[0].img, "filt", 663, "")' />
                       <img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
                       <img v-else-if="day.dayNum==1 && day.details[0].img==''"

src/components/commonPage/threeday.vue

@@ -26,7 +26,7 @@
                   </template>
                   <template v-else>
                     <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
-                      :style="{'top':day.details[0].scenicJson.y+'px'}"
+                      :style="{'top':day.details[0].scenicJson.y+'px', 'height': (295-day.details[0].scenicJson.y) +'px'}"
                       :src='compressImg(day.details[0].img, "filt", 663, "")' />
                     <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
                   </template>
@@ -87,7 +87,7 @@
                       </template>
                       <template v-else>
                         <img v-if="day.details[1].img!='' && day.details[1].scenicJson"
-                          :style="{'top':day.details[1].scenicJson.y+'px'}"
+                          :style="{'top':day.details[1].scenicJson.y+'px', 'height': (295-day.details[1].scenicJson.y) +'px'}"
                           :src='compressImg(day.details[1].img, "filt", 663, "")' />
                         <img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' />
                       </template>
@@ -112,7 +112,7 @@
                       </template>
                       <template v-else>
                         <img v-if="day.details[2].img!='' && day.details[2].scenicJson"
-                          :style="{'top':day.details[2].scenicJson.y+'px'}"
+                          :style="{'top':day.details[2].scenicJson.y+'px', 'height': (295-day.details[2].scenicJson.y) +'px'}"
                           :src='compressImg(day.details[2].img, "filt", 663, "")' />
                         <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
                       </template>

src/components/commonPage/twoday.vue

@@ -27,7 +27,7 @@
                                       </video>
                                     </template>
                                     <template v-else>
-                                      <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")'/>
+                                      <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px', 'height': (295-item.scenicJson.y) +'px'}" :src='compressImg(item.img, "filt", 663, "")'/>
                                       <img  v-else :src='compressImg(item.img, "filt", 663, "")' />
                                     </template>
                                 </div>

src/components/confirmationOrderDownLoad.vue

@@ -342,14 +342,19 @@
                 <div class="short-line"></div>
                 <div class="english-title">Scheduling</div>
               </div>
+              11
               <oneday v-if="item.details && item.details.length==1" :day='item' :dayNum="item.dayNum"
                 :title="item.title" :isDirect="isDirect" :showTime="isShowTime"></oneday>
+              22
               <twoday v-if="item.details && item.details.length==2" :day='item' :dayNum="item.dayNum"
                 :title="item.title" :isDirect="isDirect" :showTime="isShowTime"></twoday>
+                33
               <threeday v-if="item.details && item.details.length==3" :day='item' :dayNum="item.dayNum"
                 :title="item.title" :isDirect="isDirect" :showTime="isShowTime"></threeday>
+                44
               <fourday v-if="item.details && item.details.length==4" :day='item' :dayNum="item.dayNum"
                 :title="item.title" :isDirect="isDirect" :showTime="isShowTime"></fourday>
+                55
               <fiveday v-if="item.details && item.details.length>=5" :day='item' :dayNum="item.dayNum"
                 :title="item.title" :isDirect="isDirect" :showTime="isShowTime"></fiveday>
             </div>