Skip to content

A
Athena
Commit 2f4e2cea authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决冲突

parents 62e82868 ca850146
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 63 deletions
src/components/DependentTravel/IndependentTravel.vue
View file @ 2f4e2cea
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<!-- <div class="boxCont"></div> --> <!-- <div class="boxCont"></div> -->
</div> </div>
</div> </div>
<el-row class="back_middle"> <el-row class="back_middle" >
<img class="left1" src="../../assets/img/travel/left1.png" alt> <img class="left1" src="../../assets/img/travel/left1.png" alt>
<img class="right1" src="../../assets/img/travel/right1.png" alt> <img class="right1" src="../../assets/img/travel/right1.png" alt>
<el-row class="max-w1500" :gutter="0"> <el-row class="max-w1500" :gutter="0" >
<div style="width:1200px;margin:0 auto"> <div style="width:1200px;margin:0 auto" :style="{zoom: zoom}">
<div class="_top_box clearfix"> <div class="_top_box clearfix">
<div class='wrap'> <div class='wrap'>
<div class='left common'></div> <div class='left common'></div>
...@@ -945,6 +945,7 @@ p { ...@@ -945,6 +945,7 @@ p {
border-bottom: 0; border-bottom: 0;
text-align: center; text-align: center;
float: left; float: left;
box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
/* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35); /* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35);
*/ */
/* box-shadow: */ /* box-shadow: */
...@@ -956,12 +957,14 @@ p { ...@@ -956,12 +957,14 @@ p {
._top_box .wrap2{ ._top_box .wrap2{
background:rgba(71,165,255,1); background:rgba(71,165,255,1);
cursor: pointer; cursor: pointer;
box-shadow: none !important;
/* position: relative; /* position: relative;
right: -80px; right: -80px;
top: -60px; */ top: -60px; */
} }
._top_box .wrap2 .common{ ._top_box .wrap2 .common{
background:rgba(71,165,255,1); background:rgba(71,165,255,1);
box-shadow: none !important;
} }
._top_box .wrap2 P{ ._top_box .wrap2 P{
color: white; color: white;
...@@ -984,7 +987,7 @@ p { ...@@ -984,7 +987,7 @@ p {
overflow: hidden; overflow: hidden;
left:0; left:0;
border:1px solid rgba(226, 178, 209, 1); border:1px solid rgba(226, 178, 209, 1);
/* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35); */ box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
border-radius: 5px; border-radius: 5px;
border-top: 0; border-top: 0;
border-bottom: 0; border-bottom: 0;
......
src/components/GroupTour/index.vue
View file @ 2f4e2cea
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
.GroupTour .el-tabs__nav-wrap::after{ .GroupTour .el-tabs__nav-wrap::after{
background-color: transparent; background-color: transparent;
} }
.typeLi{
float: left;
width: 200px;
}
</style> </style>
<template> <template>
<el-row class="GroupTour"> <el-row class="GroupTour">
...@@ -59,7 +63,9 @@ ...@@ -59,7 +63,9 @@
</li> </li>
</ul> </ul>
</div> </div>
<img class="bgImg" src="../../assets/img/groupTour/top_bg.png" alt=""> <router-link to="IceCreamTask">
<img class="bgImg" src="../../assets/img/groupTour/top_bg.jpg" alt="">
</router-link>
</el-row> </el-row>
<el-row class="_list" v-loading="loading"> <el-row class="_list" v-loading="loading">
<!-- 跳水特价 --> <!-- 跳水特价 -->
......
src/components/Home.vue
View file @ 2f4e2cea
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</ul> </ul>
<div class="tag_right"> <div class="tag_right">
<!-- 签证 --> <!-- 签证 -->
<div style="width:394px;margin-top:9px;margin-left:8px;" v-show="tag=='visa'" class="visa"> <div style="width:394px" v-show="tag=='visa'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px"> <el-form ref="visa_form" :model="visa_form" label-width="90px">
<!-- <el-form-item label="国家/地区" style="margin-bottom:10px"> <!-- <el-form-item label="国家/地区" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
...@@ -50,14 +50,14 @@ ...@@ -50,14 +50,14 @@
<el-input size="small" v-model="visaSearch" placeholder="国家或者地区名字"></el-input> <el-input size="small" v-model="visaSearch" placeholder="国家或者地区名字"></el-input>
</li> </li>
</ul> </ul>
<div style="overflow:auto;margin-top:16px"> <div style="overflow:auto;margin-top:10px">
<span class="form_btn"> <span class="form_btn">
<router-link style="color:#fff;display:block;" :to="{ path: '/Visalist',query:{'searchKey':visaSearch} }" target='_blank'>立即搜索</router-link> <router-link style="color:#fff;display:block;" :to="{ path: '/Visalist',query:{'searchKey':visaSearch} }" target='_blank'>立即搜索</router-link>
</span> </span>
</div> </div>
<ul class="form_ul"> <ul class="form_ul">
<p style="margin-top:6px;display: flex;align-items: center;"> <p style="margin:6px 0;display: flex;align-items: center;">
<span class="green_span"></span> 热门推荐 <span class="green_span"></span> 热门推荐
</p> </p>
<li @click="TagGourl('Visalist',item)" v-for="(item,index) in searchItemVisa.hotCountry" :key="index+350"> <li @click="TagGourl('Visalist',item)" v-for="(item,index) in searchItemVisa.hotCountry" :key="index+350">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<!-- 跟团游 --> <!-- 跟团游 -->
<div class="Grouptour"> <div class="Grouptour">
<div class="tour_left"> <div class="tour_left">
<p class="pfR">跟团游</p> <p>跟团游</p>
<div class="tour_left_content"> <div class="tour_left_content">
<p style="font-size:14px;font-weight:700">热门目的地</p> <p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index"> <span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
<!-- 自由行 --> <!-- 自由行 -->
<div class="travel Grouptour"> <div class="travel Grouptour">
<div class="tour_left"> <div class="tour_left">
<p class="pfR">自由行</p> <p>自由行</p>
<div class="tour_left_content travel_left" style="height:325px;"> <div class="tour_left_content travel_left" style="height:325px;">
<p style="font-size:14px;font-weight:700">热门目的地</p> <p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index"> <span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
...@@ -451,51 +451,15 @@ ...@@ -451,51 +451,15 @@
</div> </div>
</div> </div>
<!-- 定制 -->
<el-row class="dingz"> <el-row style="margin: 20px 0;cursor: pointer;">
<el-col :span="2"> <img
<span class="icon1 icon"> @click="goUrl('IceCreamTask')"
<i class="iconfont icon-icon-test7"></i> class="huodong_img"
</span> src="../assets/img/active/huodong_img1.png"
alt
</el-col> >
<el-col :span="5" style="text-align:left"> </el-row>
<p class="pfR" style="font-size:20px;color:#202020">客户第一的购买政策</p>
<p style="font-size:12px;color:#FF9000">快速响应客户需求，开心出游你、我、他</p>
</el-col>
<el-col :span="2">
<span class="icon2 icon">
<i class="iconfont icon-icon-test6"></i>
</span>
</el-col>
<el-col :span="4" style="text-align:left">
<p style="font-size:20px;color:#202020">专业行程定制师</p>
<p style="font-size:12px;">定制套餐自由搭配 <br> 价位行程自行安排 保障最优出行
</p>
</el-col>
<el-col :span="2">
<span class="icon2 icon">
<i class="iconfont icon-icon-test8"></i>
</span>
</el-col>
<el-col :span="4" style="text-align:left">
<p style="font-size:20px;color:#202020">7*24小时客服服务</p>
<p style="font-size:12px;">24小时订单客服<br>随时解决客服需求咨询</p>
</el-col>
<el-col :span="2">
<span class="icon1 icon">
<i class="iconfont icon-Shape2"></i>
</span>
</el-col>
<el-col :span="3" style="text-align:left">
<p style="font-size:12px;color:#FF9000">客服服务电话</p>
<p class="pfR" style="font-size:18px;color:#FF9000">028-88888888</p>
</el-col>
</el-row>
<!-- 景点门票 --> <!-- 景点门票 -->
<div class="Ticket_spots"> <div class="Ticket_spots">
<ul class="common_ul_tab"> <ul class="common_ul_tab">
...@@ -547,7 +511,50 @@ ...@@ -547,7 +511,50 @@
</div> </div>
</div> </div>
<!-- 定制 -->
<el-row class="dingz">
<el-col :span="2">
<span class="icon1 icon">
<i class="iconfont icon-icon-test7"></i>
</span>
</el-col>
<el-col :span="5">
<p style="font-size:20px;color:#202020">客户第一的购买政策</p>
<p style="font-size:12px;color:#FF9000">快速响应客户需求，开心出游你、我、他</p>
</el-col>
<el-col :span="2">
<span class="icon2 icon">
<i class="iconfont icon-icon-test6"></i>
</span>
</el-col>
<el-col :span="4">
<p style="font-size:20px;color:#202020">专业行程定制师</p>
<p style="font-size:12px;">定制套餐自由搭配 <br> 价位行程自行安排 保障最优出行
</p>
</el-col>
<el-col :span="2">
<span class="icon2 icon">
<i class="iconfont icon-icon-test8"></i>
</span>
</el-col>
<el-col :span="4">
<p style="font-size:20px;color:#202020">7*24小时客服服务</p>
<p style="font-size:12px;">24小时订单客服<br>随时解决客服需求咨询</p>
</el-col>
<el-col :span="2">
<span class="icon1 icon">
<i class="iconfont icon-Shape2"></i>
</span>
</el-col>
<el-col :span="3">
<p style="font-size:12px;color:#FF9000">客服服务电话</p>
<p style="font-size:12px;color:#FF9000">028-88888888</p>
</el-col>
</el-row>
<!-- 酒店 --> <!-- 酒店 -->
<!-- <div class="Grouptour hotel"> <!-- <div class="Grouptour hotel">
<div class="tour_left"> <div class="tour_left">
......
src/components/mall/calendar.vue
View file @ 2f4e2cea
...@@ -84,10 +84,12 @@ export default { ...@@ -84,10 +84,12 @@ export default {
daysData:[], daysData:[],
isSelect:-1, isSelect:-1,
mydate:-1, mydate:-1,
isLogin: 1,
} }
},mounted(){ },mounted(){
},created(){ },created(){
this.isLogin=this.$store.state.isLogin;
this.getYearMonthDay() this.getYearMonthDay()
bus.$on('order-chosen_calendar', this.orderChosen) bus.$on('order-chosen_calendar', this.orderChosen)
},methods:{ },methods:{
...@@ -148,7 +150,7 @@ export default { ...@@ -148,7 +150,7 @@ export default {
var price = this.priceData[i]; var price = this.priceData[i];
var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length); var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
var dayDict = daysData[Number(dayIndex)-1]; var dayDict = daysData[Number(dayIndex)-1];
dayDict.price = price.price; dayDict.price = this.isLogin!==1 ? price.price : price.b2BPrice;
if(dayIndex<strDate&&strMonth==currentMonth){ if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price=''; dayDict.price='';
} }
......
src/components/mall/detailTwo.vue
View file @ 2f4e2cea
...@@ -933,7 +933,7 @@ export default { ...@@ -933,7 +933,7 @@ export default {
this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : ''; this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : ''; this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data; this.dataList = data;
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null; this.toDayObj = data.currentPriceInfo;
this.imgCover = JSON.parse(this.dataList.imgCover); this.imgCover = JSON.parse(this.dataList.imgCover);
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum; this.dayTrip = this.dataList.dayNum;
......
src/components/mall/search.vue
View file @ 2f4e2cea
...@@ -110,7 +110,8 @@ ...@@ -110,7 +110,8 @@
<div class="daynum">{{item.dayNum}}天</div> <div class="daynum">{{item.dayNum}}天</div>
<el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'> <el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'>
<el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'> <el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'>
<img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id,item.tcid)"> <img v-lazy='compressImg(img.Url, "filt", 200, 148)' @click="goUrl('detail',item.id,item.tcid)">
<!-- <img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id,item.tcid)"> -->
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' /> <img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' />
......
src/components/trade/order/OneDayIndex.vue
View file @ 2f4e2cea
...@@ -267,7 +267,7 @@ export default { ...@@ -267,7 +267,7 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
saveOrder(){ saveOrder(){
if(!this.customer){ if(!this.customer || !localStorage.userInfo){
return this.$message.error('请登录！') return this.$message.error('请登录！')
} }
if(this.chosenObj.startDate==''){ if(this.chosenObj.startDate==''){
...@@ -446,6 +446,7 @@ export default { ...@@ -446,6 +446,7 @@ export default {
); );
}, },
getUnicos() { getUnicos() {
if (!localStorage.userInfo) return
let msg = {tcid:this.trip.currentPriceInfo.tcid} let msg = {tcid:this.trip.currentPriceInfo.tcid}
this.apipost( this.apipost(
"b2b_get_GetTeamUnionInfo", "b2b_get_GetTeamUnionInfo",
...@@ -457,6 +458,7 @@ export default { ...@@ -457,6 +458,7 @@ export default {
); );
}, },
getB2BSellByCustomerId(){ getB2BSellByCustomerId(){
if (!localStorage.userInfo) return
this.apipost('b2b_get_GetCustomerSummary',{},r=>{ this.apipost('b2b_get_GetCustomerSummary',{},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.customer = r.data.data this.customer = r.data.data
......
src/components/trade/order/index.vue
View file @ 2f4e2cea
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
saveOrder(){ saveOrder(){
if(!this.customer){ if(!this.customer || !localStorage.userInfo){
return this.$message.error('请登录！') return this.$message.error('请登录！')
} }
if(this.chosenObj.startDate==''){ if(this.chosenObj.startDate==''){
...@@ -557,6 +557,7 @@ export default { ...@@ -557,6 +557,7 @@ export default {
); );
}, },
getUnicos() { getUnicos() {
if (!localStorage.userInfo) return
let msg = {tcid:this.trip.currentPriceInfo.tcid} let msg = {tcid:this.trip.currentPriceInfo.tcid}
this.apipost( this.apipost(
"b2b_get_GetTeamUnionInfo", "b2b_get_GetTeamUnionInfo",
...@@ -568,6 +569,7 @@ export default { ...@@ -568,6 +569,7 @@ export default {
); );
}, },
getB2BSellByCustomerId(){ getB2BSellByCustomerId(){
if (!localStorage.userInfo) return
this.apipost('b2b_get_GetCustomerSummary',{},r=>{ this.apipost('b2b_get_GetCustomerSummary',{},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.customer = r.data.data this.customer = r.data.data
......
src/components/trade/order/indexTwo.vue
View file @ 2f4e2cea
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<div class="no-login" v-if="!this.customer"> <div class="no-login" v-if="!this.customer || !localStorage.userInfo">
需要你登录以后才能预定哦！登录后还能享受更加优惠的价格，<span class="link" @click="goLogin">立即登录吧</span> 需要你登录以后才能预定哦！登录后还能享受更加优惠的价格，<span class="link" @click="goLogin">立即登录吧</span>
</div> </div>
</div> </div>
...@@ -715,7 +715,7 @@ export default { ...@@ -715,7 +715,7 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
saveOrder(){ saveOrder(){
if(!this.customer){ if(!this.customer || !localStorage.userInfo){
return this.$message.error('请登录！') return this.$message.error('请登录！')
} }
if(this.chosenObj.startDate==''){ if(this.chosenObj.startDate==''){
...@@ -898,6 +898,7 @@ export default { ...@@ -898,6 +898,7 @@ export default {
},null) },null)
}, },
getUnicos(tcid) { getUnicos(tcid) {
if (!localStorage.userInfo) return
let msg = {tcid:tcid} let msg = {tcid:tcid}
this.apipost( this.apipost(
"b2b_get_GetTeamUnionInfo", "b2b_get_GetTeamUnionInfo",
...@@ -909,6 +910,7 @@ export default { ...@@ -909,6 +910,7 @@ export default {
); );
}, },
getB2BSellByCustomerId(){ getB2BSellByCustomerId(){
if (!localStorage.userInfo) return
this.apipost('b2b_get_GetCustomerSummary',{},r=>{ this.apipost('b2b_get_GetCustomerSummary',{},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.customer = r.data.data this.customer = r.data.data
......
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