Skip to content

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

update

parent 79b56567
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 20 deletions
src/App.vue
View file @ 4dd273be
...@@ -55,11 +55,12 @@ export default { ...@@ -55,11 +55,12 @@ export default {
this.MsgBus.$on('openRaffleTickets', this.openRaffleTickets) this.MsgBus.$on('openRaffleTickets', this.openRaffleTickets)
}, },
methods: { methods: {
getLocation() { getLocation() {
let _that = this; let _that = this;
let geolocation = location.initMap("map-container"); //定位 let geolocation = location.initMap("map-container"); //定位
AMap.event.addListener(geolocation, "complete", result => { AMap.event.addListener(geolocation, "complete", result => {
console.log(result) // console.log(result)
}); });
}, },
openRaffleTickets: function (val) { openRaffleTickets: function (val) {
......
src/components/GroupTour/index.vue
View file @ 4dd273be
...@@ -155,14 +155,18 @@ export default { ...@@ -155,14 +155,18 @@ export default {
loading: true, loading: true,
lineList:[], lineList:[],
lineLoad:false, lineLoad:false,
cityId:262,
companyId:0,
} }
}, },
props:['changeCity'], props:['changeCity'],
watch:{ watch:{
changeCity: { changeCity: {
handler: function(val, oldVal) { handler: function(val, oldVal) {
console.log(val)
if(val){ if(val){
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
this.LineTeam();
this.loadTiaoshui() this.loadTiaoshui()
this.loadRecoItems() this.loadRecoItems()
} }
...@@ -170,6 +174,10 @@ export default { ...@@ -170,6 +174,10 @@ export default {
deep: true deep: true
}, },
}, },
created(){
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
},
methods: { methods: {
// 系列 // 系列
GostartCity(place){ GostartCity(place){
...@@ -188,9 +196,11 @@ export default { ...@@ -188,9 +196,11 @@ export default {
}, },
LineTeam(){ LineTeam(){
let msg={companyId:this.companyId,cityId:this.cityId};
this.lineLoad=true; this.lineLoad=true;
this.apiJavaPost('/api/b2b/group/getHomeLineSort',{},res=>{ this.apiJavaPost('/api/b2b/group/getHomeLineSort',msg,res=>{
this.lineLoad=false; this.lineLoad=false;
console.log(res)
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.lineList=res.data.data; this.lineList=res.data.data;
...@@ -226,6 +236,7 @@ export default { ...@@ -226,6 +236,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
companyId: this.companyId, companyId: this.companyId,
cityId:this.cityId,
lineId: this.recoItems.line[sno].id, lineId: this.recoItems.line[sno].id,
lineTeamId: ltId lineTeamId: ltId
} }
...@@ -237,7 +248,7 @@ export default { ...@@ -237,7 +248,7 @@ export default {
}, },
loadRecoItems(){ loadRecoItems(){
if (this.companyId!=-1) { if (this.companyId!=-1) {
this.apipost('b2b_get_GetHomeSearchItem',{'companyId': this.companyId, lineDirection: 2,}, r=> { this.apipost('b2b_get_GetHomeSearchItem',{'companyId': this.companyId,cityId:this.cityId, lineDirection: 2,}, r=> {
r.data.data.line.forEach( x => { r.data.data.line.forEach( x => {
x.chosenLineTeam = '0' x.chosenLineTeam = '0'
}) })
...@@ -252,6 +263,8 @@ export default { ...@@ -252,6 +263,8 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 12, pageSize: 12,
groupRecommendType: 1, groupRecommendType: 1,
companyId:this.companyId,
cityId:this.cityId
} }
this.apiJavaPost('/api/b2b/group/getHomeRecommendPrice',msg,res=>{ this.apiJavaPost('/api/b2b/group/getHomeRecommendPrice',msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -282,6 +295,7 @@ export default { ...@@ -282,6 +295,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 1, pageSize: 1,
companyId: this.companyId, companyId: this.companyId,
cityId:this.cityId,
recommendType: 1, recommendType: 1,
} }
this.apipost('b2b_get_GetB2BHomeRecommendPageList',msg,r=>{ this.apipost('b2b_get_GetB2BHomeRecommendPageList',msg,r=>{
......
src/components/Home.vue
View file @ 4dd273be
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</div> </div>
</div> </div>
<div class="tour_right"> <div class="tour_right">
<ul class="common_ul_tab"> <ul class="common_ul_tab" style="min-height:32px;">
<li @click="ClickpackageTravel(item,0)" v-for="(item,index) in packageTravel.lineItem" :key="index+50" :class="gotuan.lineId==item.lineId?'li_active':''">{{item.lineShortName}}</li> <li @click="ClickpackageTravel(item,0)" v-for="(item,index) in packageTravel.lineItem" :key="index+50" :class="gotuan.lineId==item.lineId?'li_active':''">{{item.lineShortName}}</li>
<span @click="GoMore('heel')" style="float:right;color:#999999;font-size:12px">查看更多</span> <span @click="GoMore('heel')" style="float:right;color:#999999;font-size:12px">查看更多</span>
</ul> </ul>
...@@ -775,6 +775,7 @@ export default { ...@@ -775,6 +775,7 @@ export default {
gotuan:{ gotuan:{
teamType:0, teamType:0,
lineId:0, lineId:0,
}, },
TravelPriceList:[], TravelPriceList:[],
Travelload:false, Travelload:false,
...@@ -830,27 +831,37 @@ export default { ...@@ -830,27 +831,37 @@ export default {
homeTravelSpecialSale:[], homeTravelSpecialSale:[],
AllTicketList:[], AllTicketList:[],
isLogin:0, isLogin:0,
cityId:262,
companyId:0,
}; };
}, },
props:['changeCity'], props:['changeCity'],
watch:{ watch:{
changeCity: { changeCity: {
handler: function(val, oldVal) { handler: function(val, oldVal) {
console.log(val)
if(val){ if(val){
this.InitData() this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
this.NotTuanTravel();
this.Cztm();
} }
}, },
deep: true deep: true
}, },
}, },
mounted() {}, mounted() {
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
},
created() { created() {
this.loadSize(); this.loadSize();
this.InitData(); this.InitData();
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
}, },
methods: { methods: {
goLocalDes(idDes,obj){ goLocalDes(idDes,obj){
let path = 'detailTwo' let path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`; path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
...@@ -1050,6 +1061,8 @@ export default { ...@@ -1050,6 +1061,8 @@ export default {
},null) },null)
}, },
PackageTravel(){ PackageTravel(){
this.gotuan.companyId= this.companyId;
this.gotuan.cityId= this.cityId;
this.Travelload=true; this.Travelload=true;
this.apiJavaPost('/api/b2b/home/getHomeTravelPrice',this.gotuan,res=>{ this.apiJavaPost('/api/b2b/home/getHomeTravelPrice',this.gotuan,res=>{
this.Travelload=false; this.Travelload=false;
...@@ -1061,6 +1074,24 @@ export default { ...@@ -1061,6 +1074,24 @@ export default {
} }
},null) },null)
}, },
// 站点不是成都时，跟团游筛选项
NotTuanTravel(){
let msg={companyId:this.companyId,cityId:this.cityId};
this.apiJavaPost('/api/b2b/home/getHomeGroupTravelItem',msg,res=>{
if(res.data.resultCode==1){
this.packageTravel=res.data.data;
if(this.packageTravel.lineItem.length>0){
this.gotuan.lineId=this.packageTravel.lineItem[0].lineId;
this.PackageTravel();
}else{
this.TravelPriceList=[];
}
}else{
this.Error(res.data.message);
}
},null)
},
InitData(){ InitData(){
this.PageLoad=true; this.PageLoad=true;
this.apiJavaPost('/api/b2b/home/getHomeInitData',{},res=>{ this.apiJavaPost('/api/b2b/home/getHomeInitData',{},res=>{
...@@ -1068,6 +1099,8 @@ export default { ...@@ -1068,6 +1099,8 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data; let data=res.data.data;
this.packageTravel=data.packageTravel; this.packageTravel=data.packageTravel;
// 跟团游
if(data.packageTravel.lineItem.length>0){ if(data.packageTravel.lineItem.length>0){
this.gotuan.lineId=data.packageTravel.lineItem[0].lineId; this.gotuan.lineId=data.packageTravel.lineItem[0].lineId;
this.TravelPriceList=data.packageTravel.lineItem[0].priceList; this.TravelPriceList=data.packageTravel.lineItem[0].priceList;
...@@ -1113,7 +1146,11 @@ export default { ...@@ -1113,7 +1146,11 @@ export default {
this.homeTravelSpecialSale=data.homeTravelSpecialSale; this.homeTravelSpecialSale=data.homeTravelSpecialSale;
// this.ComputingTime(); // this.ComputingTime();
} }
// 判断当前站点
if(this.companyId!=0){
this.NotTuanTravel();
this.Cztm();
}
}else{ }else{
...@@ -1166,6 +1203,8 @@ export default { ...@@ -1166,6 +1203,8 @@ export default {
let Msg={ let Msg={
pageIndex:1, pageIndex:1,
pageSize:5, pageSize:5,
companyId:this.companyId,
cityId:this.cityId,
}; };
this.apiJavaPost('/api/b2b/home/getHomeTravelSpecialSale',Msg,res=>{ this.apiJavaPost('/api/b2b/home/getHomeTravelSpecialSale',Msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
......
src/components/global/newHead.vue
View file @ 4dd273be
...@@ -311,6 +311,7 @@ ...@@ -311,6 +311,7 @@
</el-row> </el-row>
</template> </template>
<script> <script>
import { location } from "../../assets/utils/getLocation";
import bus from '../../plugins/event-bus' import bus from '../../plugins/event-bus'
export default { export default {
data(){ data(){
...@@ -323,8 +324,10 @@ export default { ...@@ -323,8 +324,10 @@ export default {
navActive: '', navActive: '',
sites: [], sites: [],
city: 0, city: 0,
cityText:'',
} }
},methods:{ },methods:{
GoLocalTour(str){ GoLocalTour(str){
this.$router.push({name: "Localtourhome"}); this.$router.push({name: "Localtourhome"});
bus.$emit('Headmsg',str); bus.$emit('Headmsg',str);
...@@ -335,7 +338,14 @@ export default { ...@@ -335,7 +338,14 @@ export default {
}, },
changeSite(){ changeSite(){
window.localStorage.site=this.city window.localStorage.site=this.city;
console.log(this.city);
this.sites.forEach(item=>{
if(this.city==item.companyId){
window.localStorage.cityId=item.cityId;
}
window.localStorage.site=this.city;
})
this.$emit('siteCity',this.city==0?-1:this.city) this.$emit('siteCity',this.city==0?-1:this.city)
}, },
loadSites(){ loadSites(){
...@@ -344,11 +354,27 @@ export default { ...@@ -344,11 +354,27 @@ export default {
this.apipost(cmd,msg,r=>{ this.apipost(cmd,msg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.sites=r.data.data this.sites=r.data.data
let cityname=this.cityText.slice(0,this.cityText.length-1);
if(this.sites.length>0){
this.sites.forEach(item=>{
if(item.siteName.indexOf(cityname)!=-1){//出现改字段
this.city=item.companyId;
window.localStorage.site=this.city;
window.localStorage.cityId=item.cityId;
console.log(window.localStorage.cityId)
}else{
}
})
}
this.city=this.sites.length>0?this.city:null this.city=this.sites.length>0?this.city:null
} else { } else {
this.sites=[] this.sites=[]
} }
window.localStorage.site=this.city this.$emit('GetCityId',true)
},null) },null)
}, },
goSearch() { goSearch() {
...@@ -397,13 +423,20 @@ export default { ...@@ -397,13 +423,20 @@ export default {
} }
}, },
},mounted(){ },mounted(){
this.loadSites();
}, },
computed: { computed: {
user(){ user(){
return this.$store.state.user return this.$store.state.user
}, },
},created(){ },created(){
let geolocation = location.initMap("map-container"); //定位
AMap.event.addListener(geolocation, "complete", result => {
if(result.addressComponent.city){
this.cityText=result.addressComponent.city;
}
this.loadSites();
});
if(localStorage.g && localStorage.g!='undefined'){ if(localStorage.g && localStorage.g!='undefined'){
this.groupInfo = JSON.parse(localStorage.g) this.groupInfo = JSON.parse(localStorage.g)
} }
......
src/components/mall/detailTwo.vue
View file @ 4dd273be
...@@ -771,6 +771,7 @@ export default { ...@@ -771,6 +771,7 @@ export default {
bus.$on('order-chosen', this.orderChosen) bus.$on('order-chosen', this.orderChosen)
if(this.$route.query.free){ if(this.$route.query.free){
this.free=1; this.free=1;
this.getAction(3);
} }
}, },
mounted () { mounted () {
......
src/components/mall/search.vue
View file @ 4dd273be
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<el-button size='mini' @click="loadTeamDataInit">确认</el-button> <el-button size='mini' @click="loadTeamDataInit">确认</el-button>
</div> </div>
</div> </div>
<!-- 列表 -->
<div class="teams" v-loading='isLoading'> <div class="teams" v-loading='isLoading'>
<div class="teams-item" v-for="(item,index) in teamDatas" @mouseover='hoverIndex=index' @mouseout="hoverIndex=-1"> <div class="teams-item" v-for="(item,index) in teamDatas" @mouseover='hoverIndex=index' @mouseout="hoverIndex=-1">
<div class="picbox"> <div class="picbox">
...@@ -182,7 +183,6 @@ export default { ...@@ -182,7 +183,6 @@ export default {
lineChosen:'', lineChosen:'',
searchItem:[], searchItem:[],
keywords:'', keywords:'',
companyId:-1,
lines:[], lines:[],
xilies:[], xilies:[],
dates:[], dates:[],
...@@ -200,8 +200,14 @@ export default { ...@@ -200,8 +200,14 @@ export default {
totalCount:0, totalCount:0,
isLoading:false, isLoading:false,
isLogin:1, isLogin:1,
cityId:262,
companyId:0,
} }
}, },
created(){
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
},
mounted () { mounted () {
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
this.companyId=parseInt(localStorage.site) this.companyId=parseInt(localStorage.site)
...@@ -216,6 +222,20 @@ export default { ...@@ -216,6 +222,20 @@ export default {
this.loadDates() this.loadDates()
this.loadDayCount() this.loadDayCount()
}, },
props:['changeCity'],
watch:{
changeCity: {
handler: function(val, oldVal) {
if(val){
this.cityId=localStorage.cityId;
this.companyId=parseInt(localStorage.site);
this.loadTeamData();
this.loadRecoItems();
}
},
deep: true
},
},
methods: { methods: {
goUrl(path,id,tcid){ goUrl(path,id,tcid){
// detailTwo // detailTwo
...@@ -323,7 +343,7 @@ export default { ...@@ -323,7 +343,7 @@ export default {
pageIndex:this.pageIndex, pageIndex:this.pageIndex,
pageSize:this.pageSize, pageSize:this.pageSize,
searchKey:this.keywords, searchKey:this.keywords,
cityId:0, cityId:this.cityId,
lineId, lineId,
lineTeamId, lineTeamId,
minTripDay, minTripDay,
...@@ -412,9 +432,10 @@ export default { ...@@ -412,9 +432,10 @@ export default {
}) })
} }
}, },
// 系列
loadRecoItems(){ loadRecoItems(){
if(this.companyId!=-1){ if(this.companyId!=-1){
this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId},r=>{ this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId,cityId:this.cityId},r=>{
console.log(r) console.log(r)
this.lines=r.data.data.line this.lines=r.data.data.line
......
src/components/visa/SchedProduct.vue
View file @ 4dd273be
...@@ -365,6 +365,7 @@ export default { ...@@ -365,6 +365,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
that.Success(res.data.message); that.Success(res.data.message);
sessionStorage.Visainfo=JSON.stringify(res.data.data) sessionStorage.Visainfo=JSON.stringify(res.data.data)
this.getAction(2);
this.$router.push({ this.$router.push({
name: "Pay", name: "Pay",
query: { query: {
......
src/components/visa/Visaitemsdetails.vue
View file @ 4dd273be
...@@ -296,6 +296,7 @@ export default { ...@@ -296,6 +296,7 @@ export default {
}; };
}, },
created(){ created(){
this.getAction(1);
if(this.$route.query.productId){ if(this.$route.query.productId){
this.productId=decodeURIComponent(this.$route.query.productId); this.productId=decodeURIComponent(this.$route.query.productId);
this.GetDetails(); this.GetDetails();
......
src/components/visa/Visalist.vue
View file @ 4dd273be
...@@ -168,6 +168,7 @@ export default { ...@@ -168,6 +168,7 @@ export default {
} }
}, },
created(){ created(){
this.getAction(1);
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
if(this.$route.query.searchKey){ if(this.$route.query.searchKey){
this.listmsg.searchKey=this.$route.query.searchKey; this.listmsg.searchKey=this.$route.query.searchKey;
......
src/plugins/index.js
View file @ 4dd273be
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
let domainUrl = "https://reborn.oytour.com"; let domainUrl = "https://reborn.oytour.com";
// domainUrl = "http://test.viitto.com" // domainUrl = "http://test.viitto.com"
domainUrl = "http://192.168.2.214:8082" domainUrl = "http://192.168.2.214:8082"
domainUrl = "http://test.viitto.com" // domainUrl = "http://test.viitto.com"
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('viitto.com') != -1) if (window.location.host.indexOf('viitto.com') != -1)
...@@ -37,6 +37,17 @@ export default { ...@@ -37,6 +37,17 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
}; };
// domainUrl = "https://reborn.oytour.com"
// var obj = {
// //主地址
// DomainUrl: domainUrl,
// //常用提交数据URL
// PostUrl: domainUrl + "/api/common/post",
// javaUrl: "http://efficient.oytour.com",
// ViittoFileUrl:"http://imgfile.oytour.com",
// UploadUrl: "http://upload.oytour.com",
// LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
// };
return obj; return obj;
}, },
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) { Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
...@@ -187,7 +198,8 @@ export default { ...@@ -187,7 +198,8 @@ export default {
"sign": md5Str "sign": md5Str
} }
if (localStorage.g && localStorage.g != 'undefined') { if (localStorage.g && localStorage.g != 'undefined') {
postData.groupId = parseInt(JSON.parse(localStorage.g).i) // postData.groupId = parseInt(JSON.parse(localStorage.g).i)
postData.groupId=2;
} }
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
headers: { headers: {
...@@ -232,7 +244,8 @@ export default { ...@@ -232,7 +244,8 @@ export default {
"sign": md5Str "sign": md5Str
} }
if (localStorage.g && localStorage.g != 'undefined') { if (localStorage.g && localStorage.g != 'undefined') {
postData.groupId = parseInt(JSON.parse(localStorage.g).i) // postData.groupId = parseInt(JSON.parse(localStorage.g).i)
postData.groupId=2;
} }
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
headers: { headers: {
...@@ -255,6 +268,26 @@ export default { ...@@ -255,6 +268,26 @@ export default {
} }
}, faildCall) }, faildCall)
}, },
Vue.prototype.getAction = function(actionId,lineId){
if(actionId==1){
console.log("浏览签证产品",actionId)
}
console.log("lineId",lineId)
let msg={};
msg.actionId=actionId;
if(lineId){
msg.lineId=lineId;
}
this.apiJavaPost('/api/b2b/home/getSpecialAction',msg,res=>{
this.Travelload=false;
if(res.data.resultCode==1){
}else{
this.Error(res.data.message);
}
},null)
}
//验证只能输入2位小数 //验证只能输入2位小数
Vue.prototype.checkPrice = function (item, filed) { Vue.prototype.checkPrice = function (item, filed) {
......
src/views/index.vue
View file @ 4dd273be
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<template> <template>
<div class="home-box" v-if="isPhone"> <div class="home-box" v-if="isPhone">
<!-- <mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> --> <!-- <mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> -->
<newHead @siteCity="siteCity"/> <newHead @siteCity="siteCity" @GetCityId="GetCityId"/>
<div :style='{"min-height":minHeight+"px"}'> <div :style='{"min-height":minHeight+"px"}'>
<transition name="slide"> <transition name="slide">
<router-view :changeCity='changeCity'></router-view> <router-view v-if="CityId" :changeCity='changeCity'></router-view>
</transition> </transition>
</div> </div>
<foot /> <foot />
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
minHeight:0, minHeight:0,
changeCity:null, changeCity:null,
isPhone:false, isPhone:false,
CityId:false,
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -64,6 +65,9 @@ export default { ...@@ -64,6 +65,9 @@ export default {
return this.isPhone; return this.isPhone;
}, },
methods: { methods: {
GetCityId(val){
this.CityId=true;
},
siteCity(key) { siteCity(key) {
// console.log(key+'methods') // console.log(key+'methods')
this.changeCity = key; this.changeCity = key;
......
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