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

src/components/commonPage/fiveday.vue

@@ -19,14 +19,14 @@
           <div class="left">
             <div class="image">
               <template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
-                  <video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls">
-                  </video>
+                <video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls">
+                </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[2].img, "filt", 663, "")' />
-                <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
+                  :src='compressImg(day.details[0].img, "filt", 663, "")' />
+                <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
               </template>
             </div>
             <table class="day_table">
@@ -37,8 +37,6 @@
                     </h4>
                     <div class="playInfo">
                       <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
-                        <!--<i class="iconfont icon-menpiao"></i>-->
-                        <!--{{day.details[0].ticketName}}-->
                       </span>
                       <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
                         <i class="iconfont icon-shijian1"></i>
@@ -52,18 +50,15 @@
                 </td>
               </tr>
             </table>
-
           </div>
           <div class="right">
             <div class="fiveday">
               <div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i">
-
                 <div class="item item5">
                   <div class="upFour">
-                    <!-- <img  :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
                     <template v-if="item.fileType&&item.fileType=='.mp4'">
-                        <video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls">
-                        </video>
+                      <video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls">
+                      </video>
                     </template>
                     <template v-else>
                       <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}"
@@ -75,8 +70,6 @@
                     <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4>
                     <div class="playInfo">
                       <span class="playInfo-item" v-if='item.ticketName!=""'>
-                        <!--<i class="iconfont icon-menpiao"></i>-->
-                        <!--{{item.ticketName}}-->
                       </span>
                       <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
                         <i class="iconfont icon-shijian1"></i>
@@ -123,7 +116,7 @@
           </td>
           <td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
             <span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
-               {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
+              {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
             </span>
             {{getHotelSuffix()}}
           </td>
@@ -140,21 +133,21 @@
       isDirect: {},
       title: {},
       dayNum: {},
-    showTime: {},
-  },
-  data() {
-    return {
-      isshowtime: true,
-    }
-  },
-  watch: {
-    showTime: {
-      handler: function (v, ov) {
-        this.isshowtime = v;
+      showTime: {},
+    },
+    data() {
+      return {
+        isshowtime: true,
+      }
+    },
+    watch: {
+      showTime: {
+        handler: function (v, ov) {
+          this.isshowtime = v;
+        },
+        deep: true,
       },
-      deep: true,
     },
-  },
     methods: {
       getHotelSuffix() {
         let suffix = "";