Skip to content

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

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

parents b35a0cf3 20d3c16e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1396 additions and 135 deletions
src/assets/img/juan/img5.jpg 0 → 100644
View file @ 8936b4b9
This diff is collapsed.
src/assets/img/juan/img555.jpg 0 → 100644
View file @ 8936b4b9
This diff is collapsed.
src/assets/img/juan/img5_1.jpg 0 → 100644
View file @ 8936b4b9
This diff is collapsed.
src/assets/img/juan/img5_11111.jpg 0 → 100644
View file @ 8936b4b9
This diff is collapsed.
src/components/FreeTravel/FreeDetail.vue
View file @ 8936b4b9
This diff is collapsed.
src/components/mall/FreeCalendar.vue 0 → 100644
View file @ 8936b4b9
<style>
.LocalTourCalendar .calendar{
width: 100%;
overflow: hidden;
table-layout: fixed;
}
.LocalTourCalendar .calendar th{
height: 20px;
padding: 10px 0;
line-height: 20px;
color: #999999;
text-align: center;
font-size: 14px;
}
.LocalTourCalendar .dayList{
position: relative;
float: left;
width: 58px;
height: 44px;
cursor: pointer;
border: 1px solid transparent;
background-color: #F5F5F5;
font-size: 12px;
border-bottom:1px solid #E1E1E1;
border-right:1px solid #E1E1E1;
box-sizing: border-box;
}
.LocalTourCalendar .dayList:nth-child(7n){
border-right: none;
}
.LocalTourCalendar .dayList.noPrice{
cursor: default;
color: #ccc;
background-color: #FFFFFF;
}
.LocalTourCalendar .dayList.selectDay{
border: 1px solid #ff4646;
background-color: #f9f7f6;
}
.LocalTourCalendar .dayList.yesPrice{
font-weight: bold;
font-family: 'PingFangR';
}
.LocalTourCalendar .dayList p{
float: initial;
width: 100%;
text-align: left;
padding-left:5px;
margin: 2px 0;
box-sizing: border-box;
}
.LocalTourCalendar .dayList p.price{
float: initial;
width: 100%;
text-align: right;
padding:0;
margin: 2px 0;
color: #FF5A00;
font-size: 12px;
padding-right: 5px;
box-sizing: border-box;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.LocalTourCalendar .monthDayList{
/* overflow: auto; */
border-top:1px solid #E1E1E1;
}
.LocalTourCalendar .monthDayList:after {
clear: both;
content: '.';
display: block;
height: 0;
overflow: hidden;
}
.LocalTourCalendar .dayList.yesPrice:hover{
background: #FF680B;
color:#fff!important;
}
.LocalTourCalendar .dayList.yesPrice:hover .price{
color:#fff!important;
}
</style>
<template>
<div class="LocalTourCalendar" id='LocalTourCalendar'>
<table class="calendar" cellspacing=0 cellpadding=0>
<thead>
<th style="color:#666666;font-size:12px;" v-for="(i,index) in week" :key="index">{{i}}</th>
</thead>
</table>
<div class="monthDayList">
<div @click="selectDate(item)" v-for="(item,index) in daysData" class="dayList" :key="index" :class="{selectDay:isSelect == index,noPrice:item.pkg_no==''||!item.pkg_no,yesPrice:item.pkg_no!=''&&item.pkg_no}">
<p>{{item.day}}</p>
<!-- -->
<!-- <p class="price" v-if="item.price!='0.00' && item.price">￥{{item.price | priceFormat}}</p> -->
</div>
</div>
</div>
</template>
<script>
import moment from 'moment'
import bus from '../../plugins/event-bus'
export default {
props:{
dateData: Array,
day:String,
},
data(){
return{
today:moment().format("YYYY-MM-DD"),
week:['周日','周一','周二','周三','周四','周五','周六'],
// priceData:this.dateData[0],
priceData:[],
currentDay: this.day,
DaysInMonth:[],
daysData:[],
isSelect:-1,
mydate:-1,
}
},mounted(){
// this.getYearMonthDay();
},created(){
},methods:{
selectDate(item){
let a=false;
a=moment(this.today).isBefore(moment(item.date_str));
if(item.pkg_no &&item.pkg_no!="" && a){
this.$emit('SelectChild',item);
}
},
getYearMonthDay(list){
this.priceData=list[0];
let day=this.day;
let currentYear = day.substring(0,4); //当前年份
let currentMonth =day.substring(5,7); //当前月份
let date = new Date();
let strDate = date.getDate();
let strMonth = (date.getMonth()+1).toString();
// alert(typeof strMonth)
//判断是否是闰年
if (this.isleapYears(currentYear)) {
this.$data.DaysInMonth = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
}else{
this.$data.DaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
}
let monthDay = this.$data.DaysInMonth[Number(currentMonth)-1];//当前月的天数
let daysData = [];
//给数据源赋值
for (let i = 0 ;i < Number(monthDay) ;i++) {
var priceDict = {'day':String(i+1),'price':0,'dis':false,date_str:''};
daysData.push(priceDict);
}
this.daysData = daysData;
var currentDay = `${currentYear}-${currentMonth}-01`;
var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay();//得到每个月1号是周几
// for (let i in this.priceData) {
let today=moment().format("YYYY-MM-DD");
for (let i=0;i<this.priceData.length;i++) {
let price = this.priceData[i];
let dateStr=moment(price.dateStr).format("YYYY-MM-DD");
var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
var dayDict = daysData[Number(dayIndex)-1];
if (moment(dateStr).isBefore(today)){
dayDict.pkg_no='';
}else{
dayDict.pkg_no = price.pkg_no;
}
// dayDict.price = price.price;
dayDict.date_str=price.dateStr;
dayDict.sale_day=price.sale_day;
// dayDict.couponsId=price.couponsId;
// dayDict.priceId=price.priceId;
// dayDict.ticketId=price.ticketId;
if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price='';
}
}
if (firstDay > 0) {
var firstDayData = [];
for (var i=0; i< firstDay;i++) {
var dict = {'day':' ',price:'','dis':true};
firstDayData.push(dict);
}
this.daysData = firstDayData.concat(daysData);
}else{
this.daysData = daysData;
}
// console.log("this.daysData",this.daysData)
},
isleapYears(year){
if (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0)) {
return true;
} else{
return false;
}
},
}
}
</script>
src/components/taskPage/Img5.vue 0 → 100644
View file @ 8936b4b9
<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
}
a{
text-decoration: none;
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%;
}
.pcDiv .video1{
position:absolute;
top: 38%;
left: 32.5%;
width: 37.1%;
}
.pcDiv .video2{
position:absolute;
top: 58.7%;
left: 32.5%;
width: 37.1%;
}
.pcDiv .video3{
position:absolute;
top: 76%;
left: 26.3%;
width: 21%;
}
.phoneDiv .video1{
position: absolute;
top: 41.1%;
left: 10.7%;
width: 81%;
}
.phoneDiv .video2{
position:absolute;
top: 58.9%;
left: 10.7%;
width: 81%;
}
.phoneDiv .video3{
position:absolute;
top: 84.4%;
left: 10%;
width: 34%;
}
</style>
<template>
<div>
<div style="position: relative;" v-show="isPhone">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div3 div1 phoneDiv" ref="div3" >
<img class="img" src="../../assets/img/juan/img5_1.jpg" alt=""/>
<div class="video1">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/rqq.mp4" type="video/mp4">
<source src="../../assets/media/rqq.mp4" type="video/ogg">
<source src="../../assets/media/rqq.mp4" type="video/webm">
</video>
</div>
<div class="video2">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/hxs.mp4" type="video/mp4">
<source src="../../assets/media/hxs.mp4" type="video/ogg">
<source src="../../assets/media/hxs.mp4" type="video/webm">
</video>
</div>
<div class="video3" ref="video3">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/mhb.mp4" type="video/mp4">
<source src="../../assets/media/mhb.mp4" type="video/ogg">
<source src="../../assets/media/mhb.mp4" type="video/webm">
</video>
</div>
</div>
</div>
<div style="position: relative;" v-show="!isPhone">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div1 pcDiv" ref="div1">
<img class="img" src="../../assets/img/juan/img5.jpg" alt=""/>
<div class="video1">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/rqq.mp4" type="video/mp4">
<source src="../../assets/media/rqq.mp4" type="video/ogg">
<source src="../../assets/media/rqq.mp4" type="video/webm">
</video>
</div>
<div class="video2">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/hxs.mp4" type="video/mp4">
<source src="../../assets/media/hxs.mp4" type="video/ogg">
<source src="../../assets/media/hxs.mp4" type="video/webm">
</video>
</div>
<div class="video3" ref="video3">
<video style="width:100%;height:100%;border:none" loop="loop" controls="controls" autoplay="autoplay">
<source src="../../assets/media/mhb.mp4" type="video/mp4">
<source src="../../assets/media/mhb.mp4" type="video/ogg">
<source src="../../assets/media/mhb.mp4" type="video/webm">
</video>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
ab:0,
SaleList:[],
cityId:262,
companyId:0,
isPhone:false,
height2:"0px",
ab3:0
};
},
mounted() {
this.$nextTick(()=>{
// this.getFirstImg();
// this.AutoExchange();
let Width = window.outerWidth;
console.log("Width",Width);
console.log("111",this.$refs.video3.style.width);
let video3Width=this.$refs.video3.style.width
let width=Width
})
  var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
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() {
this.cityId=localStorage.cityId?localStorage.cityId:0;
this.companyId=localStorage.site?parseInt(localStorage.site):0;
let oWidth = window.screen.width;
},
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:{}})
},
}
};
</script>
src/components/taskPage/JuanDetails.vue
View file @ 8936b4b9
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
}, },
},mounted(){ },mounted(){
document.getElementsByClassName("DetailDiv")[0].onclick=function(){return false;}
},created(){ },created(){
......
src/components/taskPage/JuanList.vue
View file @ 8936b4b9
...@@ -188,7 +188,8 @@ ...@@ -188,7 +188,8 @@
} }
.juanList .serachDiv .searchInput{ .juanList .serachDiv .searchInput{
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border-radius:4px; border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
width:556px; width:556px;
height:48px; height:48px;
position: relative; position: relative;
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
box-shadow: 0 0 15px 0 #888; box-shadow: 0 0 15px 0 #888;
} }
.juanList .serachDiv .hotList .el-col{ .juanList .serachDiv .hotList .el-col{
border-right:1px solid #E9E9E9; border-right:1px dashed #E9E9E9;
padding-left: 15px; padding-left: 15px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -329,7 +330,7 @@ ...@@ -329,7 +330,7 @@
<p class="f30 pfR" style="text-align:center;color:#fff">全世界最棒的旅游体验</p> <p class="f30 pfR" style="text-align:center;color:#fff">全世界最棒的旅游体验</p>
<p style="text-align:center;color:#fff;margin-bottom:15px">探索有趣又独特目的地旅游体验</p> <p style="text-align:center;color:#fff;margin-bottom:15px">探索有趣又独特目的地旅游体验</p>
<div @click.stop.prevent="getRef($event,2)" class="searchInput"> <div @click.stop.prevent="getRef($event,2)" class="searchInput">
<el-input ref="inputs" @focus="InputFocus" @blur="InputBlur" @input="InputChange" v-model="text" placeholder="请输入"></el-input> <el-input ref="inputs" @focus="InputFocus" @input="InputChange" v-model="text" placeholder="请输入"></el-input>
<span @click="SearchText" class="searchBtn"><i class="iconfont icon-search"></i></span> <span @click="SearchText" class="searchBtn"><i class="iconfont icon-search"></i></span>
</div> </div>
<div @click.stop.prevent="getRef($event,2)" v-loading="serachLoading" v-if="searchShow" class="searchHot"> <div @click.stop.prevent="getRef($event,2)" v-loading="serachLoading" v-if="searchShow" class="searchHot">
...@@ -344,14 +345,21 @@ ...@@ -344,14 +345,21 @@
<el-col :span="8"> <el-col :span="8">
<li @click="SearchLi('京都')">京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('京都')">京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('奈良')">奈良<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('奈良')">奈良<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('曼谷')">曼谷</li>
<li @click="SearchLi('古巴')">古巴</li>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<li @click="SearchLi('北海道')">北海道<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('北海道')">北海道<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('东京都')">东京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('东京都')">东京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('巴黎')">巴黎</li>
<li @click="SearchLi('纽约')">纽约</li>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<li @click="SearchLi('札幌')">札幌<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('札幌')">札幌<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('神户')">神户<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li> <li @click="SearchLi('神户')">神户<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('伦敦')">伦敦</li>
</el-col> </el-col>
</el-row> </el-row>
...@@ -361,7 +369,7 @@ ...@@ -361,7 +369,7 @@
</div> </div>
<div class="w1200" style="margin-top:100px;padding-bottom:10px"> <div class="w1200" style="margin-top:100px;padding-bottom:10px">
<p v-show="TOPlist.length>0" 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 class="hotCity">
<div v-for="(item,index) in TOPlist" @click="Gourl(item)" :key="index" @mouseenter="mouseOver(index)" class="cityItem" :class="HoverIndex==index?'cityItemBig':''"> <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=""> <img :src="item.imgs" :onerror="defaultImg" alt="">
...@@ -545,8 +553,6 @@ export default { ...@@ -545,8 +553,6 @@ export default {
pageIndex:1, pageIndex:1,
}, },
dataloading:false, dataloading:false,
focusa:0,
focusb:0,
} }
}, },
methods:{ methods:{
...@@ -564,9 +570,6 @@ export default { ...@@ -564,9 +570,6 @@ export default {
}else{ }else{
this.searchHot=true; this.searchHot=true;
} }
},
InputBlur(){
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
// 翻页 // 翻页
......
src/components/taskPage/JuanSaid.vue
View file @ 8936b4b9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
transition: all 0.6s; transition: all 0.6s;
} }
.tst-one{ .tst-one{
background: url('../../assets/img/juan/bg3.jpg') 100% center; background: url('../../assets/img/juan/bg4_1.jpg') 100% center;
background-size: cover; background-size: cover;
} }
.tst-two{ .tst-two{
...@@ -17,12 +17,16 @@ ...@@ -17,12 +17,16 @@
background-size: cover; background-size: cover;
} }
.tst-four{ .tst-four{
background: url('../../assets/img/juan/tuan4.jpg') 100% center; background: url('../../assets/img/juan/bg3.jpg') 100% center;
background-size: cover;
}
.tst-five{
background: url('../../assets/img/juan/tuan5.jpg') 100% center;
background-size: cover; background-size: cover;
} }
.tstt{ .tstt{
background: url('../../assets/img/juan/bg3.jpg') 100% center; background: url('../../assets/img/juan/listbanner.png') 100% center;
background-size: cover; background-size: cover;
height: 350px; height: 350px;
cursor: pointer; cursor: pointer;
...@@ -163,13 +167,138 @@ ...@@ -163,13 +167,138 @@
width: 25%; width: 25%;
text-align: center; text-align: center;
} }
.juanHome .serachDiv{
width:560px;
margin:0 auto;
}
.juanHome .serachDiv .searchInput{
background:rgba(255,255,255,1);
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
width:556px;
height:48px;
position: relative;
}
.juanHome .serachDiv .searchInput input{
width: 486px;
height: 46px;
border: none;
outline: none;
border-radius:4px;
padding-left: 15px;
box-sizing: border-box;
}
.juanHome .serachDiv .searchInput .searchBtn{
width: 70px;
height:48px;
display: inline-block;
background: #EE4454;
position: absolute;
top: 0;
text-align: center;
line-height: 48px;
cursor: pointer;
}
.juanHome .serachDiv .searchInput .searchBtn i{
color:#fff;
font-size:18px;
}
.juanHome .serachDiv .searchHot{
background:rgba(255,255,255,1);
border-radius:4px;
width:556px;
margin-top:6px;
padding:20px;
box-sizing: border-box;
box-shadow: 0 0 15px 0 #888;
}
.juanHome .serachDiv .hotList .el-col{
border-right:1px dashed #E9E9E9;
padding-left: 15px;
box-sizing: border-box;
}
.juanHome .serachDiv .hotList .el-col:last-child{
border: none;
}
.juanHome .serachDiv .hotList .el-col li{
padding-bottom: 10px;
cursor: pointer;
}
.juanHome .serachDiv .hotList .el-col li img{
margin-left: 8px;
}
.juanHome .serachDiv .hotList .el-col li:last-child{
padding: 0;
}
.juanHome .serachDiv .ScrollHot{
max-height: 300px;
overflow-y: scroll;
}
.juanHome .searchUl li{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
font-size: 14px;
margin:6px 0;
}
.juanHome .searchUl li:hover{
text-decoration: underline;
color:#EE4454;
cursor: pointer;
}
.juanHome .serachDiv .ScrollHot::-webkit-scrollbar{width: 4px;height: 8px;}
.juanHome .serachDiv .ScrollHot::-webkit-scrollbar-thumb{border-radius: 4px;box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
.juanHome .serachDiv .ScrollHot::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
</style> </style>
<template> <template>
<div class="juan commonF"> <div @click="getRef($event,1)" class="juan juanHome commonF">
<!-- 图片 --> <!-- 图片 -->
<div style="position:relative"> <div style="position:relative">
<!-- <img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt /> --> <div class="tstt"></div>
<div class="tstt" @click="goUrl('FoodImg2')"></div> <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>
<div @click.stop.prevent="getRef($event,2)" class="searchInput">
<el-input ref="inputs" @focus="InputFocus" @input="InputChange" v-model="text" placeholder="请输入"></el-input>
<span @click="SearchText" class="searchBtn"><i class="iconfont icon-search"></i></span>
</div>
<div @click.stop.prevent="getRef($event,2)" v-loading="serachLoading" v-if="searchShow" class="ScrollHot searchHot">
<ul class="searchUl">
<li @click="Gourl(item)" v-for="(item,index) in searchList" :key="index+5000000">{{item.title}}</li>
<li v-show="searchList.length==0" style="margin:6px 0;text-align:center">暂无数据</li>
</ul>
</div>
<div @click.stop.prevent="getRef($event,2)" v-show="searchHot" class="searchHot">
<p class="pfR">热门目的地</p>
<el-row class="hotList" style="margin-top:15px">
<el-col :span="8">
<li @click="SearchLi('京都')">京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('奈良')">奈良<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('曼谷')">曼谷</li>
<li @click="SearchLi('古巴')">古巴</li>
</el-col>
<el-col :span="8">
<li @click="SearchLi('北海道')">北海道<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('东京都')">东京都<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('巴黎')">巴黎</li>
<li @click="SearchLi('纽约')">纽约</li>
</el-col>
<el-col :span="8">
<li @click="SearchLi('札幌')">札幌<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('神户')">神户<img style="width:11px;height:14px" src="../../assets/img/visa/hot.png" alt=""></li>
<li @click="SearchLi('伦敦')">伦敦</li>
</el-col>
</el-row>
</div>
</div>
</div>
<!-- <el-carousel class="carousel" style="height:600px"> <!-- <el-carousel class="carousel" style="height:600px">
<el-carousel-item> <el-carousel-item>
<img @click="goUrl('FoodImg')" src="../../assets/img/juan/bg1.jpg" alt=""> <img @click="goUrl('FoodImg')" src="../../assets/img/juan/bg1.jpg" alt="">
...@@ -223,13 +352,15 @@ ...@@ -223,13 +352,15 @@
<p class="f30" style="text-align:center;margin-top:100px">本季<span style="color:#EE4454">. 精选特惠</span></p> <p class="f30" style="text-align:center;margin-top:100px">本季<span style="color:#EE4454">. 精选特惠</span></p>
<p class="f20" style="color:#999999;text-align:center">Selected Recommendation</p> <p class="f20" style="color:#999999;text-align:center">Selected Recommendation</p>
<div class="jxth destiDiv basefix"> <div class="jxth destiDiv basefix">
<div @click="goUrl('FoodImg2')" class="destiItem tst-one"> <div @click="goUrl('FoodImg4')" class="destiItem tst-one">
</div> </div>
<div @click="goUrl('Fire')" class="destiItem tst-two"> <div @click="goUrl('Fire')" class="destiItem tst-two">
</div> </div>
<div @click="goUrl('FoodImg')" class="destiItem tst-three"> <div @click="goUrl('FoodImg')" class="destiItem tst-three">
</div> </div>
<div @click="goUrl('FoodImg4')" class="destiItem tst-four"> <div @click="goUrl('FoodImg2')" class="destiItem tst-four">
</div>
<div @click="goUrl('Img5')" class="destiItem tst-five">
</div> </div>
<!-- <div class="destiItem"> <!-- <div class="destiItem">
<img src="../../assets/img/home/tour1.png" alt=""> <img src="../../assets/img/home/tour1.png" alt="">
...@@ -334,9 +465,76 @@ export default { ...@@ -334,9 +465,76 @@ export default {
height: 0, height: 0,
width: 0, width: 0,
userInfo: {}, userInfo: {},
searchShow:false,
serachLoading:false,
searchHot:false,
text:'',
searchList:[],
SearchMsg:{
pageSize:18,
pageIndex:1,
},
} }
}, },
methods:{ methods:{
Gourl(item){
let path="JuanDetails";
this.$router.push({ path,query:{id:item.id}})
},
getRef(e,num){
if(num==1){
this.searchShow=false;
this.searchHot=false;
}
},
InputFocus(){
if(this.text!=""){
this.searchShow=true;
this.InputChange();
}else{
this.searchHot=true;
}
},
InputChange(){
this.searchHot=false;
if(this.text==""){
this.searchHot=true;
this.searchShow=false;
this.serachLoading=false;
return;
}
this.searchShow=true;
this.serachLoading=true;
this.SearchMsg.texts=this.text;
this.SearchMsg.pageSize=1000;
this.apiJavaPost('/api/rssarticle/searchArticle',this.SearchMsg,res=>{
console.log("res",res);
this.serachLoading=false;
if(res.data.resultCode==1){
let data=res.data.data.list;
this.searchList=data;
}else{
this.Error(res.data.message);
}
},null)
},
SearchText(){
this.searchHot=false;
this.searchShow=false;
let that=this;
if(this.text==""){
this.Error("请输入搜索词！")
return;
}
this.goDestion(this.text);
},
SearchLi(str){
this.text=str;
this.SearchText();
this.searchHot=false;
},
goDestion(str){ goDestion(str){
let path="JuanList"; let path="JuanList";
this.$router.push({ path,query:{search:str}}) this.$router.push({ path,query:{search:str}})
......
src/router.js
View file @ 8936b4b9
...@@ -10,6 +10,7 @@ import FoodImg2 from "./components/taskPage/FoodImg2"; ...@@ -10,6 +10,7 @@ import FoodImg2 from "./components/taskPage/FoodImg2";
import FoodImg4 from "./components/taskPage/FoodImg4"; import FoodImg4 from "./components/taskPage/FoodImg4";
import xiazaiAPP from "./components/taskPage/xiazaiAPP"; import xiazaiAPP from "./components/taskPage/xiazaiAPP";
import Fire from "./components/taskPage/Fire"; import Fire from "./components/taskPage/Fire";
import Img5 from "./components/taskPage/Img5";
Vue.use(Router); Vue.use(Router);
...@@ -764,6 +765,15 @@ export default new Router({ ...@@ -764,6 +765,15 @@ export default new Router({
headerShow: true, headerShow: true,
}, },
}, },
{
path: "/Img5",
name: "Img5",
component: Img5,
meta: {
title: "卷妹说",
headerShow: true,
},
},
] ]
}); });
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