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

src/components/searchdata/kkday.vue

@@ -410,10 +410,12 @@ export default {
       console.log("handleSelected", target);
     },
     handleTicked(target) {
+      this.msg.pageIndex = 1
       this.ticked = target;
       this.goSearchHandler();
     },
     handleAreaTicked(target) {
+      this.msg.pageIndex = 1
       this.areaTicked = target;
       console.log("this.areaTicked", target);
       this.msg.placeIds = this.getChoseAddressCity().join(",");
@@ -517,6 +519,7 @@ export default {
         }
       });
       this.msg.dayNumList = arr;
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     optionsFn(cd) {
@@ -529,12 +532,14 @@ export default {
       this.$forceUpdate();
       this.msg.minPrice = e.min;
       this.msg.maxPrice = e.max;
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     dateRangeHandler(e) {
       this.msg.startDate = `${e.from.year}/${e.from.month}/${e.from.day}`;
       this.msg.endDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
       this.$refs.qDateProxy.hide();
+      this.msg.pageIndex = 1
       this.goSearchHandler();
     },
     initGoods() {

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/hotel/orderForm.vue

@@ -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 }}起止