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

src/components/newTravelmanager/TravelTripPreview/fivedayList.vue

@@ -4,9 +4,7 @@
       <div class="TC-ImgTop" :id='"boxs_"+DayNum+"_"+0'>
         <template v-if="scenicArray[0].NewImaArray[0].FileType&&scenicArray[0].NewImaArray[0].FileType=='.mp4'">
           <!-- <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" height="100%" :src="scenicArray[0].NewImaArray[0].VideoPath" controls="controls">
           </video>
         </template>
         <template v-else>
@@ -62,9 +60,7 @@
       <div class="TC-ChildListImg">
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+1'>
           <template v-if="scenicArray[1].NewImaArray[0].FileType&&scenicArray[1].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[1].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
           </template>
@@ -121,9 +117,7 @@
       <div class="TC-ChildListImg">
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+2'>
           <template v-if="scenicArray[2].NewImaArray[0].FileType&&scenicArray[2].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[2].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
             
@@ -181,9 +175,7 @@
       <div class="TC-ChildListImg">
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+3'>
           <template v-if="scenicArray[3].NewImaArray[0].FileType&&scenicArray[3].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[3].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[3].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[3].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
             
@@ -241,9 +233,7 @@
       <div class="TC-ChildListImg">
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+4'>
           <template v-if="scenicArray[4].NewImaArray[0].FileType&&scenicArray[4].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[4].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[4].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[4].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[4].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
           </template>

src/components/newTravelmanager/TravelTripPreview/fourdayList.vue

@@ -28,9 +28,7 @@
     <div class="TC-ScencContent clearfix">
       <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
         <template v-if="scenicArray[0].NewImaArray[0].FileType&&scenicArray[0].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" height="100%" :src="scenicArray[0].NewImaArray[0].VideoPath" controls="controls">
           </video>
           <!-- <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>
@@ -87,9 +85,7 @@
       <div class="TC-fourChildContent">
         <div class="image" :id='"boxs_"+DayNum+"_"+1'>
           <template v-if="scenicArray[1].NewImaArray[0].FileType&&scenicArray[1].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[1].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
           </template>
@@ -146,9 +142,7 @@
       <div class="TC-fourChildContent">
         <div class="image" :id='"boxs_"+DayNum+"_"+2'>
           <template v-if="scenicArray[2].NewImaArray[0].FileType&&scenicArray[2].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[2].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
           </template>
@@ -205,9 +199,7 @@
       <div class="TC-fourChildContent">
         <div class="image" :id='"boxs_"+DayNum+"_"+3'>
           <template v-if="scenicArray[3].NewImaArray[0].FileType&&scenicArray[3].NewImaArray[0].FileType=='.mp4'">
-            <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-              <source :src="scenicArray[3].NewImaArray[0].VideoPath" type="video/mp4">
-              <source :src="scenicArray[3].NewImaArray[0].VideoPath" type="video/ogg">
+            <video ref="myVideo" width="100%" height="100%" :src="scenicArray[3].NewImaArray[0].VideoPath" controls="controls">
             </video>
             <!-- <img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
           </template>

src/components/newTravelmanager/TravelTripPreview/onedayList.vue

@@ -32,9 +32,7 @@
   <div class="TC-ScencContent">
     <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
       <template v-if="scenicArray[0].NewImaArray[0].FileType&&scenicArray[0].NewImaArray[0].FileType=='.mp4'">
-        <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-          <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/mp4">
-          <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/ogg">
+        <video ref="myVideo" width="100%" :src="scenicArray[0].NewImaArray[0].VideoPath" height="100%" controls="controls">
         </video>
         <!-- <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
       </template>
@@ -163,6 +161,7 @@
           that.scenicArray[0].NewImaArray = [];
           that.scenicArray[0].NewImaArray.push(obj);
           that.scenicArray[0].NewScenicImg = JSON.stringify(that.scenicArray[0].NewImaArray);
+          this.$forceUpdate();
           console.log("that.scenicArray[0].NewImaArray",that.scenicArray[0].NewImaArray);
         });
       },

src/components/newTravelmanager/TravelTripPreview/threedayList.vue

@@ -27,9 +27,7 @@
     <div class="TC-ScencContent clearfix">
       <div class="TC-threeOneImg" :id='"boxs_"+DayNum+"_"+0'>
         <template v-if="scenicArray[0].NewImaArray[0].FileType&&scenicArray[0].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" :src="scenicArray[0].NewImaArray[0].VideoPath" height="100%" controls="controls">
           </video>
           <!-- <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>
@@ -113,9 +111,7 @@
       </div>
       <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+1'>
         <template v-if="scenicArray[1].NewImaArray[0].FileType&&scenicArray[1].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" height="100%" :src="scenicArray[1].NewImaArray[0].VideoPath" controls="controls">
           </video>
           <!-- <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>
@@ -146,9 +142,7 @@
     <div class="clearfix TC-midContent">
       <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+2'>
         <template v-if="scenicArray[2].NewImaArray[0].FileType&&scenicArray[2].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[2].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" :src="scenicArray[2].NewImaArray[0].VideoPath" height="100%" controls="controls">
           </video>
           <!-- <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>

src/components/newTravelmanager/TravelTripPreview/twodayList.vue

@@ -10,9 +10,7 @@
     <div class="TC-twoCombox">
       <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+0'>
         <template v-if="scenicArray[0].NewImaArray[0].FileType&&scenicArray[0].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[0].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" :src="scenicArray[0].NewImaArray[0].VideoPath" height="100%" controls="controls">
           </video>
           <!-- <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>
@@ -69,9 +67,7 @@
     <div class="TC-twoCombox">
       <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+1'>
         <template v-if="scenicArray[1].NewImaArray[0].FileType&&scenicArray[1].NewImaArray[0].FileType=='.mp4'">
-          <video ref="myVideo" autoplay="autoplay" width="100%" height="100%" controls="controls">
-            <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/mp4">
-            <source :src="scenicArray[1].NewImaArray[0].VideoPath" type="video/ogg">
+          <video ref="myVideo" width="100%" :src="scenicArray[1].NewImaArray[0].VideoPath" height="100%" controls="controls">
           </video>
           <!-- <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' /> -->
         </template>