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/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

@@ -864,10 +864,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 +930,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/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 {

src/pages/usercenter/order/orderDetail.vue

@@ -8,7 +8,7 @@
                     <q-icon name="iconfont iconsuccess" :class="`${orderIcon}`" size="32px" :color="`${iconColor}`" />
                     <div class="q-ml-md text-h6 text-weight-bold" :class="`text-${iconColor}`">{{["","待付款","已付款", "已完成", "已取消"][detail.OrderStatus]}}</div>
                 </div>
-                <div class="q-mt-md f12 text-grey-6">請在您下單成功後30分鐘內完成支付，否則訂單會被系統自動取消</div>
+                <div class="q-mt-md f12 text-grey-6" v-if="detail.OrderStatus === 1">請在您下單成功後30分鐘內完成支付，否則訂單會被系統自動取消</div>
             </div>
             <div class="">
                 <div class="f12 text-grey-6">訂單編號：#{{detail.OrderNo}}</div>