Skip to content

M
million
Commit c386dda9 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 955dbea0 eb408ddb
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 66 deletions
src/components/hotal/RoomCard.vue
View file @ c386dda9
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:class="{'max-width':$q.platform.is.mobile?'100vw':'auto'}"> :class="{'max-width':$q.platform.is.mobile?'100vw':'auto'}">
<div class="non-selectable row"> <div class="non-selectable row">
<div class="q-pr-md cursor-pointer" @click="showImageHandler(item.roomImageURL,item.images)" <div class="q-pr-md cursor-pointer" @click="showImageHandler(item.roomImageURL,item.images)"
:class="{'col-2':$q.platform.is.desktop,'col-6':$q.platform.is.mobile}" :class="{'col-2':$q.platform.is.desktop,'col-5':$q.platform.is.mobile}"
style="border-right: 1px solid #F5F5F5;"> style="border-right: 1px solid #F5F5F5;">
<div class="relative rounded-borders overflow-hidden column bg-grey-1" <div class="relative rounded-borders overflow-hidden column bg-grey-1"
style="border: 1px solid #eee"> style="border: 1px solid #eee">
......
src/components/searchdata/kkday.vue
View file @ c386dda9
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
:options="optionsFn" :options="optionsFn"
range range
@range-end="dateRangeHandler" @range-end="dateRangeHandler"
mask="YYYY-MM-DD" mask="YYYY/MM/DD"
></q-date> ></q-date>
</div> </div>
</q-popup-proxy> </q-popup-proxy>
...@@ -507,6 +507,8 @@ export default { ...@@ -507,6 +507,8 @@ export default {
this.dayArray.forEach((x) => { this.dayArray.forEach((x) => {
x.checked = false; x.checked = false;
}); });
this.msg.startDate = date.formatDate(new Date(this.qMsg.startDate), "YYYY/MM/DD")
this.msg.endDate = date.formatDate(new Date(this.qMsg.endDate), "YYYY/MM/DD")
this.dateRange = { from: this.msg.startDate, to: this.msg.endDate }; this.dateRange = { from: this.msg.startDate, to: this.msg.endDate };
this.goSearchHandler(); this.goSearchHandler();
}, },
......
src/pages/Pickuporder/orderForm.vue
View file @ c386dda9
...@@ -730,12 +730,7 @@ export default { ...@@ -730,12 +730,7 @@ export default {
this.productType = 12 this.productType = 12
} }
} else { } else {
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
} }
this.$q.loading.hide(); this.$q.loading.hide();
}, },
......
src/pages/ScenicSpotTicket/details.vue
View file @ c386dda9
...@@ -878,11 +878,7 @@ export default { ...@@ -878,11 +878,7 @@ export default {
}); });
} else { } else {
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
});
} }
this.$q.loading.hide(); this.$q.loading.hide();
}, },
......
src/pages/ScenicSpotTicket/orderForm.vue
View file @ c386dda9
...@@ -465,12 +465,7 @@ ...@@ -465,12 +465,7 @@
this.parameters.SelffetchAddress = '' this.parameters.SelffetchAddress = ''
} }
} else { } else {
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
} }
this.$q.loading.hide(); this.$q.loading.hide();
}, },
......
src/pages/detailHotal.vue
View file @ c386dda9
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<q-popup-proxy :offset="[0, 10]"> <q-popup-proxy :offset="[0, 10]">
<div class="q-pa-lg q-py-lg bg-white"> <div class="q-pa-lg q-py-lg bg-white">
<div class="items-center" <div class="items-center"
:clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"> :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<span class="text-grey-7 product-price fz14 q-mr-lg">客房</span> <span class="text-grey-7 product-price fz14 q-mr-lg">客房</span>
<div> <div>
<q-input <q-input
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<q-separator color="grey-2" class="q-my-md" /> <q-separator color="grey-2" class="q-my-md" />
<div class="column" v-for="(x,index) in msg.searchroomGroup" :key="index"> <div class="column" v-for="(x,index) in msg.searchroomGroup" :key="index">
<div class="row no-wrap"> <div class="row no-wrap">
<div class="items-center" :clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"> <div class="row items-center">
<span class="text-grey-7 product-price fz14 q-mr-lg">成人</span> <span class="text-grey-7 product-price fz14 q-mr-lg">成人</span>
<q-input <q-input
:style="{'width': $q.platform.is.desktop?'150px':'auto'}" :style="{'width': $q.platform.is.desktop?'150px':'auto'}"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="items-center q-ml-lg" <div class="items-center"
:clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"> :class="{'row q-ml-lg':$q.platform.is.desktop,'q-ml-sm':$q.platform.is.mobile}">
<span class="text-grey-7 product-price fz14 q-mr-lg">儿童</span> <span class="text-grey-7 product-price fz14 q-mr-lg">儿童</span>
<q-input <q-input
:style="{'width': $q.platform.is.desktop?'150px':'auto'}" :style="{'width': $q.platform.is.desktop?'150px':'auto'}"
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -198,12 +198,10 @@ ...@@ -198,12 +198,10 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]"> <q-popup-proxy :offset="[0, 10]">
<div class="q-pa-lg q-py-lg bg-white"> <div class="q-pa-lg q-py-lg bg-white">
<div class="items-center" <div class="column">
:clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<span class="text-grey-7 product-price fz14 q-mr-lg">客房</span> <span class="text-grey-7 product-price fz14 q-mr-lg">客房</span>
<div> <div>
<q-input <q-input
:style="{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model="roomGroup" v-model="roomGroup"
mask="#" mask="#"
reverse-fill-mask reverse-fill-mask
...@@ -214,7 +212,7 @@ ...@@ -214,7 +212,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -224,7 +222,7 @@ ...@@ -224,7 +222,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -237,8 +235,8 @@ ...@@ -237,8 +235,8 @@
<q-separator color="grey-2" class="q-my-md" /> <q-separator color="grey-2" class="q-my-md" />
<div class="column" v-for="(x,index) in msg.searchroomGroup" :key="index"> <div class="column" v-for="(x,index) in msg.searchroomGroup" :key="index">
<div class="row no-wrap"> <div class="row no-wrap">
<div class="items-center" :clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"> <div class="column">
<span class="text-grey-7 product-price fz14 q-mr-lg">成人</span> <span class="text-grey-7 fz14 q-mr-lg">成人</span>
<q-input <q-input
:style="{'width': $q.platform.is.desktop?'150px':'auto'}" :style="{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model="x.numberOfAdults" v-model="x.numberOfAdults"
...@@ -252,7 +250,7 @@ ...@@ -252,7 +250,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -262,7 +260,7 @@ ...@@ -262,7 +260,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -271,9 +269,9 @@ ...@@ -271,9 +269,9 @@
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="items-center q-ml-lg" <div class="items-center"
:clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"> :class="{'row q-ml-lg':$q.platform.is.desktop,'q-ml-sm':$q.platform.is.mobile}">
<span class="text-grey-7 product-price fz14 q-mr-lg">儿童</span> <span class="text-grey-7 fz14 q-mr-lg">儿童</span>
<q-input <q-input
:style="{'width': $q.platform.is.desktop?'150px':'auto'}" :style="{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model="x.numberOfChildren" v-model="x.numberOfChildren"
...@@ -287,7 +285,7 @@ ...@@ -287,7 +285,7 @@
<template v-slot:prepend> <template v-slot:prepend>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
...@@ -297,7 +295,7 @@ ...@@ -297,7 +295,7 @@
<template v-slot:append> <template v-slot:append>
<q-btn <q-btn
color="primary" color="primary"
size="sm" :size="$q.platform.is.desktop?'sm':'xs'"
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
...@@ -500,15 +498,8 @@ ...@@ -500,15 +498,8 @@
style="max-width: 1200px; margin-left: auto; margin-right: auto" style="max-width: 1200px; margin-left: auto; margin-right: auto"
> >
<div class="text-h6">選擇方案</div> <div class="text-h6">選擇方案</div>
<div <div
style=" class="rounded-borders bg-white q-pa-md q-mt-md">
background: #fff;
padding: 20px;
border-radius: 10px;
margin-top: 20px;
"
>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<span class="product-price text-h6 q-mr-md" <span class="product-price text-h6 q-mr-md"
...@@ -656,9 +647,9 @@ ...@@ -656,9 +647,9 @@
</div> </div>
<div class="row no-wrap overflow-hidden"> <div class="row no-wrap overflow-hidden">
<span class="text-weight-bold">水疗</span> <span class="text-weight-bold">水疗</span>
<div class="column col q-pl-md"> <div class="column col q-pl-md overflow-hidden">
<div class="scroll" :style="{'max-width': $q.platform.is.mobile?'85vw':'auto'}"> <div class="scroll q-pb-xs" :style="{'max-width': $q.platform.is.mobile?'85vw':'auto'}">
<table class="hotel-details-table q-pb-md"> <table class="hotel-details-table q-pb-md q-mr-md">
<tr> <tr>
<td colspan="3" class="td01">室外</td> <td colspan="3" class="td01">室外</td>
<td colspan="3" class="td01">屋内</td> <td colspan="3" class="td01">屋内</td>
......
src/pages/detailsCar.vue
View file @ c386dda9
...@@ -951,12 +951,7 @@ export default { ...@@ -951,12 +951,7 @@ export default {
}); });
} else { } else {
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
} }
this.$q.loading.hide(); this.$q.loading.hide();
}, },
......
src/pages/detailsNew.vue
View file @ c386dda9
...@@ -1219,12 +1219,7 @@ export default { ...@@ -1219,12 +1219,7 @@ export default {
} }
}); });
} else { } else {
this.$q.notify({ this.$message.error(r.data.message)
type: "negative",
message: r.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
} }
this.$q.loading.hide(); this.$q.loading.hide();
}, },
......
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