Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/boot/utils.js

@@ -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) {

src/components/search_sf/search_sf2.vue

@@ -145,6 +145,7 @@
               @focus="searchFocusHandler"
               @blur="searchBlurHandler"
               @keyup="searchChangeHandler"
+              @keypress.enter.native="goSearchHandler"
             />
             <q-btn
               dark-percentage

src/components/trip/orderPreview.vue

@@ -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])
           }
         }
         

src/pages/detailsNew.vue

@@ -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();