Skip to content

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

update

parent 19ee0f77
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 55 deletions
src/App.vue
View file @ e69d0069
......@@ -78,6 +78,7 @@ export default {
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_juczt3mz8sh.css';
@import './assets/global/global.css';
@import './assets/css/common.css';
body,html{
padding: 0px;
margin: 0px;
......
src/assets/css/home.css
View file @ e69d0069
......@@ -343,6 +343,10 @@ p {
a{
text-decoration: none;
}
.Home .Grouptour .tour_left_content span:hover a{
text-decoration: underline;
color: #ee4454;
}
.Home .Grouptour .tour_left_content span a{
color: #333333;
}
......@@ -390,10 +394,13 @@ a{
}
.Home .Grouptour .tour_right_item .Remarks{
position: absolute;
bottom: 6px;
bottom:0;
font-size: 12px;
color: #fff;
padding: 0 6px;
padding:2px 6px;
width: 100%;
box-sizing: border-box;
background: rgba(0,0,0,0.35);
}
.Home .travel_right_content{
height: 323px;
......@@ -414,11 +421,14 @@ a{
height: 100%;
}
.Home .travel_right_content .travel_right_item .Remarks{
width: 100%;
position: absolute;
bottom: 10px;
padding: 0 6px;
bottom: 0px;
padding:6px;
color:#fff;
font-size: 12px;
box-sizing: border-box;
background:linear-gradient(0deg,rgba(0,0,0,0.6) 0%,rgba(0,0,0,0) 100%);
}
.Home .travel_samll_div{
width: 470px;
......
src/components/DependentTravel/IndependentList.vue
View file @ e69d0069
......@@ -25,8 +25,8 @@
<div>
<div class="select_title" style="top:15px">线路</div>
<ul class="select_ul" :class="lineselect?'':'select_ul_height'">
<li @click="ChangeLine(0)" :class="listmsg.lineId==0?'visa_active':''">不限</li>
<li @click="ChangeLine(item.id)" :class="listmsg.lineId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li>
<li @click="ChangeLine(0)" :class="listmsg.lineTeamId==0?'visa_active':''">不限</li>
<li @click="ChangeLine(item.id)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li>
</ul>
<span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span>
......@@ -233,7 +233,7 @@ export default {
this.listmsg.searchKey=this.$route.query.keywords;
}
if(this.$route.query.lineteamId){
this.listmsg.lineId=this.$route.query.lineteamId;
this.listmsg.lineteamId=this.$route.query.lineteamId;
}
this.isLogin=this.$store.state.isLogin;
if(this.isLogin==1){
......@@ -355,7 +355,7 @@ export default {
// 选择线路
ChangeLine(id){
this.listmsg.lineId=id;
this.listmsg.lineTeamId=id;
this.GetList();
},
loadRecoItems(){
......
src/components/DependentTravel/PersonalTailor.vue
View file @ e69d0069
......@@ -40,7 +40,7 @@
.PersonalTailor .main .info .info_.info_left .info_left_sub{
display: flex;
align-items: center;
padding: 15px 30px;
padding: 15px 9px;
}
.PersonalTailor .main .info .info_.info_left .info_left_sub ._sub_left>._icon,._sub_right>._icon{
display: inline-block;
......@@ -217,7 +217,7 @@
<span> 2、联系人信息</span>
</div>
</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
<div v-if="showType === 1">
<el-form-item label="出发地：">
<el-popover v-model="startcity"
......
src/components/Home.vue
View file @ e69d0069
......@@ -364,7 +364,7 @@
<!-- 跟团游 -->
<div class="Grouptour">
<div class="tour_left">
<p>跟团游</p>
<p class="pfR">跟团游</p>
<div class="tour_left_content">
<p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">
......@@ -399,7 +399,7 @@
<!-- 自由行 -->
<div class="travel Grouptour">
<div class="tour_left">
<p>自由行</p>
<p class="pfR">自由行</p>
<div class="tour_left_content travel_left" style="height:325px;">
<p style="font-size:14px;font-weight:700">热门目的地</p>
<span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
......@@ -454,7 +454,7 @@
<el-row style="margin: 20px 0;cursor: pointer;">
<img
@click="goUrl('IceCreamTask')"
@click="FootgoUrl('IceCreamTask')"
class="huodong_img"
src="../assets/img/active/huodong_img1.png"
alt
......@@ -480,7 +480,7 @@
<div>
<p class="Remarks text2" style="height:34px">{{item.name}}</p>
<span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
{{item.b2bPrice | NoDesnum}}
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</span>起</span>
<span style="color:#666666;float:right;margin-top:6px">席位充足</span>
</div>
......@@ -502,7 +502,7 @@
<div class="hot_right">
<p class="text2" style="height:34px">{{item.name}}</p>
<p style="text-align:right"><span style="color:#FF6600">￥<span style="font-size:16px;font-weight:bold">
{{item.b2bPrice | NoDesnum}}
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</span>起</span></p>
</div>
</li>
......@@ -519,8 +519,8 @@
</span>
</el-col>
<el-col :span="5">
<p style="font-size:20px;color:#202020">客户第一的购买政策</p>
<el-col :span="5" style="text-align:left">
<p class="pfR" style="font-size:20px;color:#202020">客户第一的购买政策</p>
<p style="font-size:12px;color:#FF9000">快速响应客户需求，开心出游你、我、他</p>
</el-col>
<el-col :span="2">
......@@ -529,7 +529,7 @@
</span>
</el-col>
<el-col :span="4">
<el-col :span="4" style="text-align:left">
<p style="font-size:20px;color:#202020">专业行程定制师</p>
<p style="font-size:12px;">定制套餐自由搭配 <br> 价位行程自行安排 保障最优出行
</p>
......@@ -540,19 +540,19 @@
</span>
</el-col>
<el-col :span="4">
<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">
<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 :span="3" style="text-align:left">
<p style="font-size:14px;color:#FF9000">客服服务电话</p>
<p class="pfR" style="font-size:18px;color:#FF9000">028-88888888</p>
</el-col>
</el-row>
<!-- 酒店 -->
......
src/components/LocalTour/AdmissionTicket.vue
View file @ e69d0069
......@@ -19,7 +19,9 @@
</p>
</div>
<div class="threeDiv">
<p><span style="color:#FDAC11;font-size:22px">￥{{item.b2bPrice | NoDesnum}}</span>起</p>
<p><span style="color:#FDAC11;font-size:22px">￥
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</span>起</p>
<p style="margin-top:10px;cursor:pointer"><span @click="GoUrl(item)">查看详情</span></p>
</div>
</li>
......@@ -29,7 +31,10 @@
<span class="ticketdes">{{item.name}} {{ticket.ticketDesc}}门票></span>
<span class="peopleType">{{ticket.ticketName}}</span></span>
<span class="SecondSpan">
<span class="price">￥{{ticket.b2bPrice | NoDesnum}}</span>
<span class="price">￥
{{(isLogin!=1 ? ticket.b2cPrice : ticket.b2bPrice) | NoDesnum}}
</span>
<!-- <span style="color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through">原价:￥300</span> -->
</span>
<span class="ThreeSpan">
......@@ -53,7 +58,9 @@
<div class="hotcontent">
<span style="color:#fff;width:125px;" class="textHidden font12">{{item.name}}</span>
<span style="width:75px;color:#FDAC11;text-align:right">
￥<span class="pfR font18">{{item.b2bPrice | NoDesnum}}</span>起
￥<span class="pfR font18">
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</span>起
</span>
</div>
</li>
......@@ -64,7 +71,7 @@
</template>
<script>
export default {
props:["ticketList","hotList"],
props:["ticketList","hotList","isLogin"],
data () {
return {
dataList:[],
......
src/components/LocalTour/LocalCuisine.vue
View file @ e69d0069
......@@ -83,7 +83,9 @@
<div>
<p class="f12 text2">{{item.name}}</p>
<p>
<span style="color:#FF0101">￥{{item.b2bPrice | NoDesnum}}</span>起
<span style="color:#FF0101">￥
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</span>起
</p>
</div>
</div>
......@@ -114,7 +116,7 @@
</el-col>
<el-col :span="5">
<p class="f12 pfR" style="text-align:right;">
<span style="font-size:22px;color:#FF0101">￥{{item.b2bPrice | NoDesnum}}</span>起
<span style="font-size:22px;color:#FF0101">￥{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}} </span>起
</p>
</el-col>
</el-row>
......@@ -180,10 +182,11 @@ export default {
cityList:[],
Load:false,
LikeList:[],
isLogin:0,
}
},
created(){
this.isLogin=this.$store.state.isLogin;
this.GetTicketList();
if(localStorage.LikeList){
this.LikeList=JSON.parse(localStorage.LikeList);
......
src/components/LocalTour/LocalTourList.vue
View file @ e69d0069
......@@ -5,7 +5,7 @@
<li class="tab_li">
<span @click="ChangeTab(1)" :class="tab==1?'tab_active':''" style="z-index:10">一日游</span>
<span @click="ChangeTab(2)" :class="tab==2?'tab_active':''" style="z-index:5">门票</span>
<span @click="ChangeTab(3)" :class="tab==3?'tab_active':''" style="z-index:1">巴厘岛</span>
<!-- <span @click="ChangeTab(3)" :class="tab==3?'tab_active':''" style="z-index:1">巴厘岛</span> -->
</li>
<li class="iconlist">
<div class="icon">
......@@ -186,7 +186,7 @@
<!-- 数据 -->
<div style="margin-top:14px" v-loading="Loading">
<OnedayList :isLogin="isLogin" :onelist="onelist" v-show="tab==1"></OnedayList>
<AdmissionTicket :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
<AdmissionTicket :isLogin="isLogin" :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
</div>
<div style="text-align:right;width:950px;margin-top:15px">
<el-pagination
......
src/components/LocalTour/Localtourhome.vue
View file @ e69d0069
......@@ -154,7 +154,9 @@
</div> -->
<div class="bottom">
<span>{{item.name}}</span>
<span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
<span class="font12 textHidden1">¥<a class="font14">
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</a>起/人</span>
</div>
</li>
</ul>
......@@ -310,7 +312,9 @@
<img :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
<div class="bottom">
<span>{{item.name}}</span>
<span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
<span class="font12 textHidden1">¥<a class="font14">
{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
</a>起/人</span>
</div>
</li>
</ul>
......
src/components/Ticket/EditTicketOrder.vue
View file @ e69d0069
......@@ -301,6 +301,7 @@ export default {
.ticket_list .padd{
padding-left:25px;
box-sizing: border-box;
margin-top: 15px;
}
.ticket_list .el-col-9{
padding-left:0!important;
......
src/components/Ticket/FillItinerary.vue
View file @ e69d0069
<template>
<div class="FillItinerary">
<div class="FillItinerary commonF">
<el-row style="width:1200px;margin:0 auto">
<!-- 订单详情 -->
......@@ -9,7 +9,7 @@
<div class="bz">去程</div>
<div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}
<p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}
{{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}}
</p>
<p style="font-size:12px;color:#666666">
......@@ -23,7 +23,7 @@
<p class="time">{{getlistSigel.goStartHouseTime}}</p>
<p>{{getlistSigel.goStartAirPlace}}</p>
</el-col>
<el-col :span="8" style="text-align:center;color:#a8a8a8">
<el-col :span="8" style="text-align:center;color:#a8a8a8;padding:0 10px">
<p>
{{getlistSigel.goTotalTime}}
</p>
......@@ -40,7 +40,7 @@
<el-col v-if="getlistSigel.ticketType==2" class="coupon_left" :span="9" style="position:relative;border-left:1px dashed #aaaaaa;">
<div class="bz">返程</div>
<div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}
<p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}
{{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}}
</p>
<p style="font-size:12px;color:#666666">
......@@ -54,7 +54,7 @@
<p class="time">{{getlistSigel.backStartHouseTime}}</p>
<p>{{getlistSigel.goStartAirPlace}}</p>
</el-col>
<el-col :span="8" style="text-align:center;color:#a8a8a8">
<el-col :span="8" style="text-align:center;color:#a8a8a8;padding:0 10px">
<p>
{{getlistSigel.backTotalTime}}
</p>
......@@ -112,16 +112,16 @@
<el-form class="personnum_form" :model="personNum" label-width="60px">
<el-form-item label="成人：">
<el-input-number size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="儿童：">
<el-input-number size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="婴儿：">
<el-input-number size="mini" v-model="personNum.babyNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="老人：">
<el-input-number size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item>
<el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button>
......@@ -258,7 +258,11 @@ export default {
this.SellInfo();
},
methods: {
PersonNumChange(){
if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.synum){
this.Error("票数不够！");
}
},
// 国籍
GetCountroy(){
this.apipost(
......@@ -293,6 +297,10 @@ export default {
},
// 确认订单人数
ConfirmedPersonNum(){
if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.synum){
this.Error("票数不够！");
return;
}
if(this.personNum.manNum==0 && this.personNum.chirdNum==0 && this.personNum.oldPeopleNum==0){
this.$message.error("乘机人数至少1人！")
return;
......@@ -501,6 +509,7 @@ export default {
.ticket_list .padd{
padding-left:25px;
box-sizing: border-box;
margin-top: 15px;
}
.ticket_list .el-col-9{
padding-left:0!important;
......
src/components/Ticket/OrderDetails.vue
View file @ e69d0069
<template>
<div class="OrderDetails">
<div class="OrderDetails commonF">
<!-- <div class="baner_top">
<el-row :gutter="20">
<el-col :span="24" :offset="2">
......@@ -16,7 +16,7 @@
<div class="bz">去程</div>
<div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}
<p class="pfR" style="font-size:16px;color:#333333;padding-top:10px;">{{getlistSigel.goFlightTime}}
{{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}}
</p>
<p style="font-size:12px;color:#666666">
......@@ -47,7 +47,7 @@
<el-col v-if="getlistSigel.ticketType==2" :span="9" style="border-left:1px dashed #aaaaaa;position:relative">
<div class="bz">返程</div>
<div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}
<p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}
{{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}}
</p>
<p style="font-size:12px;color:#666666">
......@@ -351,6 +351,7 @@ export default {
.ticket_list .padd{
padding-left:25px;
box-sizing: border-box;
margin-top: 15px;
}
.ticket_list .el-col-9{
padding-left:0!important;
......
src/components/Ticket/TicketList.vue
View file @ e69d0069
......@@ -175,7 +175,7 @@
</el-col>
</el-row>
</el-col>
<el-col class="second" :span="12">
<el-col class="second" :span="13">
<div style="width:100%;overflow:auto;margin-bottom:10px">
<el-col v-if="item.ticketType==2" :span="2" style="text-align:right">
<span class="cilcle">往</span>
......@@ -226,7 +226,7 @@
</div>
</el-col>
<el-col class="third" :span="8" style="text-align:center">
<el-col class="third" :span="7" style="text-align:center">
<el-col :span="8">
<p class="orange font_12" style="margin-top:15px;position:relative">
<el-popover visible-arrow="false"
......
src/components/visa/SchedProduct.vue
View file @ e69d0069
......@@ -495,7 +495,7 @@ export default {
.SchedProduct .yd_info .adress{
margin-top: 15px;
position: relative;
width:663px;
width:67%;
background:rgba(255,255,255,1);
border:1px solid #D2D2D2;
margin-left:82px;
......
src/components/visa/Visalist.vue
View file @ e69d0069
......@@ -25,7 +25,7 @@
<div>
<div class="select_title" style="top:15px">常住地</div>
<ul class="select_ul" :class="selectcon?'':'select_ul_height'">
<!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li> -->
<li @click="SelectCity(-1)" :class="listmsg.companyId==-1?'visa_active':''">不限</li>
<li @click="SelectCity(item.companyId)" :class="listmsg.companyId==item.companyId?'visa_active_city':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li>
</ul>
......@@ -151,7 +151,7 @@ export default {
tagType3:[],
listmsg:{
visaCountryId:0,
companyId:0,//常住地
companyId:-1,//常住地
tags:[],
orderByPrice:0,
orderByBookAdvance:0,
......@@ -172,9 +172,9 @@ export default {
if(this.$route.query.searchKey){
this.listmsg.searchKey=this.$route.query.searchKey;
}
if(window.localStorage.site){
this.msg.companyId=parseInt(window.localStorage.site)
}
// if(window.localStorage.site){
// this.msg.companyId=parseInt(window.localStorage.site)
// }
if(this.$route.query.id){
this.listmsg.visaCountryId=Number(this.$route.query.id);
......
src/router.js
View file @ e69d0069
......@@ -500,7 +500,7 @@ export default new Router({
component: resolve =>
require(["@/components/DependentTravel/IndependentList.vue"], resolve),
meta: {
title: "首页"
title: "自由行列表"
}
},
{
......
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