Commit 8a0a3a1e authored by zhengke's avatar zhengke

修改

parent 8511e4c9
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
  //否则就是PC浏览器打开   //否则就是PC浏览器打开
this.isPhone=false; this.isPhone=false;
} }
if(!localStorage.g || localStorage.g == "" || localStorage.g=='undefined'){ if(!localStorage.g || localStorage.g == "" || localStorage.g=='undefined'||localStorage.g.i==0){
let msg={ let msg={
GroupId:0, GroupId:0,
ErpDomain:'', ErpDomain:'',
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<div style="position:absolute;bottom:20px;z-index:100;left:20%"> <div style="position:absolute;bottom:20px;z-index:100;left:20%;display:none">
<div> <div>
<div class="top_tag"> <div class="top_tag">
<ul class="tag_left"> <ul class="tag_left">
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="特价机票" name="second"> <el-tab-pane label="特价机票" name="second" v-if="localStorage&&localStorage.i==2">
<div style="margin-left:-17px"> <div style="margin-left:-17px">
<div @click="Purchase(item)" v-if="index<5" v-for="(item,index) in AllTicketList" :key="index+800" class="tj_ticket"> <div @click="Purchase(item)" v-if="index<5" v-for="(item,index) in AllTicketList" :key="index+800" class="tj_ticket">
<div class="ticket_top"> <div class="ticket_top">
...@@ -333,14 +333,6 @@ ...@@ -333,14 +333,6 @@
<span class="dashed"></span> <span class="dashed"></span>
</div> </div>
</div> </div>
<!-- <el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700"></el-col>
<el-col :span="12" style="position:relative;padding:6px 15px;box-sizing:border-box;text-align:center">
<i class="iconfont icon-Shape1" style="font-size:12px;color:#dcdcdc"></i>
<span class="dashed"></span>
</el-col>
<el-col :span="6" style="text-align:center;padding-top:15px;font-weight:700"></el-col> -->
</el-row> </el-row>
<p style="font-size:12px;padding:6px 0 2px 10px">日期:{{item.flightDate}}</p> <p style="font-size:12px;padding:6px 0 2px 10px">日期:{{item.flightDate}}</p>
<p style="font-size:12px;padding:2px 0 2px 10px"> <p style="font-size:12px;padding:2px 0 2px 10px">
...@@ -349,7 +341,6 @@ ...@@ -349,7 +341,6 @@
</span></p> </span></p>
</div> </div>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -397,6 +388,7 @@ ...@@ -397,6 +388,7 @@
</div> </div>
<!-- 幸运大抽奖跳转 --><el-row style="margin: 20px 0;cursor: pointer;"> <!-- 幸运大抽奖跳转 --><el-row style="margin: 20px 0;cursor: pointer;">
<img style="width:1160px;" <img style="width:1160px;"
v-if="localStorage&&localStorage.i==2"
@click="FootgoUrl('TurnaroundDraw')" @click="FootgoUrl('TurnaroundDraw')"
class="huodong_img" class="huodong_img"
src="../assets/img/active/huodong_img.png" src="../assets/img/active/huodong_img.png"
...@@ -562,7 +554,7 @@ ...@@ -562,7 +554,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 酒店 --> <!-- 酒店 -->
<div class="Grouptour hotel" style="height:385px;overflow:hidden;"> <div class="Grouptour hotel" style="height:385px;overflow:hidden;" v-if="localStorage&&localStorage.i==2">
<div class="tour_left"> <div class="tour_left">
<p>酒店</p> <p>酒店</p>
<div class="tour_left_content hotel_left_content"> <div class="tour_left_content hotel_left_content">
...@@ -598,7 +590,7 @@ ...@@ -598,7 +590,7 @@
<!-- 特价机票 --> <!-- 特价机票 -->
<div class="Ticket_spots Special_ticket"> <div class="Ticket_spots Special_ticket" v-if="localStorage&&localStorage.i==2">
<ul class="common_ul_tab"> <ul class="common_ul_tab">
<span style="font-weight:700;margin-right:172px">特价机票</span> <span style="font-weight:700;margin-right:172px">特价机票</span>
<li @click="ClickTJTicket(item)" v-for="(item,index) in specialAirTicketItem" :key="index+650" :class="item.type==airMsg.airTicketType?'li_active':''"> <li @click="ClickTJTicket(item)" v-for="(item,index) in specialAirTicketItem" :key="index+650" :class="item.type==airMsg.airTicketType?'li_active':''">
...@@ -635,7 +627,7 @@ ...@@ -635,7 +627,7 @@
</div> </div>
<!-- 当地游 --> <!-- 当地游 -->
<div class="Localtour"> <div class="Localtour" v-if="localStorage&&localStorage.i==2">
<ul class="common_ul_tab"> <ul class="common_ul_tab">
<span style="font-weight:700;margin-right:172px">当地游</span> <span style="font-weight:700;margin-right:172px">当地游</span>
<li @click="ClickLocal(item)" v-for="item in localLineItem" :key="item.lineName" :class="localMsg.lineId==item.lineId?'li_active':''">{{item.lineShortName}}</li> <li @click="ClickLocal(item)" v-for="item in localLineItem" :key="item.lineName" :class="localMsg.lineId==item.lineId?'li_active':''">{{item.lineShortName}}</li>
...@@ -823,6 +815,7 @@ export default { ...@@ -823,6 +815,7 @@ export default {
searchroomGroup:[], searchroomGroup:[],
lowrateBySetCurrency:'' lowrateBySetCurrency:''
}, },
localStorage:{},
pickerOptions0: { pickerOptions0: {
disabledDate(time) { disabledDate(time) {
let today_after7=moment().add(8,'days').format('YYYY-MM-DD'); let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
...@@ -850,6 +843,8 @@ export default { ...@@ -850,6 +843,8 @@ export default {
this.companyId=parseInt(localStorage.site); this.companyId=parseInt(localStorage.site);
this.getHotelList('东京都'); this.getHotelList('东京都');
this.localStorage = JSON.parse(localStorage.g);
}, },
created() { created() {
this.loadSize(); this.loadSize();
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<template> <template>
<div class="foot-box"> <div class="foot-box">
<el-row style="width:1200px;margin:0 auto" class="home_footer"> <el-row style="width:1200px;margin:0 auto" class="home_footer" v-if="localStorage&&localStorage.i==2">
<el-col :span="6"> <el-col :span="6">
<div class="float"><i class="iconfont icon-icon-test6"></i></div> <div class="float"><i class="iconfont icon-icon-test6"></i></div>
<div class="float" style="width:198px"> <div class="float" style="width:198px">
...@@ -101,6 +101,14 @@ ...@@ -101,6 +101,14 @@
</template> </template>
<script> <script>
export default { export default {
data () {
return {
localStorage:{}
}
},
mounted () {
this.localStorage = JSON.parse(localStorage.g);
},
methods:{ methods:{
// 底部跳转 // 底部跳转
FootgoUrl(path){ FootgoUrl(path){
......
...@@ -180,13 +180,13 @@ div { ...@@ -180,13 +180,13 @@ div {
<!-- <span class="_city">成都</span> --> <!-- <span class="_city">成都</span> -->
<el-select v-model="select" slot="prepend" @change="value6 = []" size="mini" class="w85" placeholder="请选择"> <el-select v-model="select" slot="prepend" @change="value6 = []" size="mini" class="w85" placeholder="请选择">
<el-option label="旅游" value="1"></el-option> <el-option label="旅游" value="1"></el-option>
<el-option label="定制游" value="4"></el-option> <el-option label="定制游" value="4" v-if="localStorage&&localStorage.i==2"></el-option>
<el-option label="一日游" value="5-1" v-show="false"></el-option> <el-option label="一日游" value="5-1" v-if="localStorage&&localStorage.i==2" v-show="false"></el-option>
<el-option label="当地门票" value="5-2" v-show="false"></el-option> <el-option label="当地门票" value="5-2" v-if="localStorage&&localStorage.i==2" v-show="false"></el-option>
<el-option label="当地美食" value="5-3" v-show="false"></el-option> <el-option label="当地美食" value="5-3" v-if="localStorage&&localStorage.i==2" v-show="false"></el-option>
<el-option label="签证" value="6"></el-option> <el-option label="签证" value="6" v-if="localStorage&&localStorage.i==2"></el-option>
<el-option label="机票" value="3"></el-option> <el-option label="机票" value="3" v-if="localStorage&&localStorage.i==2"></el-option>
<el-option label="酒店" value="7"></el-option> <el-option label="酒店" value="7" v-if="localStorage&&localStorage.i==2"></el-option>
</el-select> </el-select>
<span class="_splice"></span> <span class="_splice"></span>
<el-input <el-input
...@@ -231,7 +231,7 @@ div { ...@@ -231,7 +231,7 @@ div {
</div> </div>
</el-row> </el-row>
<!-- 三级 菜单 --> <!-- 三级 菜单 -->
<el-row class="new_header_nav_three"> <el-row class="new_header_nav_three" v-if="localStorage&&localStorage.i==2">
<div class="w1180"> <div class="w1180">
<!-- 首页 --> <!-- 首页 -->
<ul class="_t_nav_box clearfix"> <ul class="_t_nav_box clearfix">
...@@ -371,6 +371,7 @@ export default { ...@@ -371,6 +371,7 @@ export default {
city: 0, city: 0,
cityText: "", cityText: "",
value6: '', value6: '',
localStorage:{},
pickerOptions0: { pickerOptions0: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7; return time.getTime() < Date.now() - 8.64e7;
...@@ -552,7 +553,10 @@ export default { ...@@ -552,7 +553,10 @@ export default {
} }
} }
}, },
mounted() {}, mounted() {
this.localStorage = JSON.parse(localStorage.g);
},
computed: { computed: {
user() { user() {
return this.$store.state.user; return this.$store.state.user;
......
...@@ -28,7 +28,7 @@ export default new Router({ ...@@ -28,7 +28,7 @@ export default new Router({
{ {
path: "/login", path: "/login",
name: "login", name: "login",
component: msgLogin component: login
}, },
{ {
path: '/newTrip', path: '/newTrip',
......
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