Skip to content

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

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

parents 6c302dd8 79076755
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 82 deletions
src/App.vue
View file @ 7eaedfcf
......@@ -132,6 +132,7 @@ body,html{
bottom: 150px;
width: 40px;
height: 90px;
z-index: 2000;
}
.page-component-up img{
width: 38px;
......
src/components/taskPage/FoodImg.vue
View file @ 7eaedfcf
......@@ -99,7 +99,7 @@ height: 100%;
</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">
<div style="text-align:center;width:100%;margin=-top:30px">
<img style="width:150px;height:150px;position:relative;" src="../../assets/img/juan/twoCode.png" alt=""/>
</div>
</div>
......@@ -181,15 +181,27 @@ export default {
// this.getFirstImg();
this.AutoExchange();
})
  var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
  if (ua.match(/MicroMessenger/i) == "micromessenger") {
    //在微信中打开
this.isPhone=true;
this.AutoExchange3();
  } else {
  //否则就是PC浏览器打开
this.isPhone=false;
}
//   var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
//   if (ua.match(/MicroMessenger/i) == "micromessenger") {
//     //在微信中打开
// this.isPhone=true;
// this.AutoExchange3();
//   } else {
//   //否则就是PC浏览器打开
// this.isPhone=false;
// }
let userAgentInfo = navigator.userAgent;
let Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone",
"iPad", "iPod"];
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
this.isPhone = true;
// this.AutoExchange3();
break;
}
}
},
created() {
......
src/components/taskPage/FoodImg2.vue
View file @ 7eaedfcf
......@@ -64,7 +64,7 @@ height: 100%;
<template>
<div>
<div v-show="isPhone" class="isPhone">
<div v-show="isPhone" class="isPhone">
<!-- <img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt /> -->
<div class="div3 div1" ref="div3">
<img style="height:initial !important" class="img" src="../../assets/img/juan/fengye11.jpg" alt=""/>
......@@ -72,7 +72,7 @@ height: 100%;
<div class="bottom">
<img src="../../assets/img/juan/fengyedibu11.jpg" 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-row style="padding:50px 0 5px 0;cursor:pointer;" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" style="font-size:12px;">本州 147升级版 </a>
</el-col>
......@@ -160,15 +160,27 @@ export default {
// this.getFirstImg();
this.AutoExchange();
})
  var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
  if (ua.match(/MicroMessenger/i) == "micromessenger") {
    //在微信中打开
this.isPhone=true;
this.AutoExchange3();
  } else {
  //否则就是PC浏览器打开
this.isPhone=false;
}
//   var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
//   if (ua.match(/MicroMessenger/i) == "micromessenger") {
//     //在微信中打开
// this.isPhone=true;
// this.AutoExchange3();
//   } else {
//   //否则就是PC浏览器打开
// this.isPhone=false;
// }
let userAgentInfo = navigator.userAgent;
let Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone",
"iPad", "iPod"];
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
this.isPhone = true;
// this.AutoExchange3();
break;
}
}
},
created() {
......
src/components/taskPage/JuanList.vue
View file @ 7eaedfcf
......@@ -79,7 +79,7 @@
margin-left: 0;
}
.juanList .hotCity .cityItem img{
width: 100%;
/* width: 100%; */
height: 100%;
}
......@@ -102,7 +102,7 @@
top:0;
}
.juanList .hotCity .cityItem .CityHover p:first-child{
margin-top:166px;
margin-top:190px;
}
.juanList .MoreDiv{
margin-left: -15px;
......@@ -313,13 +313,18 @@
.juanList ._pagination .el-pager li.active{
color: #f56c6c;
}
.hotCity .el-tag{
color:#fff;
background: rgba(255,255,255,0.2);
/* margin-bottom:10px; */
}
</style>
<template>
<div @click="getRef($event,1)" :data-self="0" class="juan juanList commonF">
<!-- 图片 -->
<div style="position:relative">
<img style="width:100%" src="../../assets/img/juan/listbanner.png" alt="">
<div style="position: absolute;top:100px;width:100%;">
<div style="position: absolute;top:100px;width:100%;z-index:1000">
<div class="serachDiv">
<p class="f30 pfR" style="text-align:center;color:#fff">全世界最棒的旅游体验</p>
<p style="text-align:center;color:#fff;margin-bottom:15px">探索有趣又独特目的地旅游体验</p>
......@@ -356,64 +361,20 @@
</div>
<div class="w1200" style="margin-top:100px;padding-bottom:10px">
<!-- <p class="f30 pfR" style="">探索<span style="color:#EE4454">. 热门城市</span></p>
<p v-show="TOPlist.length>0" class="f30 pfR" style="">探索<span style="color:#EE4454">. 热门城市</span></p>
<div class="hotCity">
<div @mouseenter="mouseOver(0)" class="cityItem" :class="HoverIndex==0?'cityItemBig':''">
<img src="../../assets/img/juan/dongjin.png" alt="">
<p v-show="HoverIndex!=0" class="name">东京</p>
<div v-show="HoverIndex==0" class="CityHover">
<p class="f26 pfR">日本</p>
<p class="f12 text3">作为日本第二大都市，大阪向世界各地的旅客保证，处处都是美
食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游
馆、高耸入云的梅田蓝天大厦都是必去景点。
</p>
</div>
</div>
<div @mouseenter="mouseOver(1)" class="cityItem" :class="HoverIndex==1?'cityItemBig':''">
<img src="../../assets/img/juan/mgw.png" alt="">
<p v-show="HoverIndex!=1" class="name">东京</p>
<div v-show="HoverIndex==1" class="CityHover">
<p class="f26 pfR">日本</p>
<p class="f12 text3">作为日本第二大都市，大阪向世界各地的旅客保证，处处都是美
食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游
馆、高耸入云的梅田蓝天大厦都是必去景点。
</p>
<div v-for="(item,index) in TOPlist" @click="Gourl(item)" :key="index" @mouseenter="mouseOver(index)" class="cityItem" :class="HoverIndex==index?'cityItemBig':''">
<img :src="item.imgs" :onerror="defaultImg" alt="">
<p v-show="HoverIndex!=index" class="name text1">{{item.title}}</p>
<div v-show="HoverIndex==index" class="CityHover">
<p class="f26 pfR text1">{{item.title}}</p>
<p class="f12 text1" style="margin-top:8px">
<el-tag size="mini" style="margin-left:12px;" v-for="(lab,ind) in item.labelList" :key="ind">{{lab}}</el-tag>
</p>
</div>
</div>
<div @mouseenter="mouseOver(2)" class="cityItem" :class="HoverIndex==2?'cityItemBig':''">
<img src="../../assets/img/juan/db.png" alt="">
<p v-show="HoverIndex!=2" class="name">东京</p>
<div v-show="HoverIndex==2" class="CityHover">
<p class="f26 pfR">日本</p>
<p class="f12 text3">作为日本第二大都市，大阪向世界各地的旅客保证，处处都是美
食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游
馆、高耸入云的梅田蓝天大厦都是必去景点。
</p>
</div>
</div>
<div @mouseenter="mouseOver(3)" class="cityItem" :class="HoverIndex==3?'cityItemBig':''">
<img src="../../assets/img/juan/sh.png" alt="">
<p v-show="HoverIndex!=3" class="name">东京</p>
<div v-show="HoverIndex==3" class="CityHover">
<p class="f26 pfR">日本</p>
<p class="f12 text3">作为日本第二大都市，大阪向世界各地的旅客保证，处处都是美
食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游
馆、高耸入云的梅田蓝天大厦都是必去景点。
</p>
</div>
</div>
<div @mouseenter="mouseOver(4)" class="cityItem" :class="HoverIndex==4?'cityItemBig':''">
<img src="../../assets/img/juan/hb.png" alt="">
<p v-show="HoverIndex!=4" class="name">东京</p>
<div v-show="HoverIndex==4" class="CityHover">
<p class="f26 pfR">日本</p>
<p class="f12 text3">作为日本第二大都市，大阪向世界各地的旅客保证，处处都是美
食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游食、美景和惊喜！历史重地大阪城、世界最大水族馆─大阪海游
馆、高耸入云的梅田蓝天大厦都是必去景点。
</p>
</div>
</div>
</div> -->
</div>
<p style="margin-top:70px" class="f30 pfR">更多<span style="color:#EE4454">. 精彩推荐</span></p>
<div v-loading="dataloading" v-show='dataList.length!=0' id="MoreDiv" ref="MoreDiv" class="MoreDiv">
<div @click="Gourl(item)" v-for="(item,index) in dataList" :key="index" class="moreItem">
......@@ -553,6 +514,7 @@ export default {
// },
data(){
return{
TOPlist:[],
defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
currentPage:1,
zoom: 1,
......@@ -669,8 +631,14 @@ export default {
this.dataloading=false;
if(res.data.resultCode==1){
let data=res.data.data.list;
this.dataList=data;
let data=res.data.data;
this.dataList=data.list;
this.TOPlist=data.TOPlist;
this.TOPlist.forEach(item=>{
if(item.label){
item.labelList=item.label.split(',')
}
})
this.totalCount=res.data.data.count;
}else{
this.Error(res.data.message);
......@@ -683,7 +651,13 @@ export default {
this.dataloading=false;
if(res.data.resultCode==1){
let data=res.data.data.pageData;
this.dataList=data;
this.dataList=data.list;
this.TOPlist=data.TOPlist;
this.TOPlist.forEach(item=>{
if(item.label){
item.labelList=item.label.split(',')
}
})
this.pageCount=res.data.data.pageCount;
this.totalCount=res.data.data.count;
}else{
......
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