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

src/components/car/orderPreview.vue

@@ -248,7 +248,7 @@ export default {
                   isSupportChildren: 1,
                   safeMoney: 0,
                 }
-                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
+                if(date.formatDate(Date.now(), 'YYYY/MM/DD')!=x.Date){
                   arr.push(dataObj)
                 }
               }

src/components/common/end.vue

@@ -15,7 +15,7 @@
             label="了解更多"
             class="q-px-lg"
             unelevated
-            @click="CommonJump('/About', {})"
+            @click="CommonJump('/customer/14', {},'blank')"
           />
         </div>
       </div>

src/components/searchdata/kkday.vue

@@ -899,7 +899,7 @@ export default {
       this.goodsType = category.children;
       // this.ticked = categoryInfo;
       console.log("this.areaListJSONTMP", this.areaListJSONTMP, this.areaList);
-      // this.priceModel = { min: priceInfo.minPrice, max: priceInfo.maxPrice };
+      this.priceModel = { min: priceInfo.minPrice, max: priceInfo.maxPrice };
       // this.msg.priceRange = {
       //   min: priceInfo.minPrice,
       //   max: priceInfo.maxPrice,

src/components/trip/calendar.vue

@@ -155,30 +155,34 @@ export default {
       this.changeMonthHandler();
     },
     changeMonthHandler() {
-      this.col = [];
-      let newDate = new Date(this.months[this.currentMonth].monthValue);
-      let newBeginDate = date.startOfDate(newDate, "month");
-      let newEndDate = date.endOfDate(newDate, "month");
-      for (let i = 0; i < date.formatDate(newBeginDate, "d"); i++) {
-        this.col.push({
-          value: "",
-        });
-      }
-      while (newBeginDate <= newEndDate) {
-        let value = date.formatDate(newBeginDate, "YYYY-MM-DD");
-        let price = this.prices.find((x) => x.startDate == value);
-        this.col.push({
-          value,
-          display: date.formatDate(newBeginDate, "DD"),
-          price,
-        });
-        newBeginDate = date.addToDate(newBeginDate, { days: 1 });
-      }
-      let after = 6 - date.formatDate(newBeginDate, "d");
-      for (let i = 0; i < after; i++) {
-        this.col.push({
-          value: "",
-        });
+      try {
+        this.col = [];
+        let newDate = new Date(this.months[this.currentMonth].monthValue+'/01');
+        let newBeginDate = date.startOfDate(newDate, "month");
+        let newEndDate = date.endOfDate(newDate, "month");
+        for (let i = 0; i < date.formatDate(newBeginDate, "d"); i++) {
+          this.col.push({
+            value: "",
+          });
+        }
+        while (newBeginDate <= newEndDate) {
+          let value = date.formatDate(newBeginDate, "YYYY-MM-DD");
+          let price = this.prices.find((x) => x.startDate == value);
+          this.col.push({
+            value,
+            display: date.formatDate(newBeginDate, "DD"),
+            price,
+          });
+          newBeginDate = date.addToDate(newBeginDate, { days: 1 });
+        }
+        let after = 6 - date.formatDate(newBeginDate, "d");
+        for (let i = 0; i < after; i++) {
+          this.col.push({
+            value: "",
+          });
+        }
+      } catch (error) {
+        alert(error)
       }
     },
     chosenDateHandler(item) {

src/components/trip/smaple.vue

 <template>
-  <div class="q-mt-md">
+  <div class="q-mt-md" :class="{'q-px-md':$q.platform.is.mobile}">
     <div class="text-subtitle2 text-weight-bold">產品概要</div>
     <div class="row q-pt-md q-col-gutter-md">
         <div class="row items-center q-pt-mb"

src/pages/ScenicSpotTicket/details.vue

@@ -919,7 +919,7 @@ export default {
                   MailingMoney: MailingMoneyList[0].MailingMoney,
                   PriceList: x.PriceList,
                 }
-                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date&&x.Date>date.formatDate(Date.now(), 'YYYY-MM-DD')){
+                if(date.formatDate(Date.now(), 'YYYY/MM/DD')!=x.Date&&x.Date>date.formatDate(Date.now(), 'YYYY/MM/DD')){
                   arr.push(dataObj)
                 }
             })

src/pages/detailHotal.vue

@@ -55,7 +55,8 @@
         </q-field>
         <q-field stack-label label="人数及客房" standout
         class="q-ml-lg"
-        :style="{'min-width': $q.platform.is.desktop?'190px':'130px',}" dense>
+        :style="{'min-width': $q.platform.is.desktop?'190px':'130px',
+        'min-max': $q.platform.is.desktop?'190px':'col',}" dense>
           <div class="self-center full-width no-outline" tabindex="0">
              {{numberOfAdults}}成人 
             <template v-if="numberOfChildren>0"> {{numberOfChildren}}儿童</template> 
