Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
million
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
million
Commits
c386dda9
Commit
c386dda9
authored
Mar 21, 2023
by
沈良进
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/viitto/million
parents
955dbea0
eb408ddb
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
66 deletions
+35
-66
RoomCard.vue
src/components/hotal/RoomCard.vue
+1
-1
kkday.vue
src/components/searchdata/kkday.vue
+3
-1
orderForm.vue
src/pages/Pickuporder/orderForm.vue
+1
-6
details.vue
src/pages/ScenicSpotTicket/details.vue
+1
-5
orderForm.vue
src/pages/ScenicSpotTicket/orderForm.vue
+1
-6
detailHotal.vue
src/pages/detailHotal.vue
+26
-35
detailsCar.vue
src/pages/detailsCar.vue
+1
-6
detailsNew.vue
src/pages/detailsNew.vue
+1
-6
No files found.
src/components/hotal/RoomCard.vue
View file @
c386dda9
...
...
@@ -7,7 +7,7 @@
:class=
"
{'max-width':$q.platform.is.mobile?'100vw':'auto'}">
<div
class=
"non-selectable row"
>
<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;">
<div
class=
"relative rounded-borders overflow-hidden column bg-grey-1"
style=
"border: 1px solid #eee"
>
...
...
src/components/searchdata/kkday.vue
View file @
c386dda9
...
...
@@ -181,7 +181,7 @@
:
options
=
"optionsFn"
range
@
range
-
end
=
"dateRangeHandler"
mask
=
"YYYY
-MM-
DD"
mask
=
"YYYY
/MM/
DD"
><
/q-date
>
<
/div
>
<
/q-popup-proxy
>
...
...
@@ -507,6 +507,8 @@ export default {
this.dayArray.forEach((x) => {
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.goSearchHandler();
}
,
...
...
src/pages/Pickuporder/orderForm.vue
View file @
c386dda9
...
...
@@ -730,12 +730,7 @@ export default {
this
.
productType
=
12
}
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
message
:
r
.
data
.
message
,
position
:
"top"
,
timeout
:
2000
,
// 以毫秒为单位; 0意味着没有超时
}
);
this
.
$message
.
error
(
r
.
data
.
message
)
}
this
.
$q
.
loading
.
hide
();
}
,
...
...
src/pages/ScenicSpotTicket/details.vue
View file @
c386dda9
...
...
@@ -878,11 +878,7 @@ export default {
}
);
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
message
:
r
.
data
.
message
,
position
:
"top"
,
}
);
this
.
$message
.
error
(
r
.
data
.
message
)
}
this
.
$q
.
loading
.
hide
();
}
,
...
...
src/pages/ScenicSpotTicket/orderForm.vue
View file @
c386dda9
...
...
@@ -465,12 +465,7 @@
this
.
parameters
.
SelffetchAddress
=
''
}
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
message
:
r
.
data
.
message
,
position
:
"top"
,
timeout
:
2000
,
// 以毫秒为单位; 0意味着没有超时
});
this
.
$message
.
error
(
r
.
data
.
message
)
}
this
.
$q
.
loading
.
hide
();
},
...
...
src/pages/detailHotal.vue
View file @
c386dda9
...
...
@@ -67,7 +67,7 @@
<q-popup-proxy
:offset=
"[0, 10]"
>
<div
class=
"q-pa-lg q-py-lg bg-white"
>
<div
class=
"items-center"
:clss=
"{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"
>
:cl
a
ss=
"{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}"
>
<span
class=
"text-grey-7 product-price fz14 q-mr-lg"
>
客房
</span>
<div>
<q-input
...
...
@@ -82,7 +82,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -92,7 +92,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -105,7 +105,7 @@
<q-separator
color=
"grey-2"
class=
"q-my-md"
/>
<div
class=
"column"
v-for=
"(x,index) in msg.searchroomGroup"
:key=
"index"
>
<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>
<q-input
:style=
"{'width': $q.platform.is.desktop?'150px':'auto'}"
...
...
@@ -120,7 +120,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -130,7 +130,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -139,8 +139,8 @@
</
template
>
</q-input>
</div>
<div
class=
"items-center
q-ml-lg
"
:cl
ss=
"{'row':$q.platform.is.desktop,'column
':$q.platform.is.mobile}"
>
<div
class=
"items-center"
:cl
ass=
"{'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>
<q-input
:style=
"{'width': $q.platform.is.desktop?'150px':'auto'}"
...
...
@@ -155,7 +155,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -165,7 +165,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -198,12 +198,10 @@
</div>
<q-popup-proxy
:offset=
"[0, 10]"
>
<div
class=
"q-pa-lg q-py-lg bg-white"
>
<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>
<div>
<q-input
:style=
"{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model=
"roomGroup"
mask=
"#"
reverse-fill-mask
...
...
@@ -214,7 +212,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -224,7 +222,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -237,8 +235,8 @@
<q-separator
color=
"grey-2"
class=
"q-my-md"
/>
<div
class=
"column"
v-for=
"(x,index) in msg.searchroomGroup"
:key=
"index"
>
<div
class=
"row no-wrap"
>
<div
class=
"
items-center"
:clss=
"{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}
"
>
<span
class=
"text-grey-7
product-price
fz14 q-mr-lg"
>
成人
</span>
<div
class=
"
column
"
>
<span
class=
"text-grey-7 fz14 q-mr-lg"
>
成人
</span>
<q-input
:style=
"{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model=
"x.numberOfAdults"
...
...
@@ -252,7 +250,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -262,7 +260,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -271,9 +269,9 @@
</
template
>
</q-input>
</div>
<div
class=
"items-center
q-ml-lg
"
:cl
ss=
"{'row':$q.platform.is.desktop,'column
':$q.platform.is.mobile}"
>
<span
class=
"text-grey-7
product-price
fz14 q-mr-lg"
>
儿童
</span>
<div
class=
"items-center"
:cl
ass=
"{'row q-ml-lg':$q.platform.is.desktop,'q-ml-sm
':$q.platform.is.mobile}"
>
<span
class=
"text-grey-7 fz14 q-mr-lg"
>
儿童
</span>
<q-input
:style=
"{'width': $q.platform.is.desktop?'150px':'auto'}"
v-model=
"x.numberOfChildren"
...
...
@@ -287,7 +285,7 @@
<
template
v-slot:prepend
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"remove"
...
...
@@ -297,7 +295,7 @@
<
template
v-slot:append
>
<q-btn
color=
"primary"
size=
"sm
"
:size=
"$q.platform.is.desktop?'sm':'xs'
"
class=
"q-px-none"
flat
icon=
"add"
...
...
@@ -500,15 +498,8 @@
style=
"max-width: 1200px; margin-left: auto; margin-right: auto"
>
<div
class=
"text-h6"
>
選擇方案
</div>
<div
style=
"
background: #fff;
padding: 20px;
border-radius: 10px;
margin-top: 20px;
"
>
class=
"rounded-borders bg-white q-pa-md q-mt-md"
>
<div
v-if=
"$q.platform.is.mobile"
>
<div
class=
"row items-center justify-end"
>
<span
class=
"product-price text-h6 q-mr-md"
...
...
@@ -656,9 +647,9 @@
</div>
<div
class=
"row no-wrap overflow-hidden"
>
<span
class=
"text-weight-bold"
>
水疗
</span>
<div
class=
"column col q-pl-md"
>
<div
class=
"scroll"
:style=
"{'max-width': $q.platform.is.mobile?'85vw':'auto'}"
>
<table
class=
"hotel-details-table q-pb-md"
>
<div
class=
"column col q-pl-md
overflow-hidden
"
>
<div
class=
"scroll
q-pb-xs
"
:style=
"{'max-width': $q.platform.is.mobile?'85vw':'auto'}"
>
<table
class=
"hotel-details-table q-pb-md
q-mr-md
"
>
<tr>
<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 {
});
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
message
:
r
.
data
.
message
,
position
:
"top"
,
timeout
:
2000
,
// 以毫秒为单位; 0意味着没有超时
});
this
.
$message
.
error
(
r
.
data
.
message
)
}
this
.
$q
.
loading
.
hide
();
},
...
...
src/pages/detailsNew.vue
View file @
c386dda9
...
...
@@ -1219,12 +1219,7 @@ export default {
}
});
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
message
:
r
.
data
.
message
,
position
:
"top"
,
timeout
:
2000
,
// 以毫秒为单位; 0意味着没有超时
});
this
.
$message
.
error
(
r
.
data
.
message
)
}
this
.
$q
.
loading
.
hide
();
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment