Commit e18ee443 authored by 罗超's avatar 罗超

提交修改

parent 7c2d7e45
......@@ -26,7 +26,7 @@ Vue.prototype.domainManager = function() {
domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
// domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
}
var obj = {
//主地址
......@@ -41,7 +41,7 @@ Vue.prototype.domainManager = function() {
//获取当前域名
Vue.prototype.GetDomain = function() {
var domainNameUrl = window.location.hostname;
domainNameUrl = "www.oytour.com";
domainNameUrl = "t.oytour.com";
return domainNameUrl;
}
Vue.prototype.groupBy = function(array, f) {
......
......@@ -145,6 +145,7 @@
@focus="searchFocusHandler"
@blur="searchBlurHandler"
@keyup="searchChangeHandler"
@keypress.enter.native="goSearchHandler"
/>
<q-btn
dark-percentage
......
This diff is collapsed.
......@@ -381,8 +381,10 @@ export default {
this.chosenObj.startDate = this.p.startDate;
this.calcMoney();
if(this.p.unionCityList && this.p.unionCityList.length>0 && this.p.originalB2CPrice==this.p.RealPrice){
if(this.p.unionCityList[0].cityId==this.travel.startCityId){
this.changeCityHandler(this.p.unionCityList[0])
}
this.changeCityHandler(this.p.unionCityList[0])
}
}
......
......@@ -898,10 +898,13 @@ export default {
this.currentPrice.RealPrice = this.currentPrice.RealPrice?this.currentPrice.RealPrice:this.currentPrice.originalB2CPrice
this.currentPrice.originalB2CPrice = this.currentPrice.RealPrice
if(this.currentPrice.unionCityList && this.currentPrice.unionCityList.length>0 && this.dataList.startCityId!=0){
this.currentPrice.unionCityList.splice(0,0,{
if(this.currentPrice.unionCityList.findIndex(x=>x.cityId==this.dataList.startCityId)==-1){
this.currentPrice.unionCityList.splice(0,0,{
cityId:this.dataList.startCityId,
cityName:this.dataList.startCityName
})
}
}
if(this.$q.platform.is.mobile){
this.$refs.qDateProxy.hide();
......
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