Skip to content

A
Athena
Commit 4ffa4d05 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

111

parent 01b54bd6
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 10 deletions
src/assets/img/juan/f1.png
View replaced file @ 01b54bd6 View file @ 4ffa4d05
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/f2.png
View replaced file @ 01b54bd6 View file @ 4ffa4d05
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/h2.png
View replaced file @ 01b54bd6 View file @ 4ffa4d05
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/h22.png
View replaced file @ 01b54bd6 View file @ 4ffa4d05
This image diff could not be displayed because it is too large. You can view the blob instead.
src/components/taskPage/Fire.vue
View file @ 4ffa4d05
......@@ -64,7 +64,7 @@
<div class="spDiv" :style="{zoom: zoom}">
<div style="box-sizing: border-box;padding: 21px 44px 17px 44px;">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/img/juan/fire.mp4" type="video/ogg" />
<source src="../../assets/media/fire.mp4" type="video/ogg" />
</video>
</div>
......@@ -73,7 +73,7 @@
<div class="div1" ref="div2" :style="{height: height2}" style="margin-top:-75px">
<img class="img" src="../../assets/img/juan/h2.png" alt=""/>
<img class="img" src="../../assets/img/juan/h22.png" alt=""/>
<div class="tiaoDiv" :style="{zoom: zoom}">
<!-- <div class="tiaoDiv" :style="{zoom: zoom}">
<div style="position:relative;z-index:200;color:#fff;padding:40px 0 0 70px;box-sizing:border-box">
<el-row style="padding:8px 0;cursor:pointer;width: 100%;" :gutter="20" v-for="item in tiaoshui" :key="item.id">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
......@@ -82,7 +82,7 @@
<el-col :span="8" style="text-align:center">出团日期：{{item.startDate}}</el-col>
</el-row>
</div>
</div>
</div> -->
</div>
</div>
......@@ -193,7 +193,7 @@ export default {
for (let b = 0; b < imgLen.length; b++) {
if (b == that.ab2) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
imgLen[b].style.transition = "opacity 1s";
} else {
imgLen[b].style.opacity = 0;
}
......
src/components/taskPage/FoodImg.vue
View file @ 4ffa4d05
......@@ -17,12 +17,18 @@
left: 56px;
top: 39px;
cursor: pointer;
}
.bottom img{
width: 100%;
position: absolute;
z-index: 1
}
a{
text-decoration: none;
color:#111111;
}
</style>
......@@ -41,11 +47,41 @@
<div class="bottom">
<img src="../../assets/img/juan/bottom.png" alt=""/>
<div style="width:1200px;margin:0 auto;padding-top:200px;position:relative;z-index:200">
<el-row style="padding:15px 0;cursor:pointer" :gutter="20" v-for="item in SaleList" :key="item.id">
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" href="http://www.oytour.com/#/search?keywords=&lineName=%E5%87%BA%E5%A2%83%E6%97%A5%E6%9C%AC%E7%BA%BF&lineId=14">日本本州·一四七升版~米其林椿山庄+豪华双温泉 </a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年7月</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" href="http://www.oytour.com/#/search?keywords=&lineName=%E5%87%BA%E5%A2%83%E6%97%A5%E6%9C%AC%E7%BA%BF&lineId=14">日本本州~希尔顿假期~全程日式五星</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年8月</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" href="http://www.oytour.com/#/search?keywords=%25E8%258A%25B1%25E7%2581%25AB%25E5%25A4%25A7%25E4%25BC%259A">本州精品假期升级版</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年8月</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" href="http://www.oytour.com/#/search?keywords=&lineId=14&lineName=%E5%87%BA%E5%A2%83%E6%97%A5%E6%9C%AC%E7%BA%BF&lineteamId=592&lineteamName=%E8%AE%A9%E4%BD%A0%E7%8E%A9%E5%A5%BD%E2%80%9D%E4%B9%9D%E2%80%9D~%E4%B9%9D%E5%B7%9E%E7%B3%BB%E5%88%97"> 让你玩好”九”~九州系列</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年7月</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" href="http://www.oytour.com/#/search?keywords=&lineId=14&lineName=%E5%87%BA%E5%A2%83%E6%97%A5%E6%9C%AC%E7%BA%BF&lineteamId=592&lineteamName=%E8%AE%A9%E4%BD%A0%E7%8E%A9%E5%A5%BD%E2%80%9D%E4%B9%9D%E2%80%9D~%E4%B9%9D%E5%B7%9E%E7%B3%BB%E5%88%97"> 北海道 希尔顿系列(东航联营)</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年9月</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<p @click="goLocalDes(item.idDes, item)">{{item.title}}</p>
<a target="_blank" href="http://www.oytour.com/#/search?keywords=&lineId=14&lineName=%E5%87%BA%E5%A2%83%E6%97%A5%E6%9C%AC%E7%BA%BF&lineteamId=592&lineteamName=%E8%AE%A9%E4%BD%A0%E7%8E%A9%E5%A5%BD%E2%80%9D%E4%B9%9D%E2%80%9D~%E4%B9%9D%E5%B7%9E%E7%B3%BB%E5%88%97"> 暑期乐园系列</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：{{item.startDate}}</el-col>
<el-col :span="8" style="text-align:center">出团日期：2019年8月</el-col>
</el-row>
</div>
......
src/plugins/index.js
View file @ 4ffa4d05
......@@ -16,10 +16,11 @@ export default {
// var domainUrl = "http://192.168.2.16:8083"//主域名
// let domainUrl = "https://reborn.oytour.com"; //刘东主域名
let domainUrl = "https://reborn.oytour.com";
// domainUrl = "http://test.viitto.com"
domainUrl = "http://192.168.2.214:8082"
// let domainUrl = "https://reborn.oytour.com";
// domainUrl = "http://test.viitto.com"
let domainUrl = "http://192.168.2.214:8082"
// var domainUrl = "http://192.168.2.16:8083"
// var domainUrl = "http://reborn.oytour.com";
let locationName = window.location.hostname;
if (this.isOnline()) {
if (window.location.host.indexOf('viitto.com') != -1)
......
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