Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
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
华国豪
Athena
Commits
ef1bd497
Commit
ef1bd497
authored
Mar 06, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘修改部分’
parent
8bf277fe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
confirmationOrderDownLoad.vue
src/components/global/confirmationOrderDownLoad.vue
+3
-3
detailTwo.vue
src/components/mall/detailTwo.vue
+2
-2
router.js
src/router.js
+1
-1
No files found.
src/components/global/confirmationOrderDownLoad.vue
View file @
ef1bd497
...
...
@@ -2101,7 +2101,7 @@
},
setDate
:
function
(
j
)
{
let
stDate
=
this
.
sonData
.
currentPriceInfo
.
startDate
let
stDate
=
this
.
sonData
.
currentPriceInfo
&&
this
.
sonData
.
currentPriceInfo
.
startDate
?
this
.
sonData
.
currentPriceInfo
.
startDate
:
''
if
(
j
===
0
)
{
return
stDate
}
else
{
...
...
@@ -2174,7 +2174,7 @@
init
()
{
if
(
true
)
{
let
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
sonData
))
this
.
orderTripdiff
=
data
.
currentPriceInfo
.
priceFlight
;
this
.
orderTripdiff
=
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
priceFlight
?
data
.
currentPriceInfo
.
priceFlight
:
[]
;
if
(
this
.
orderTripdiff
&&
this
.
orderTripdiff
.
flightInfoJson
)
{
this
.
orderTripdiff
.
travelOrderFlightList
=
JSON
.
parse
(
this
.
orderTripdiff
.
flightInfoJson
);
}
...
...
@@ -2245,7 +2245,7 @@
this
.
feature
=
data
.
feature
this
.
showType
=
this
.
feature
.
featureType
;
this
.
isDirect
=
data
.
isDirect
;
if
(
data
.
currentPriceInfo
.
priceFlight
.
length
>
0
)
{
if
(
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
priceFlight
.
length
>
0
)
{
data
.
currentPriceInfo
.
priceFlight
.
forEach
((
x
,
i
)
=>
{
if
(
i
==
0
)
{
x
.
dayNum
=
1
;
...
...
src/components/mall/detailTwo.vue
View file @
ef1bd497
...
...
@@ -925,8 +925,8 @@ export default {
// })
// }
this
.
priceList
=
data
.
priceList
;
this
.
clickDate
=
data
.
currentPriceInfo
.
startDate
;
this
.
FlightList
=
data
.
currentPriceInfo
.
priceFlight
;
this
.
clickDate
=
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
startDate
?
data
.
currentPriceInfo
.
startDate
:
''
;
this
.
FlightList
=
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
priceFlight
?
data
.
currentPriceInfo
.
priceFlight
:
''
;
this
.
dataList
=
data
;
this
.
toDayObj
=
this
.
priceList
&&
this
.
priceList
.
length
>
0
?
this
.
priceList
[
0
]:
null
;
this
.
imgCover
=
JSON
.
parse
(
this
.
dataList
.
imgCover
);
...
...
src/router.js
View file @
ef1bd497
...
...
@@ -49,7 +49,7 @@ export default new Router({
}
},
{
path
:
'/detailTwo/:id/:pre'
,
path
:
'/detailTwo/:id/:
tcid/:
pre'
,
name
:
'detailTwo'
,
component
:
resolve
=>
require
([
'@/components/mall/detailTwo'
],
resolve
),
meta
:
{
...
...
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