Skip to content

S
SuperMan
Commit fc516214 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 31225d28
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 30 deletions
src/components/commonPage/fiveday.vue
View file @ fc516214
...@@ -18,10 +18,16 @@ ...@@ -18,10 +18,16 @@
<div class="five-box day_table"> <div class="five-box day_table">
<div class="left"> <div class="left">
<div class="image"> <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>
</template>
<template v-else>
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" <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'}"
:src='compressImg(day.details[2].img, "filt", 663, "")' /> :src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</template>
</div> </div>
<table class="day_table"> <table class="day_table">
<tr> <tr>
...@@ -55,10 +61,15 @@ ...@@ -55,10 +61,15 @@
<div class="item item5"> <div class="item item5">
<div class="upFour"> <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'" /> --> <!-- <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>
</template>
<template v-else>
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}"
:src='compressImg(item.img, "filt", 663, "")' /> :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' /> <img v-else :src='compressImg(item.img, "filt", 663, "")' />
</template>
</div> </div>
<div class="down"> <div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4> <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4>
......
src/components/commonPage/fourday.vue
View file @ fc516214
...@@ -21,8 +21,14 @@ ...@@ -21,8 +21,14 @@
<td> <td>
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<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>
</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'}" :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
</template>
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
...@@ -54,8 +60,14 @@ ...@@ -54,8 +60,14 @@
<div class="item"> <div class="item">
<div class="upFour"> <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'" /> --> <!-- <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>
</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'}" :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' /> <img v-else :src='compressImg(item.img, "filt", 663, "")' />
</template>
</div> </div>
<div class="down"> <div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>
......
src/components/commonPage/oneday.vue
View file @ fc516214
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
<td> <td>
<div class="item big" style='margin-bottom:20px;'> <div class="item big" style='margin-bottom:20px;'>
<div class="left"> <div class="left">
<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>
</template>
<template v-else>
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" <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'}"
:src='compressImg(day.details[0].img, "filt", 663, "")' /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
...@@ -30,6 +35,7 @@ ...@@ -30,6 +35,7 @@
<img v-else-if="day.islast && day.details[0].img==''" <img v-else-if="day.islast && day.details[0].img==''"
:src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" /> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" />
</template>
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
...@@ -131,7 +137,7 @@ ...@@ -131,7 +137,7 @@
} }
}, },
mounted() { mounted() {
console.log(this.day,'daysssss'); console.log(this.day,'datyyyy');
} }
}; };
......
src/components/commonPage/threeday.vue
View file @ fc516214
...@@ -20,9 +20,15 @@ ...@@ -20,9 +20,15 @@
<td> <td>
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<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>
</template>
<template v-else>
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" <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, "")' /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
</template>
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
...@@ -73,9 +79,15 @@ ...@@ -73,9 +79,15 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<template v-if="day.details[1].fileType&&day.details[1].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[1].videoPath" controls="controls">
</video>
</template>
<template v-else>
<img v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}" <img v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}"
:src='compressImg(day.details[1].img, "filt", 663, "")'/> :src='compressImg(day.details[1].img, "filt", 663, "")'/>
<img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' />
</template>
</div> </div>
</div> </div>
</div> </div>
...@@ -90,8 +102,14 @@ ...@@ -90,8 +102,14 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<template v-if="day.details[2].fileType&&day.details[2].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[2].videoPath" controls="controls">
</video>
</template>
<template v-else>
<img v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' /> <img v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':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, "")' /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</template>
</div> </div>
</div> </div>
</div> </div>
......
src/components/commonPage/twoday.vue
View file @ fc516214
...@@ -22,8 +22,14 @@ ...@@ -22,8 +22,14 @@
<div class="twoday_item" v-for="item in day.details" :key="item.dayNum"> <div class="twoday_item" v-for="item in day.details" :key="item.dayNum">
<div class="item"> <div class="item">
<div class="up"> <div class="up">
<template v-if="item.fileType&&item.fileType=='.mp4'">
<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'}" :src='compressImg(item.img, "filt", 663, "")'/> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")'/>
<img v-else :src='compressImg(item.img, "filt", 663, "")' /> <img v-else :src='compressImg(item.img, "filt", 663, "")' />
</template>
</div> </div>
<div class="down" style='padding:22px 0;'> <div class="down" style='padding:22px 0;'>
<h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment