Commit 486c33b1 authored by 华国豪's avatar 华国豪 🙄

合并代码

parents dba80291 c25c427b
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
created(){ created(){
if(this.$route.query.productId){ if(this.$route.query.productId){
this.productId=this.$route.query.productId; this.productId=decodeURIComponent(this.$route.query.productId);
} }
if(sessionStorage.guestinfo){ if(sessionStorage.guestinfo){
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<div class="Qzlist"> <div class="Qzlist">
<div v-for="item in timeList" :key="item.id"> <div @click="goUrl(item.idDes)" v-for="item in timeList" :key="item.id">
<div> <div>
<img :src="item.countryIcon" alt=""> <img :src="item.countryIcon" alt="">
</div> </div>
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
</el-row> </el-row>
<p style="text-align:center;font-family:PingFang;font-size:14px;">Popular countries</p> <p style="text-align:center;font-family:PingFang;font-size:14px;">Popular countries</p>
<div class="row_flex" type="flex" justify="space-between"> <div class="row_flex" type="flex">
<div @click="goUrlVisaList(item.countryId)" v-for="item in hotcountry" :key="item.id"> <div @click="goUrlVisaList(item.id)" v-for="item in hotcountry" :key="item.id">
<img :src="item.countryImage[0]" alt=""> <img :src="item.countryImage[0]" alt="">
<div class="country_side"> <div class="country_side">
<p class="country_img"><img :src="item.countryIcon" alt=""></p> <p class="country_img"><img :src="item.countryIcon" alt=""></p>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="popular_coun_hover"> <div class="popular_coun_hover">
<p class="country_img"><img :src="item.countryIcon" alt=""></p> <p class="country_img"><img :src="item.countryIcon" alt=""></p>
<p style="font-size:20px">{{item.countryName}}</p> <p style="font-size:18px">{{item.countryName}}</p>
<div class="coun_hover_visa"> <div class="coun_hover_visa">
<div> <div>
<img src="../../assets/img/visa/gq.png" alt=""> <img src="../../assets/img/visa/gq.png" alt="">
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<p style="text-align:center;font-family:PingFang;font-size:14px;">Popular Visa</p> <p style="text-align:center;font-family:PingFang;font-size:14px;">Popular Visa</p>
<div class="visa_flex" type="flex" justify="space-between"> <div class="visa_flex" type="flex" justify="space-between">
<div class="el-col" v-for="item in hotvisa" :key="item.id"> <div @click="goUrl(item.idDes)" class="el-col" v-for="item in hotvisa" :key="item.id">
<img :src="item.countryIcon" alt=""> <img :src="item.countryIcon" alt="">
<div class="visa_content"> <div class="visa_content">
<p class="visa_title">{{item.name}}</p> <p class="visa_title">{{item.name}}</p>
...@@ -278,7 +278,22 @@ export default { ...@@ -278,7 +278,22 @@ export default {
this.Gethotvisa(); this.Gethotvisa();
}, },
methods: { methods: {
goUrl(idDes){
let isLogin = this.$store.state.isLogin;
if (isLogin == 0) {
this.Error("请先登录!");
this.$router.push({
path: "/login?type=1",
query: { path: this.$route.name }
});
}else{
this.$router.push({path: `/Visaitemsdetails?productId=${encodeURIComponent(idDes)}`});
}
},
goUrlVisaList(id){ goUrlVisaList(id){
console.log(id);
this.$router.push({path: `/Visalist?id=${id}`}); this.$router.push({path: `/Visalist?id=${id}`});
}, },
Gethotvisa(){ Gethotvisa(){
...@@ -327,12 +342,6 @@ export default { ...@@ -327,12 +342,6 @@ export default {
null null
); );
}, },
leave(){
this.CountryHover=false;
},
enter(){
this.CountryHover=true;
},
goSearch(){ goSearch(){
if(this.searchText!=''){ if(this.searchText!=''){
let query={keywords:encodeURIComponent(this.searchText)} let query={keywords:encodeURIComponent(this.searchText)}
...@@ -443,7 +452,7 @@ export default { ...@@ -443,7 +452,7 @@ export default {
} }
.visa_flex { .visa_flex {
display: flex; display: flex;
justify-content: space-around; justify-content:flex-start;
flex-wrap: wrap; flex-wrap: wrap;
} }
.visa_flex .el-col:hover{ .visa_flex .el-col:hover{
...@@ -492,7 +501,7 @@ export default { ...@@ -492,7 +501,7 @@ export default {
.row_flex{ .row_flex{
width: 100%; width: 100%;
padding-top:20px; padding-top:20px;
justify-content: space-around; justify-content: flex-start;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
...@@ -508,15 +517,16 @@ export default { ...@@ -508,15 +517,16 @@ export default {
padding: 20px 0 0 30px; padding: 20px 0 0 30px;
box-sizing: border-box; box-sizing: border-box;
/* display: none; */ /* display: none; */
transition: all 0.5s; transition: all linear 0.5s;
opacity: 0; opacity: 0;
} }
.row_flex>div{ .row_flex>div{
position: relative; position: relative;
width:18%; width:18%;
margin-left: 1.5%;
cursor: pointer; cursor: pointer;
transition: all .5s linear; transition: all linear .5s;
} }
.row_flex>div img{ .row_flex>div img{
width: 100%; width: 100%;
...@@ -525,11 +535,11 @@ export default { ...@@ -525,11 +535,11 @@ export default {
.row_flex>div:hover .popular_coun_hover{ .row_flex>div:hover .popular_coun_hover{
/* display: block; */ /* display: block; */
opacity: 1; opacity: 1;
transition: all 0.5s linear; transition: all linear 0.5s ;
} }
.row_flex>div:hover .country_side{ .row_flex>div:hover .country_side{
opacity: 0; opacity: 0;
transition: all 0.3s linear; transition: all linear 0.3s;
} }
.gq{ .gq{
background: #6EA3F1; background: #6EA3F1;
...@@ -565,14 +575,16 @@ export default { ...@@ -565,14 +575,16 @@ export default {
} }
.visahome .Qzlist{ .visahome .Qzlist{
display: flex; display: flex;
justify-content: space-around; justify-content:flex-start;
font-family: "PingFang"; font-family: "PingFang";
flex-wrap: wrap; flex-wrap: wrap;
} }
.visahome .Qzlist>div{ .visahome .Qzlist>div{
display: inline-flex; display: inline-flex;
width: 299px; width: 25%;
height: 190px; height: 190px;
padding:0 15px;
box-sizing: border-box;
align-items: center; align-items: center;
transition: all 0.5s; transition: all 0.5s;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<p style="font-size:12px;margin:20px 0"> <p style="font-size:12px;margin:20px 0">
<span style="color:#EE4454">签证办理<i class="iconfont icon-gengduo1"></i></span> <span style="color:#EE4454">签证办理<i class="iconfont icon-gengduo1"></i></span>
<span style="color:#EE4454">{{visadeatils.name}}<i class="iconfont icon-gengduo1"></i></span> <span style="color:#EE4454">{{visadeatils.name}}<i class="iconfont icon-gengduo1"></i></span>
旅游签证【{{visadeatils.sendCityName}}送签】·拒签全退+可停留{{visadeatils.stayDays}} 旅游签证【{{visadeatils.sendCityName}}送签】·拒签全退+可停留{{visadeatils.stayDays}}
</p> </p>
</div> </div>
<el-row class="details"> <el-row class="details">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
&nbsp; &nbsp;
</el-col> </el-col>
<el-col style="font-size:12px" :span="17"> <el-col style="font-size:12px" :span="17">
<p style="font-weight:400;font-size:18px;margin:0"> 旅游签证【{{visadeatils.sendCityName}}送签】·拒签全退+可停留{{visadeatils.stayDays}}</p> <p style="font-weight:400;font-size:18px;margin:0"> {{visadeatils.name}}旅游签证【{{visadeatils.sendCityName}}送签】·拒签全退+可停留{{visadeatils.stayDays}}</p>
<!-- <p><span class="visa_type">个签</span></p> --> <!-- <p><span class="visa_type">个签</span></p> -->
<p class="visa_des"> <p class="visa_des">
<span>签证类型:</span> <span>签证类型:</span>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</span> </span>
</p> </p>
<p class="visa_des"> <p class="visa_des">
<span>可停留天数:</span><span>{{visadeatils.stayDays}}</span> <span>可停留天数:</span><span>{{visadeatils.stayDays}}</span>
</p> </p>
<p class="visa_des"> <p class="visa_des">
<span>签证有效期:</span><span>{{visadeatils.visaValidity}}</span> <span>签证有效期:</span><span>{{visadeatils.visaValidity}}</span>
...@@ -289,7 +289,7 @@ export default { ...@@ -289,7 +289,7 @@ export default {
}, },
created(){ created(){
if(this.$route.query.productId){ if(this.$route.query.productId){
this.productId=this.$route.query.productId; this.productId=decodeURIComponent(this.$route.query.productId);
this.GetDetails(); this.GetDetails();
} }
}, },
...@@ -303,6 +303,7 @@ export default { ...@@ -303,6 +303,7 @@ export default {
"b2b_get_GetVisaProductInfo", "b2b_get_GetVisaProductInfo",
{ productId: this.productId }, { productId: this.productId },
res => { res => {
// console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.visadeatils=res.data.data; this.visadeatils=res.data.data;
this.ProductInfo=res.data.data.visaProductInfo; this.ProductInfo=res.data.data.visaProductInfo;
...@@ -325,7 +326,7 @@ export default { ...@@ -325,7 +326,7 @@ export default {
return; return;
} }
sessionStorage.guestinfo=JSON.stringify(this.peopleform) sessionStorage.guestinfo=JSON.stringify(this.peopleform)
this.$router.push({path: `/SchedProduct?productId=${this.productId}`}); this.$router.push({path: `/SchedProduct?productId=${encodeURIComponent(this.productId)}`});
}, },
...@@ -357,7 +358,7 @@ export default { ...@@ -357,7 +358,7 @@ export default {
<style> <style>
@import "../../assets/css/reset.css"; @import "../../assets/css/reset.css";
.Visaitemsdetails .common_div .common_margin{ .Visaitemsdetails .common_div .common_margin{
padding:10px; padding:20px 10px;
box-sizing: border-box; box-sizing: border-box;
} }
.Visaitemsdetails .common_div{ .Visaitemsdetails .common_div{
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
<el-row :gutter="24" style="box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);"> <el-row :gutter="24" style="box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);">
<div class="common_width"> <div class="common_width">
<ul class="top_ul"> <ul class="top_ul">
<li @click="SelectCountry(item.countryId)" :class="listmsg.visaCountryId==item.countryId?'visa_active':''" v-for="item in hotcountry" :key="item.countryId"> <button @click="ArrowLeft" v-show="msg.pageIndex>1" type="button" class="el-carousel__arrow el-carousel__arrow--left"><i class="el-icon-arrow-left"></i></button>
<button @click="ArrowRight" v-show="msg.pageIndex!=pageCount" type="button" class="el-carousel__arrow el-carousel__arrow--right"><i class="el-icon-arrow-right"></i></button>
<!-- <span class="iconfont icon-xiangzuo"></span>
<span class="iconfont icon-arrowright1"></span> -->
<li @click="SelectCountry(item.id)" :class="listmsg.visaCountryId==item.id?'visa_active':''" v-for="item in hotcountry" :key="item.countryId">
<img :src="item.countryIcon" alt="" :onerror="errorImg"> <img :src="item.countryIcon" alt="" :onerror="errorImg">
<p>{{item.countryName}}</p> <p>{{item.countryName}}</p>
</li> </li>
...@@ -22,7 +26,7 @@ ...@@ -22,7 +26,7 @@
<div class="select_title" style="top:15px">常住地</div> <div class="select_title" style="top:15px">常住地</div>
<ul class="select_ul" :class="selectcon?'':'select_ul_height'"> <ul class="select_ul" :class="selectcon?'':'select_ul_height'">
<!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li> --> <!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li> -->
<li @click="SelectCity(item.cityId)" :class="listmsg.companyId==item.cityId?'visa_active':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li> <li @click="SelectCity(item.companyId)" :class="listmsg.companyId==item.companyId?'visa_active':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li>
</ul> </ul>
<span class="czd" @click="ChangeSelect">{{selectcontext}}<i :class="selectcon?'rolate':''" class="iconfont icon-moban"></i></span> <span class="czd" @click="ChangeSelect">{{selectcontext}}<i :class="selectcon?'rolate':''" class="iconfont icon-moban"></i></span>
...@@ -93,7 +97,7 @@ ...@@ -93,7 +97,7 @@
<div class="content_list" v-if="datalist.length>0"> <div class="content_list" v-if="datalist.length>0">
<el-row class="row_content" v-for="item in datalist" :key="item.id"> <el-row class="row_content" v-for="item in datalist" :key="item.id">
<el-col :span="3"> <el-col :span="3">
<img :src="item.coverImage[0].url" alt=""> <img :src="item.coverImage[0].url" alt="" :onerror="errorImg">
</el-col> </el-col>
<el-col class="div_2" :span="14" style="font-size:12px"> <el-col class="div_2" :span="14" style="font-size:12px">
<p @click="GourlItem(item)" class="visa_title" style="font-size:16px;color:#000000">{{item.name}}</p> <p @click="GourlItem(item)" class="visa_title" style="font-size:16px;color:#000000">{{item.name}}</p>
...@@ -136,7 +140,7 @@ export default { ...@@ -136,7 +140,7 @@ export default {
msg:{ msg:{
companyId:0, companyId:0,
pageIndex:1, pageIndex:1,
pageSize:15, pageSize:12,
}, },
hotcountry:[], hotcountry:[],
cityList:[], cityList:[],
...@@ -156,6 +160,8 @@ export default { ...@@ -156,6 +160,8 @@ export default {
}, },
total:0, total:0,
datalist:[], datalist:[],
pageCount:0,
} }
...@@ -175,9 +181,28 @@ export default { ...@@ -175,9 +181,28 @@ export default {
}, },
methods: { methods: {
ArrowLeft(){
if(this.msg.pageIndex<=1){
this.Error("当前为第一页")
}else{
this.msg.pageIndex--;
this.GetVisaCountry()
}
},
ArrowRight(){
if(this.msg.pageIndex==this.pageCount){
this.Error("当前为最后一页")
}else{
this.msg.pageIndex++;
this.GetVisaCountry()
}
},
SelectCountry(id){ SelectCountry(id){
this.listmsg.visaCountryId=id; this.listmsg.visaCountryId=id;
this.GetVisaProListChoose(); this.GetVisaProListChoose();
this.GetList();
}, },
CurrentChange(val){ CurrentChange(val){
this.listmsg.pageIndex=val; this.listmsg.pageIndex=val;
...@@ -192,7 +217,6 @@ export default { ...@@ -192,7 +217,6 @@ export default {
this.listmsg, this.listmsg,
res => { res => {
this.loading=false; this.loading=false;
// console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.datalist=res.data.data.pageData; this.datalist=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
...@@ -215,8 +239,9 @@ export default { ...@@ -215,8 +239,9 @@ export default {
this.listmsg.orderByBookAdvance=num; this.listmsg.orderByBookAdvance=num;
this.GetList(); this.GetList();
}, },
SelectCity(cityId){ SelectCity(companyId){
this.listmsg.companyId=cityId; this.listmsg.companyId=companyId;
this.GetList();
}, },
// 获取签证产品国家筛选子项 // 获取签证产品国家筛选子项
GetVisaProListChoose(){ GetVisaProListChoose(){
...@@ -227,7 +252,7 @@ export default { ...@@ -227,7 +252,7 @@ export default {
"/api/b2b/visa/getProductCountryChildSearchItem", "/api/b2b/visa/getProductCountryChildSearchItem",
msg, msg,
res => { res => {
// console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.cityList=res.data.data.cityList; this.cityList=res.data.data.cityList;
this.tagItem=res.data.data.tagItem; this.tagItem=res.data.data.tagItem;
...@@ -241,13 +266,14 @@ export default { ...@@ -241,13 +266,14 @@ export default {
// 获取签证国家 // 获取签证国家
GetVisaCountry(){ GetVisaCountry(){
this.apiJavaPost( this.apiJavaPost(
"/api/b2b/visa/getVisaHotCountry", "/api/b2b/visa/getVisaProductSearchItem",
this.msg, this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.hotcountry=res.data.data.pageData; this.hotcountry=res.data.data.pageData;
this.pageCount=res.data.data.pageCount;
if(this.listmsg.visaCountryId==0){ if(this.listmsg.visaCountryId==0){
this.listmsg.visaCountryId=this.hotcountry[0].countryId; this.listmsg.visaCountryId=this.hotcountry[0].id;
} }
this.GetVisaProListChoose(); this.GetVisaProListChoose();
this.GetList(); this.GetList();
...@@ -283,7 +309,7 @@ export default { ...@@ -283,7 +309,7 @@ export default {
}); });
}else{ }else{
this.$router.push({path: `/Visaitemsdetails?productId=${item.idDes}`}); this.$router.push({path: `/Visaitemsdetails?productId=${encodeURIComponent(item.idDes)}`});
} }
}, },
...@@ -298,6 +324,17 @@ export default { ...@@ -298,6 +324,17 @@ export default {
<style> <style>
@import "../../assets/css/reset.css"; @import "../../assets/css/reset.css";
.visaList .top_ul .el-carousel__arrow--left{
left: -30px;
top: 25px;
}
.visaList .top_ul .el-carousel__arrow--right{
right: -30px;
top: 25px;
}
.visaList .top_ul .el-carousel__arrow {
position: absolute;
}
.visaList .common_width{ .visaList .common_width{
width: 1080px; width: 1080px;
margin: 0 auto; margin: 0 auto;
...@@ -306,7 +343,7 @@ export default { ...@@ -306,7 +343,7 @@ export default {
border-radius: 0; border-radius: 0;
} }
.visaList .select_ul_height{ .visaList .select_ul_height{
height: 24px; height: 22px;
} }
.el-pagination .btn-next, .el-pagination .btn-prev{ .el-pagination .btn-next, .el-pagination .btn-prev{
width: 28px!important; width: 28px!important;
...@@ -346,6 +383,9 @@ export default { ...@@ -346,6 +383,9 @@ export default {
border-top-color: #c0c4cc; border-top-color: #c0c4cc;
bottom: 7px; bottom: 7px;
} }
.visaList .visa_active img{
border: 1px solid #EE4454!important;
}
.visaList .visa_active{ .visaList .visa_active{
color: #EE4454!important; color: #EE4454!important;
font-weight: bold; font-weight: bold;
...@@ -455,6 +495,7 @@ export default { ...@@ -455,6 +495,7 @@ export default {
margin-top: 10px; margin-top: 10px;
font-size: 12px; font-size: 12px;
} }
.visaList .top_ul .top_ul_li_last .icon-diandian{ .visaList .top_ul .top_ul_li_last .icon-diandian{
font-size: 26px; font-size: 26px;
color:#B3B3B3; color:#B3B3B3;
...@@ -473,10 +514,15 @@ export default { ...@@ -473,10 +514,15 @@ export default {
} }
.visaList .top_ul{ .visaList .top_ul{
margin-bottom: 10px; margin-bottom: 10px;
position: relative;
} }
.visaList .top_ul li:hover{ .visaList .top_ul li:hover{
color:#EE4454; color:#EE4454;
font-weight:bold; font-weight:bold;
}
.visaList .top_ul li:hover img{
border:1px solid #EE4454;
} }
.visaList .top_ul li{ .visaList .top_ul li{
font-size:12px; font-size:12px;
...@@ -484,12 +530,13 @@ export default { ...@@ -484,12 +530,13 @@ export default {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
margin-right:20px; margin:0 13px;
} }
.visaList .top_ul li img{ .visaList .top_ul li img{
display: inline-block; display: inline-block;
width: 62px; width: 62px;
height: 41px; height: 41px;
border:1px dashed #666666;
} }
.visaList li{ .visaList li{
list-style: none; list-style: none;
......
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