@@ -864,10 +865,10 @@ export default {
   mounted() {
     window.addEventListener("scroll", this.handleScroll);
     
-    this.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
-    this.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
-    this.msg.arrivalDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
-    this.msg.departureDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
+    this.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD')
+    this.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
+    this.msg.arrivalDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
+    this.msg.departureDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD')
     this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} `
     this.StartDate = this.msg.arrivalDate
     
@@ -930,8 +931,8 @@ export default {
     },
     // 日期筛选
     dateRangeHandler(e) {
-      let arrivalDate = `${e.from.year}-${e.from.month}-${e.from.day}`
-      let departureDate = `${e.to.year}-${e.to.month}-${e.to.day} `
+      let arrivalDate = `${e.from.year}/${e.from.month}/${e.from.day}`
+      let departureDate = `${e.to.year}/${e.to.month}/${e.to.day} `
       let liveNvm = this.dateDiffer(arrivalDate,departureDate)
       if(liveNvm>9||liveNvm==0) return this.$message.error(`住宿时间最多九晚,至少一晚`)
       this.liveNvm = liveNvm

src/pages/detailsCar.vue

@@ -740,7 +740,7 @@ export default {
   mounted() {
     window.addEventListener("scroll", this.handleScroll);
     const timeStamp = Date.now()
-    const formattedString = date.formatDate(timeStamp, 'YYYY-MM-DD')
+    const formattedString = date.formatDate(timeStamp, 'YYYY/MM/DD')
     this.currentYM = {
       year: date.formatDate(timeStamp, 'YYYY'),
       month: date.formatDate(timeStamp, 'MM'),
@@ -991,7 +991,7 @@ export default {
                   Count: 1,
                   safeMoney: 0,
                 }
-                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
+                if(date.formatDate(Date.now(), 'YYYY/MM/DD')!=x.Date){
                   arr.push(dataObj)
                 }
               }

src/pages/detailsNew.vue

@@ -845,6 +845,7 @@ export default {
         console.log(r.data,'r.data.data.id')
         if(r.data.OtherFile){
           this.tripImages=r.data.OtherFile
+          this.$forceUpdate();
         }
       })
     },

src/pages/hotel/orderForm.vue

@@ -650,8 +650,8 @@ export default {
                     this.parameters.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount+onlyJanpnase);
                     
                   })
-                  let hTIme = date.formatDate(date.addToDate(new Date(this.parameters.arrivalDate), { days: 1 }), 'YYYY-MM-DD')
-                let qTime = date.formatDate(date.addToDate(new Date(hTIme), { days: -1 }), 'YYYY-MM-DD')
+                  let hTIme = date.formatDate(date.addToDate(new Date(this.parameters.arrivalDate), { days: 1 }), 'YYYY/MM/DD')
+                let qTime = date.formatDate(date.addToDate(new Date(hTIme), { days: -1 }), 'YYYY/MM/DD')
                 this.checkInTimeH = qTime
                 this.checkInTimeQ = hTIme
           } else {