Commit eb81da5e authored by youjie's avatar youjie

no message

parent 9bd6f374
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
v-if=" v-if="
(currentHeight > navs[0].top + 100 && $q.platform.is.desktop) || (currentHeight > navs[0].top + 100 && $q.platform.is.desktop) ||
(currentHeight > priceListHeight && (currentHeight > priceListHeight &&
currentHeight < navs[0].top&&$q.platform.is.mobile) currentHeight < navs[0].top&&$q.platform.is.mobile)||$q.platform.is.mobile
" "
:style="{ transform: $q.platform.is.mobile?0:stickyHeight }" :style="{ transform: $q.platform.is.mobile?0:stickyHeight }"
> >
...@@ -178,15 +178,15 @@ ...@@ -178,15 +178,15 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- box-shadow: 0 2px 8px rgb(0 0 0 / 20%); -->
<div <div
class="bg-white" class="bg-white"
style=" style="
position: fixed; position: fixed;
left: 0; left: 0;
right: 0; right: 0;
top: -1px; top: 52px;
border-top: 1px solid #eee; border-top: 1px solid #eee;
box-shadow: 0 2px 8px rgb(0 0 0 / 20%);
z-index: 999; z-index: 999;
" "
v-if="currentHeight > priceListHeight + 800 && $q.platform.is.mobile" v-if="currentHeight > priceListHeight + 800 && $q.platform.is.mobile"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
(currentHeight > navs[0].top + 100 && $q.platform.is.desktop) || (currentHeight > navs[0].top + 100 && $q.platform.is.desktop) ||
(currentHeight > priceListHeight && (currentHeight > priceListHeight &&
currentHeight < navs[0].top && currentHeight < navs[0].top &&
$q.platform.is.mobile) $q.platform.is.mobile)|| $q.platform.is.mobile
" "
:style="{ transform: $q.platform.is.mobile?0:stickyHeight }" :style="{ transform: $q.platform.is.mobile?0:stickyHeight }"
> >
...@@ -233,15 +233,15 @@ ...@@ -233,15 +233,15 @@
</div> </div>
</div> </div>
</div> </div>
<!-- box-shadow: 0 2px 8px rgb(0 0 0 / 20%); -->
<div <div
class="bg-white" class="bg-white"
style=" style="
position: fixed; position: fixed;
left: 0; left: 0;
right: 0; right: 0;
top: -1px; top: 52px;
border-top: 1px solid #eee; border-top: 1px solid #eee;
box-shadow: 0 2px 8px rgb(0 0 0 / 20%);
z-index: 999; z-index: 999;
" "
v-if="currentHeight > priceListHeight + 800 && $q.platform.is.mobile" v-if="currentHeight > priceListHeight + 800 && $q.platform.is.mobile"
...@@ -277,23 +277,24 @@ ...@@ -277,23 +277,24 @@
v-if="$q.platform.is.mobile" v-if="$q.platform.is.mobile"
> >
<div style="background: rgba(0, 0, 0, 0.05);border-radius: 4px;" <div style="background: rgba(0, 0, 0, 0.05);border-radius: 4px;"
class="q-mt-md q-pa-sm relative" class="q-mt-md q-pa-sm relative">
@click="showDate = !showDate"> <div @click="showDate = !showDate">
<div class="fz12 absolute" style="left: 10px;top:5px">選擇日期、選項</div> <div class="fz12 absolute" style="left: 10px;top:5px">選擇日期、選項</div>
<div class="fz14 self-center full-width no-outline q-pt-md " tabindex="0"> <div class="fz14 self-center full-width no-outline q-pt-md " tabindex="0">
{{ currentPrice.startDate }} {{ currentPrice.startDate }}
</div> </div>
</div> </div>
<popup mode="top" v-model="showDate"> <div class="fixed" @click="showDate = !showDate"
<q-card flat class="rounded-borders"> style="z-index: 1000;left: 0;top: 0;bottom: 0;right: 0;background: rgba(0, 0, 0, 0.5);" v-show="showDate">
<calendar </div>
<calendar v-show="showDate"
class="bg-white q-pa-md" class="bg-white q-pa-md"
:priceList="dataList.priceList" :priceList="dataList.priceList"
@change="changeChosenDateHandler" @change="changeChosenDateHandler"
ref="calendarMobile" ref="calendarMobile"
></calendar> ></calendar>
</q-card>
</popup> </div>
<order-preview <order-preview
:travel="dataList" :travel="dataList"
:price="currentPrice" :price="currentPrice"
...@@ -1169,7 +1170,7 @@ export default { ...@@ -1169,7 +1170,7 @@ export default {
if (this.$q.platform.is.mobile) this.$refs.calendarMobile.reset(); if (this.$q.platform.is.mobile) this.$refs.calendarMobile.reset();
else this.$refs.calendar.reset(); else this.$refs.calendar.reset();
}, },
changeChosenDateHandler(val) { changeChosenDateHandler(val,type) {
val.price.version = new Date().getTime(); val.price.version = new Date().getTime();
this.currentPrice = JSON.parse(JSON.stringify(val.price)); this.currentPrice = JSON.parse(JSON.stringify(val.price));
this.currentPrice.RealPrice = this.currentPrice.RealPrice this.currentPrice.RealPrice = this.currentPrice.RealPrice
...@@ -1192,8 +1193,9 @@ export default { ...@@ -1192,8 +1193,9 @@ export default {
}); });
} }
} }
if (this.$q.platform.is.mobile) { if (this.$q.platform.is.mobile&&!type) {
this.$refs.qDateProxy.hide(); // this.$refs.qDateProxy.hide();
this.showDate = false;
} }
this.$forceUpdate(); this.$forceUpdate();
this.$nextTick(() => { this.$nextTick(() => {
...@@ -1331,11 +1333,6 @@ export default { ...@@ -1331,11 +1333,6 @@ export default {
this.moreDays = 1 this.moreDays = 1
} }
}, 1000); }, 1000);
if(this.$q.platform.is.mobile){
setTimeout(() => {
this.showDate = false;
}, 100);
}
try { try {
document document
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment