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,9 +381,11 @@ 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])
             }
+            
+          }
         }
         
       },

src/pages/Pickuporder/orderForm.vue

@@ -514,8 +514,8 @@
           <q-separator color="grey-2" class="q-my-md"/>
           <div class="text-grey-9">
             <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
-              <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
-              <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
+              <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }} 辆</div>
+              <div>CNY {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
             </div>
             <hr
               style="border: none; border-top: 1px dashed #eee !important"

src/pages/ScenicSpotTicket/orderForm.vue

@@ -570,7 +570,7 @@
           {
             SurName: this.parameters.Name?this.parameters.Name:this.userInfo.Surname+this.userInfo.Name,
             Name: '',
-            ContactNumber: this.userInfo.Mobile,//	联系电话
+            ContactNumber: this.parameters.Mobile?this.parameters.Mobile:this.userInfo.Mobile,//	联系电话
             Mailbox: this.userInfo.Mailbox,//邮箱
             GoodsId: this.parameters.CouponsId,//商品id
             GoodsName: this.details.Name,//商品名称

src/pages/detailsNew.vue

@@ -898,11 +898,14 @@ 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){
+        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();
       }

src/pages/hotel/orderForm.vue

@@ -783,8 +783,8 @@ export default {
         {
           SurName: this.parameters.guestLastName?this.parameters.guestLastName:this.userInfo.Surname,
           Name: this.parameters.guestFirstName?this.parameters.guestFirstName:this.userInfo.Name,
-          ContactNumber: this.userInfo.Mobile,//	联系电话
-          Mailbox: this.userInfo.Mailbox,//邮箱
+          ContactNumber: this.parameters.guestPhoneNumber?this.parameters.guestPhoneNumber:this.userInfo.Mobile,//	联系电话
+          Mailbox: this.parameters.guestEmail?this.parameters.guestEmail:this.userInfo.Mailbox,//邮箱
           GoodsId: this.parameters.hotelId,//商品id
           GoodsName: this.parameters.HotelName,//商品名称
           GoodsPic: this.parameters.HotelPic,//商品图片
@@ -909,9 +909,7 @@ export default {
           if (r.data.resultCode == 1) {
             this.userInfo = r.data.data;
             if(r.data.data.Moblie){
-              if(this.parameters.MailingState!=4){
-                this.parameters.Mobile = r.data.data.Moblie
-              }
+              this.parameters.guestEmail = r.data.data.Moblie
               this.userInfo.Mobile = r.data.data.Moblie
             }
           } else {

src/pages/line/orderPreview.vue

@@ -365,7 +365,7 @@
             </div>
           </div>
           <div class="q-mt-md text-grey-6">
-            <div class="row">
+            <div class="row" v-if="(unionCity&&unionCity.cityName)||(trip&&trip.startCityName)">
               <div style="width: 80px">出發城市：</div>
               <div class="q-ml-md">
                 {{ unionCity ? unionCity.cityName : trip.startCityName }}起止