Skip to content

A
Athena
Commit ba432bcd authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 70e8709f 5d963295
Expand all Show whitespace changes
Inline Side-by-side
Showing with 439 additions and 142 deletions
src/assets/css/home.css
View file @ ba432bcd
...@@ -582,16 +582,17 @@ a{ ...@@ -582,16 +582,17 @@ a{
.Home .hotel .hotel_right_item img{ .Home .hotel .hotel_right_item img{
width: 100%; width: 100%;
height: 100%; height: 100%;
transform: scale(1.2);
transition: transform 0.5s ease 0s; transition: transform 0.5s ease 0s;
} }
.Home .hotel .hotel_right_item img:hover{ .Home .hotel .hotel_right_item img:hover{
transform: scale(1.1); transform: scale(1.3);
} }
.Home .hotel .hotel_right_item .hotel_remake{ .Home .hotel .hotel_right_item .hotel_remake{
width:116px; width:116px;
height:116px; height:116px;
background:rgba(0,0,0,1); background:rgba(0,0,0,0.45);
opacity:0.75; /* opacity:0.75; */
border-radius:50%; border-radius:50%;
position: absolute; position: absolute;
text-align: center; text-align: center;
...@@ -804,3 +805,14 @@ a{ ...@@ -804,3 +805,14 @@ a{
height: 1px; height: 1px;
background-color: #ededed; background-color: #ededed;
} }
.Home .Home_HtName{
display: inline-block;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
padding: 0 5px;
-webkit-box-orient: vertical;
}
\ No newline at end of file
src/assets/img/juan/fire1.png 0 → 100644
View file @ ba432bcd
This diff is collapsed.
src/assets/img/juan/fire2.png 0 → 100644
View file @ ba432bcd
This diff is collapsed.
src/assets/img/juan/fm2.png 0 → 100644
View file @ ba432bcd
This diff is collapsed.
src/components/Home.vue
View file @ ba432bcd
This diff is collapsed.
src/components/Hotel/HotelHome.vue
View file @ ba432bcd
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="Ht_baozhang" style="margin-top:127px;"> <div class="Ht_baozhang" style="margin:80px auto;">
<ul> <ul>
<li> <li>
<img src="../../assets/img/hotel/bz.png" alt=""/> <img src="../../assets/img/hotel/bz.png" alt=""/>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="Ht_btnImg" style="margin:40px auto;"> <div class="Ht_btnImg" style="margin:40px auto;display:none;">
<div> <div>
<img src="../../assets/img/hotel/j1.png" alt=""/> <img src="../../assets/img/hotel/j1.png" alt=""/>
</div> </div>
......
src/components/taskPage/Fire.vue
View file @ ba432bcd
...@@ -53,10 +53,60 @@ ...@@ -53,10 +53,60 @@
position: relative; position: relative;
top: -260px; top: -260px;
} }
.FM_div{
width:100%;
height:auto;
position: relative;
}
.FM_div img{
width:100%;
position: absolute;
z-index:100;
}
.videoBox{
position: absolute;
width:490px;
height:290px;
top:1245px;
margin:auto;
left:90px;
z-index:200;
}
.TwoCode{
width: 100%;
text-align: center;
height:200px;
position: absolute;
bottom:0;
margin:auto;
z-index:200;
}
.TwoCode img{
width:150px!important;
width:100%;
bottom: 0;
z-index:21000;
position: relative;
}
</style> </style>
<template> <template>
<div style="position: relative;"> <div>
<div v-show="isPhone">
<div class="FM_div" ref="div3" :style="{height: height3}">
<img class="img" src="../../assets/img/juan/fire1.png" alt=""/>
<img class="img" src="../../assets/img/juan/fire2.png" alt=""/>
<div class="videoBox" :style="{zoom: zoom}">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/fire.mp4" type="video/ogg" />
</video>
</div>
<div class="TwoCode">
<img src="../../assets/img/juan/twoCode.png" alt=""/>
</div>
</div>
</div>
<div style="position: relative;" v-show="!isPhone">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt /> <img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div1" ref="div1" :style="{height: height1}"> <div class="div1" ref="div1" :style="{height: height1}">
<img class="img" src="../../assets/img/juan/h1.png" alt=""/> <img class="img" src="../../assets/img/juan/h1.png" alt=""/>
...@@ -84,8 +134,8 @@ ...@@ -84,8 +134,8 @@
</div> </div>
</div> --> </div> -->
</div> </div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
...@@ -93,12 +143,15 @@ export default { ...@@ -93,12 +143,15 @@ export default {
return { return {
ab:0, ab:0,
ab2:0, ab2:0,
ab3:0,
SaleList:[], SaleList:[],
cityId:262, cityId:262,
companyId:0, companyId:0,
height1:"0px", height1:"0px",
height2:"0px", height2:"0px",
height3:"0px",
tiaoshui:[], tiaoshui:[],
isPhone:false
}; };
}, },
mounted() { mounted() {
...@@ -107,8 +160,17 @@ export default { ...@@ -107,8 +160,17 @@ export default {
this.AutoExchange(); this.AutoExchange();
// this.getFirstImg2(); // this.getFirstImg2();
this.AutoExchange2(); this.AutoExchange2();
})
})
  var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
  if (ua.match(/MicroMessenger/i) == "micromessenger") {
    //在微信中打开
this.isPhone=true;
this.AutoExchange3();
  } else {
  //否则就是PC浏览器打开
this.isPhone=false;
}
}, },
created() { created() {
this.cityId=localStorage.cityId; this.cityId=localStorage.cityId;
...@@ -130,6 +192,8 @@ export default { ...@@ -130,6 +192,8 @@ export default {
this.height1=(2465/1920)*oWidth+'px'; this.height1=(2465/1920)*oWidth+'px';
this.height2=(4427/1920)*oWidth+'px'; this.height2=(4427/1920)*oWidth+'px';
this.loadTiaoshui(); this.loadTiaoshui();
let oWidth2 = window.screen.width;
this.height3=(5451/750)*oWidth2+'px';
}, },
methods: { methods: {
goLocalDes(idDes,obj){ goLocalDes(idDes,obj){
...@@ -182,6 +246,17 @@ export default { ...@@ -182,6 +246,17 @@ export default {
} }
} }
}, },
getFirstImg3(){
let div3 = this.$refs.div3;//整个区域
var imgLen = div3.getElementsByClassName("img");//图片
for (var i=0;i<imgLen.length;i++){
if (i!=0){
imgLen[i].style.opacity = 0;
}
}
},
//自动切换 //自动切换
AutoExchange(){ AutoExchange(){
var div1 = this.$refs.div1;//整个区域 var div1 = this.$refs.div1;//整个区域
...@@ -217,7 +292,26 @@ export default { ...@@ -217,7 +292,26 @@ export default {
} }
} }
},5000); },5000);
},
//自动切换
AutoExchange3(){
let div3 = this.$refs.div3;//整个区域
var imgLen = div3.getElementsByClassName("img");//图片
var that = this;
setInterval(function ac() { //设置2000毫秒重复运行
that.ab3 = that.ab3>imgLen.length-2?0:++that.ab3; //5张图,当触摸到的按钮索引号大于3时(比如4),那么ab=0(下一张图为第0张),否则++ab;
//循环遍历下一张图的效果.
for (var b = 0; b < imgLen.length; b++) {
if (b == that.ab3) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
} else {
imgLen[b].style.opacity = 0;
}
} }
},5000);
}
} }
}; };
</script> </script>
src/components/taskPage/FoodImg.vue
View file @ ba432bcd
...@@ -30,10 +30,83 @@ a{ ...@@ -30,10 +30,83 @@ a{
text-decoration: none; text-decoration: none;
color:#111111; color:#111111;
} }
.FM_div{
width:100%;
height:auto;
position: relative;
}
.FM_div img{
width:100%;
position: absolute;
z-index:100;
}
.div3 img{
width:100%;
height: 100%;
}
</style> </style>
<template> <template>
<div style="position: relative;"> <div>
<div style="position: relative;">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div3 div1" ref="div3" :style="{height: height2}">
<!-- -->
<img class="img" src="../../assets/img/juan/fm1.jpg" alt=""/>
<img class="img" src="../../assets/img/juan/fm2.png" alt=""/>
<div style="position: relative;z-index:-100;opacity:0">
<img style="position: relative;" src="../../assets/img/juan/fm1.jpg" alt=""/>
</div>
</div>
<div class="bottom">
<img src="../../assets/img/juan/fmBtm.png" alt=""/>
<div style="width:95%;margin:0 auto;padding:10px 0 0 10px;position:relative;z-index:200">
<el-row style="padding:50px 0 5px 0;cursor:pointer;" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;">日本本州·一四七升版~米其林椿山庄+豪华双温泉 </a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：8月</el-col>
</el-row>
<el-row style="cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;">日本本州~希尔顿假期~全程日式五星</a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：8月</el-col>
</el-row>
<el-row style="padding-top:5px;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;">本州精品假期升级版</a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：8月</el-col>
</el-row>
<el-row style="padding-top:5px;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;"> 让你玩好”九”~九州系列</a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：8月</el-col>
</el-row>
<el-row style="padding-top:5px;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;"> 北海道 希尔顿系列(东航联营)</a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：9月</el-col>
</el-row>
<el-row style="padding-top:5px;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<a target="_blank" style="font-size:12px;"> 暑期乐园系列</a>
</el-col>
<el-col :span="10" style="text-align:right;font-size:12px;">出团日期：8月</el-col>
</el-row>
<div style="text-align:center;width:100%;margin:30px 0">
<img style="width:150px;height:150px;position:relative;" src="../../assets/img/juan/twoCode.png" alt=""/>
</div>
</div>
</div>
</div>
<div style="position: relative;" v-show="!isPhone">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt /> <img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div1" ref="div1"> <div class="div1" ref="div1">
...@@ -86,6 +159,7 @@ a{ ...@@ -86,6 +159,7 @@ a{
</div> </div>
</div> </div>
</div>
</div> </div>
</template> </template>
...@@ -97,6 +171,9 @@ export default { ...@@ -97,6 +171,9 @@ export default {
SaleList:[], SaleList:[],
cityId:262, cityId:262,
companyId:0, companyId:0,
isPhone:false,
height2:"0px",
ab3:0
}; };
}, },
mounted() { mounted() {
...@@ -104,12 +181,24 @@ export default { ...@@ -104,12 +181,24 @@ export default {
// this.getFirstImg(); // this.getFirstImg();
this.AutoExchange(); this.AutoExchange();
}) })
  var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
  if (ua.match(/MicroMessenger/i) == "micromessenger") {
    //在微信中打开
this.isPhone=true;
this.AutoExchange3();
  } else {
  //否则就是PC浏览器打开
this.isPhone=false;
}
}, },
created() { created() {
this.cityId=localStorage.cityId; this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site); this.companyId=parseInt(localStorage.site);
this.Cztm(); this.Cztm();
let oWidth = window.screen.width;
this.height2=(6363/1920)*oWidth+500+'px';
// this.height2=(3702/750)*oWidth+'px';
}, },
components: { components: {
}, },
...@@ -168,6 +257,24 @@ export default { ...@@ -168,6 +257,24 @@ export default {
} }
} }
},5000); },5000);
},
//自动切换
AutoExchange3(){
let div3 = this.$refs.div3;//整个区域
var imgLen = div3.getElementsByClassName("img");//图片
var that = this;
setInterval(function ac() { //设置2000毫秒重复运行
that.ab3 = that.ab3>imgLen.length-2?0:++that.ab3; //5张图,当触摸到的按钮索引号大于3时(比如4),那么ab=0(下一张图为第0张),否则++ab;
//循环遍历下一张图的效果.
for (var b = 0; b < imgLen.length; b++) {
if (b == that.ab3) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
} else {
imgLen[b].style.opacity = 0;
}
}
},5000);
} }
} }
}; };
......
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