Skip to content

A
Athena
Commit 5d4d44dc authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent 10db9024
Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 3 deletions
src/assets/img/juan/bg1.jpg 0 → 100644
View file @ 5d4d44dc
This diff is collapsed.
src/assets/img/juan/f1.png 0 → 100644
View file @ 5d4d44dc
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/f2.png 0 → 100644
View file @ 5d4d44dc
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/h1.png 0 → 100644
View file @ 5d4d44dc
This diff is collapsed.
src/assets/img/juan/h11.png 0 → 100644
View file @ 5d4d44dc
This diff is collapsed.
src/assets/img/juan/h2.png 0 → 100644
View file @ 5d4d44dc
This image diff could not be displayed because it is too large. You can view the blob instead.
src/assets/img/juan/h22.png 0 → 100644
View file @ 5d4d44dc
This image diff could not be displayed because it is too large. You can view the blob instead.
src/components/Ticket/FillItinerary.vue
View file @ 5d4d44dc
......@@ -377,7 +377,6 @@ export default {
ageType:'3',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
airProductId:'',//机票产品id
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
......@@ -397,7 +396,6 @@ export default {
ageType:'4',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
airProductId:'',//机票产品id
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
......
src/components/global/newHead.vue
View file @ 5d4d44dc
......@@ -354,7 +354,7 @@
</div>
</li>
<li :class="{_active: navActive === 9}" class="juanmei">
<div @click="handleSelect('', ), navActive = 9">
<div @click="handleSelect('JuanSaid', ), navActive = 9">
<img src="../../assets/img/task/juanmei.png" alt />
</div>
</li>
......
src/components/taskPage/Fire.vue 0 → 100644
View file @ 5d4d44dc
<style scoped>
.div1{
width: 100%;
height: auto;
position: relative;
display: flex;
align-items: flex-end;
/* height: 2465px; */
justify-content: center;
}
.div1 img {
width: 100%;
position: absolute;
z-index:100;
/* display: none; */
}
.Homeimg{
position: fixed;
z-index: 20000;
width: 45px!important;
height: 45px!important;
left: 56px;
top: 39px;
cursor: pointer;
}
.bottom img{
width: 100%;
position: absolute;
z-index: 1;
}
.spDiv{
position:absolute;
background: url('../../assets/img/juan/sp.png') no-repeat;
background-size:100% 100%;
width: 720px;
height: 440px;
z-index: 1000;
text-align: center;
box-sizing: border-box;
position: relative;
top: -100px;
}
.tiaoDiv{
position:absolute;
background: url('../../assets/img/juan/tiao.png') no-repeat;
background-size:100% 100%;
width: 809px;
height: 248px;
z-index: 1000;
text-align: center;
box-sizing: border-box;
position: relative;
top: -260px;
}
</style>
<template>
<div style="position: relative;">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<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/h11.png" alt=""/>
<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" />
</video>
</div>
</div>
</div>
<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 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">
<p @click="goLocalDes(item.idDes, item)">{{item.title}}</p>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：{{item.startDate}}</el-col>
</el-row>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
ab:0,
ab2:0,
SaleList:[],
cityId:262,
companyId:0,
height1:"0px",
height2:"0px",
tiaoshui:[],
};
},
mounted() {
this.$nextTick(()=>{
// this.getFirstImg();
this.AutoExchange();
// this.getFirstImg2();
this.AutoExchange2();
})
},
created() {
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
let Height = window.innerHeight
let Width = window.innerWidth
let oHeight = window.outerHeight
let oWidth = window.outerWidth
this.height = Height
this.width = Width
this.oWidth = oWidth
this.oHeight = oHeight
this.Calculation = Width/Height - 1.77 > 0.02 ? true : false
// console.log(Height, Width, oHeight, oWidth,Width/Height, this.Calculation, Width/Height - 1.77)
if (oWidth < 1920) {
this.smallWindow = true
}
this.zoom = Math.round((Height/1080) * 100) / 100;
this.height1=(2465/1920)*oWidth+'px';
this.height2=(4427/1920)*oWidth+'px';
this.loadTiaoshui();
},
methods: {
goLocalDes(idDes,obj){
let path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
let routeData = this.$router.resolve({ path:path});
window.open(routeData.href, '_blank');
},
goUrl(path){
this.$router.push({ path,query:{}})
},
loadTiaoshui(){
let msg = {
pageIndex: 1,
pageSize: 4,
groupRecommendType: 1,
companyId:this.companyId,
cityId:this.cityId
}
this.apiJavaPost('/api/b2b/group/getHomeRecommendPrice',msg,res=>{
if(res.data.resultCode==1){
this.tiaoshui=res.data.data.pageData;
console.log("loadTiaoshui",this.tiaoshui)
}else{
this.Error(res.data.message);
}
},null)
},
//遍历所有图和按钮,页面加载完毕显示第一张图
getFirstImg(){
var div1 = this.$refs.div1;//整个区域
var imgLen = div1.getElementsByClassName("img");//图片
for (var i=0;i<imgLen.length;i++){
if (i!=0){
imgLen[i].style.opacity = 0;
}
}
},
getFirstImg2(){
let div2 = this.$refs.div2;//整个区域
var imgLen = div2.getElementsByClassName("img");//图片
for (var i=0;i<imgLen.length;i++){
if (i!=0){
imgLen[i].style.opacity = 0;
}
}
},
//自动切换
AutoExchange(){
var div1 = this.$refs.div1;//整个区域
var imgLen = div1.getElementsByClassName("img");//图片
var that = this;
setInterval(function ac() { //设置2000毫秒重复运行
that.ab2 = that.ab2>imgLen.length-2?0:++that.ab2; //5张图,当触摸到的按钮索引号大于3时(比如4),那么ab=0(下一张图为第0张),否则++ab;
//循环遍历下一张图的效果.
for (let b = 0; b < imgLen.length; b++) {
if (b == that.ab2) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
} else {
imgLen[b].style.opacity = 0;
}
}
},5000);
},
//自动切换
AutoExchange2(){
let div1 = this.$refs.div2;//整个区域
var imgLen = div1.getElementsByClassName("img");//图片
var that = this;
setInterval(function ac() { //设置2000毫秒重复运行
that.ab = that.ab>imgLen.length-2?0:++that.ab; //5张图,当触摸到的按钮索引号大于3时(比如4),那么ab=0(下一张图为第0张),否则++ab;
//循环遍历下一张图的效果.
for (var b = 0; b < imgLen.length; b++) {
if (b == that.ab) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
} else {
imgLen[b].style.opacity = 0;
}
}
},5000);
}
}
};
</script>
src/components/taskPage/FoodImg.vue 0 → 100644
View file @ 5d4d44dc
<style scoped>
.div1{
width: 100%;
height: auto;
position: relative;
}
.div1 img {
width: 100%;
position: absolute;
z-index:100;
}
.Homeimg{
position: absolute;
z-index: 20000;
width: 45px!important;
height: 45px!important;
left: 56px;
top: 39px;
cursor: pointer;
}
.bottom img{
width: 100%;
position: absolute;
z-index: 1
}
</style>
<template>
<div style="position: relative;">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div1" ref="div1">
<!-- -->
<img class="img" src="../../assets/img/juan/f1.png" alt=""/>
<img class="img" src="../../assets/img/juan/f2.png" alt=""/>
<div style="position: relative;z-index:-100;opacity:0">
<img style="position: relative;" src="../../assets/img/juan/f1.png" alt=""/>
</div>
</div>
<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-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis">
<p @click="goLocalDes(item.idDes, item)">{{item.title}}</p>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：{{item.startDate}}</el-col>
</el-row>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
ab:0,
SaleList:[],
cityId:262,
companyId:0,
};
},
mounted() {
this.$nextTick(()=>{
// this.getFirstImg();
this.AutoExchange();
})
},
created() {
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
this.Cztm();
},
components: {
},
methods: {
goLocalDes(idDes,obj){
let path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
let routeData = this.$router.resolve({ path:path});
window.open(routeData.href, '_blank');
},
goUrl(path){
this.$router.push({ path,query:{}})
},
Cztm(){
let Msg={
pageIndex:1,
pageSize:5,
companyId:this.companyId,
cityId:this.cityId,
};
this.apiJavaPost('/api/b2b/home/getHomeTravelSpecialSale',Msg,res=>{
if(res.data.resultCode==1){
this.SaleList=res.data.data.pageData;
}else{
this.Error(res.data.message);
}
},null)
},
//遍历所有图和按钮,页面加载完毕显示第一张图
getFirstImg(){
var div1 = this.$refs.div1;//整个区域
var imgLen = div1.getElementsByClassName("img");//图片
for (var i=0;i<imgLen.length;i++){
if (i!=0){
imgLen[i].style.opacity = 0;
}
}
},
//自动切换
AutoExchange(){
var div1 = this.$refs.div1;//整个区域
var imgLen = div1.getElementsByClassName("img");//图片
var that = this;
setInterval(function ac() { //设置2000毫秒重复运行
that.ab = that.ab>imgLen.length-2?0:++that.ab; //5张图,当触摸到的按钮索引号大于3时(比如4),那么ab=0(下一张图为第0张),否则++ab;
//循环遍历下一张图的效果.
for (var b = 0; b < imgLen.length; b++) {
if (b == that.ab) {
imgLen[b].style.opacity = 1;
imgLen[b].style.transition = "opacity 2s";
} else {
imgLen[b].style.opacity = 0;
}
}
},5000);
}
}
};
</script>
src/components/taskPage/JuanSaid.vue 0 → 100644
View file @ 5d4d44dc
<style scoped>
.juan .carousel img{
width: 100%;
height: 100%;
transition: all 0.6s;
}
.Homeimg{
position: absolute;
z-index: 20000;
width: 45px;
height: 45px;
left: 56px;
top: 39px;
cursor: pointer;
}
.carousel img:hover{
transform: scale(1.1);
}
</style>
<template>
<div class="juan">
<!-- 图片 -->
<div style="position:relative">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<el-carousel class="carousel" :height="height+'px'">
<el-carousel-item>
<img @click="goUrl('FoodImg')" src="../../assets/img/juan/bg1.jpg" alt="">
</el-carousel-item>
<el-carousel-item>
<img @click="goUrl('Fire')" src="../../assets/img/juan/bg2.jpg" alt="">
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
<script>
export default {
components: {
},
data(){
return{
zoom: 1,
Calculation: false,
height: 0,
width: 0,
userInfo: {},
}
},
methods:{
goUrl(path){
this.$router.push({ path,query:{}})
},
},mounted(){
},created(){
this.userInfo = JSON.parse(localStorage.userInfo)
//初始化任务
let Height = window.innerHeight
let Width = window.innerWidth
let oHeight = window.outerHeight
let oWidth = window.outerWidth
this.height = Height
this.width = Width
this.oWidth = oWidth
this.oHeight = oHeight
this.Calculation = Width/Height - 1.77 > 0.02 ? true : false
console.log(Height, Width, oHeight, oWidth,Width/Height, this.Calculation, Width/Height - 1.77)
if (oWidth < 1920) {
this.smallWindow = true
}
this.zoom = Math.round((Height/1080) * 100) / 100
}
}
</script>
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