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
41e20c1a
Commit
41e20c1a
authored
Mar 17, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日期-改/
parent
f4ecb223
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
orderPreview.vue
src/components/car/orderPreview.vue
+1
-1
details.vue
src/pages/ScenicSpotTicket/details.vue
+1
-1
detailHotal.vue
src/pages/detailHotal.vue
+6
-6
detailsCar.vue
src/pages/detailsCar.vue
+2
-2
orderForm.vue
src/pages/hotel/orderForm.vue
+2
-2
No files found.
src/components/car/orderPreview.vue
View file @
41e20c1a
...
@@ -248,7 +248,7 @@ export default {
...
@@ -248,7 +248,7 @@ export default {
isSupportChildren
:
1
,
isSupportChildren
:
1
,
safeMoney
:
0
,
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
)
arr
.
push
(
dataObj
)
}
}
}
}
...
...
src/pages/ScenicSpotTicket/details.vue
View file @
41e20c1a
...
@@ -919,7 +919,7 @@ export default {
...
@@ -919,7 +919,7 @@ export default {
MailingMoney
:
MailingMoneyList
[
0
].
MailingMoney
,
MailingMoney
:
MailingMoneyList
[
0
].
MailingMoney
,
PriceList
:
x
.
PriceList
,
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
)
arr
.
push
(
dataObj
)
}
}
}
)
}
)
...
...
src/pages/detailHotal.vue
View file @
41e20c1a
...
@@ -864,10 +864,10 @@ export default {
...
@@ -864,10 +864,10 @@ export default {
mounted
()
{
mounted
()
{
window
.
addEventListener
(
"scroll"
,
this
.
handleScroll
);
window
.
addEventListener
(
"scroll"
,
this
.
handleScroll
);
this
.
dateRange
.
to
=
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
.
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
.
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
.
msg
.
departureDate
=
date
.
formatDate
(
date
.
addToDate
(
new
Date
(),
{
days
:
9
}),
'YYYY
/MM/
DD'
)
this
.
dateRangeFormat
=
`
${
this
.
msg
.
arrivalDate
}
-
${
this
.
msg
.
departureDate
}
`
this
.
dateRangeFormat
=
`
${
this
.
msg
.
arrivalDate
}
-
${
this
.
msg
.
departureDate
}
`
this
.
StartDate
=
this
.
msg
.
arrivalDate
this
.
StartDate
=
this
.
msg
.
arrivalDate
...
@@ -930,8 +930,8 @@ export default {
...
@@ -930,8 +930,8 @@ export default {
},
},
// 日期筛选
// 日期筛选
dateRangeHandler
(
e
)
{
dateRangeHandler
(
e
)
{
let
arrivalDate
=
`
${
e
.
from
.
year
}
-
${
e
.
from
.
month
}
-
${
e
.
from
.
day
}
`
let
arrivalDate
=
`
${
e
.
from
.
year
}
/
${
e
.
from
.
month
}
/
${
e
.
from
.
day
}
`
let
departureDate
=
`
${
e
.
to
.
year
}
-
${
e
.
to
.
month
}
-
${
e
.
to
.
day
}
`
let
departureDate
=
`
${
e
.
to
.
year
}
/
${
e
.
to
.
month
}
/
${
e
.
to
.
day
}
`
let
liveNvm
=
this
.
dateDiffer
(
arrivalDate
,
departureDate
)
let
liveNvm
=
this
.
dateDiffer
(
arrivalDate
,
departureDate
)
if
(
liveNvm
>
9
||
liveNvm
==
0
)
return
this
.
$message
.
error
(
`住宿时间最多九晚,至少一晚`
)
if
(
liveNvm
>
9
||
liveNvm
==
0
)
return
this
.
$message
.
error
(
`住宿时间最多九晚,至少一晚`
)
this
.
liveNvm
=
liveNvm
this
.
liveNvm
=
liveNvm
...
...
src/pages/detailsCar.vue
View file @
41e20c1a
...
@@ -740,7 +740,7 @@ export default {
...
@@ -740,7 +740,7 @@ export default {
mounted
()
{
mounted
()
{
window
.
addEventListener
(
"scroll"
,
this
.
handleScroll
);
window
.
addEventListener
(
"scroll"
,
this
.
handleScroll
);
const
timeStamp
=
Date
.
now
()
const
timeStamp
=
Date
.
now
()
const
formattedString
=
date
.
formatDate
(
timeStamp
,
'YYYY
-MM-
DD'
)
const
formattedString
=
date
.
formatDate
(
timeStamp
,
'YYYY
/MM/
DD'
)
this
.
currentYM
=
{
this
.
currentYM
=
{
year
:
date
.
formatDate
(
timeStamp
,
'YYYY'
),
year
:
date
.
formatDate
(
timeStamp
,
'YYYY'
),
month
:
date
.
formatDate
(
timeStamp
,
'MM'
),
month
:
date
.
formatDate
(
timeStamp
,
'MM'
),
...
@@ -991,7 +991,7 @@ export default {
...
@@ -991,7 +991,7 @@ export default {
Count
:
1
,
Count
:
1
,
safeMoney
:
0
,
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
)
arr
.
push
(
dataObj
)
}
}
}
}
...
...
src/pages/hotel/orderForm.vue
View file @
41e20c1a
...
@@ -650,8 +650,8 @@ export default {
...
@@ -650,8 +650,8 @@ export default {
this
.
parameters
.
totalPriceJapanese
+=
parseFloat
(
AdultJapanCount
+
childJapanCount
+
onlyJanpnase
);
this
.
parameters
.
totalPriceJapanese
+=
parseFloat
(
AdultJapanCount
+
childJapanCount
+
onlyJanpnase
);
})
})
let
hTIme
=
date
.
formatDate
(
date
.
addToDate
(
new
Date
(
this
.
parameters
.
arrivalDate
),
{
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'
)
let
qTime
=
date
.
formatDate
(
date
.
addToDate
(
new
Date
(
hTIme
),
{
days
:
-
1
}),
'YYYY
/MM/
DD'
)
this
.
checkInTimeH
=
qTime
this
.
checkInTimeH
=
qTime
this
.
checkInTimeQ
=
hTIme
this
.
checkInTimeQ
=
hTIme
}
else
{
}
else
{
...
...
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