Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigwood
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
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
罗超
bigwood
Commits
5b17da8b
Commit
5b17da8b
authored
Sep 21, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
0716dda3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
58 additions
and
27 deletions
+58
-27
detailsNew.vue
src/pages/scheduledTrip/detailsNew.vue
+58
-27
No files found.
src/pages/scheduledTrip/detailsNew.vue
View file @
5b17da8b
...
@@ -240,7 +240,7 @@
...
@@ -240,7 +240,7 @@
<div
class=
"q-pb-xl"
v-if=
"tripImages&&tripImages.length>0"
<div
class=
"q-pb-xl"
v-if=
"tripImages&&tripImages.length>0"
ref=
"diyContext"
>
ref=
"diyContext"
>
<div
v-for=
"(x,i) in tripImages"
>
<div
v-for=
"(x,i) in tripImages"
:key=
"i"
>
<img
v-if=
"dataList.teamType!=2"
class=
"block"
:src=
"x.header"
style=
"width: 100%;"
>
<img
v-if=
"dataList.teamType!=2"
class=
"block"
:src=
"x.header"
style=
"width: 100%;"
>
<img
class=
"block"
:src=
"x.page"
style=
"width: 100%;"
>
<img
class=
"block"
:src=
"x.page"
style=
"width: 100%;"
>
<div
v-if=
"dataList.teamType!=2"
class=
"tripImages-footer"
>
<div
v-if=
"dataList.teamType!=2"
class=
"tripImages-footer"
>
...
@@ -252,11 +252,21 @@
...
@@ -252,11 +252,21 @@
<div
class=
"q-mt-md q-pb-xl"
id=
"setZoom"
ref=
"diyContext"
:style=
"{ zoom: zoomDiyContext }"
v-html=
"dataList.feature.featureHtml"
v-else-if=
"dataList.feature.featureHtml != ''"
></div>
<div
class=
"q-mt-md q-pb-xl"
id=
"setZoom"
ref=
"diyContext"
:style=
"{ zoom: zoomDiyContext }"
v-html=
"dataList.feature.featureHtml"
v-else-if=
"dataList.feature.featureHtml != ''"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"product"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
{{$t('v103.scheduledTripDetails.righttitle.d2')}}
</div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"product"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
{{$t('v103.scheduledTripDetails.righttitle.d2')}}
</div>
<div
class=
"q-pb-xl"
>
<div
class=
"q-pb-xl"
>
<smaple
:trip=
"dataList"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></smaple>
<smaple
:trip=
"dataList"
class=
"q-pb-xl"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></smaple>
<
template
v-if=
"dataList.dayList.length<=3"
>
<div
v-if=
"detailsImageList&&detailsImageList.length>0"
v-for=
"(x,i) in detailsImageList"
:key=
"i"
:id=
"`days_${i}`"
>
<div
class=
"tripImages-footer"
v-if=
"!dataList.tripColor"
style=
"padding: 20px 0;"
></div>
<img
v-if=
"dataList.tripColor"
class=
"block"
:src=
"x.header"
style=
"width: 100%;"
>
<img
class=
"block"
:src=
"x.page"
style=
"width: 100%;"
>
<div
class=
"tripImages-footer"
>
<img
v-if=
"dataList.tripColor"
class=
"block"
:src=
"x.footer"
style=
"width: 100%;"
>
</div>
</div>
<
template
v-if=
"dataList.dayList.length<=3&&!detailsImageList"
>
<trip
:trip=
"dataList"
@
change=
"changeTripShowHandler"
></trip>
<trip
:trip=
"dataList"
@
change=
"changeTripShowHandler"
></trip>
</
template
>
</
template
>
<
template
v-
else
>
<
template
v-
if=
"dataList.dayList.length>3&&!detailsImageList"
>
<block
:currentHeightDay=
"currentHeight"
:days=
"days"
:tripList=
"dayList"
:isDirect=
"isDirect"
:clickDate=
"clickDate"
></block>
<block
:currentHeightDay=
"currentHeight"
:days=
"days"
:tripList=
"dayList"
:isDirect=
"isDirect"
:clickDate=
"clickDate"
></block>
</
template
>
</
template
>
</div>
</div>
...
@@ -293,7 +303,7 @@
...
@@ -293,7 +303,7 @@
class=
"text-subtitle2 text-grey-6 cursor-pointer q-mb-md"
class=
"text-subtitle2 text-grey-6 cursor-pointer q-mb-md"
v-for=
"(x, i) in navs"
v-for=
"(x, i) in navs"
:key=
"i"
:key=
"i"
@
click=
"goScrollHandler(x.top +
2
0)"
@
click=
"goScrollHandler(x.top +
5
0)"
:class=
"
{
:class=
"
{
'active-trip-module': currentHeight >= x.top
&&
(i == navs.length - 1 || currentHeight
<
navs
[
i
+
1
].
top
)
'active-trip-module': currentHeight >= x.top
&&
(i == navs.length - 1 || currentHeight
<
navs
[
i
+
1
].
top
)
}"
}"
...
@@ -459,26 +469,6 @@ export default defineComponent({
...
@@ -459,26 +469,6 @@ export default defineComponent({
data
.
TripConfig
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'baseifo'
))
data
.
TripConfig
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'baseifo'
))
}
}
watch
(()
=>
data
.
days
,(
n
,
o
)
=>
{
data
.
days
=
n
},{
immediate
:
true
,
deep
:
true
})
watch
(()
=>
data
.
currentHeight
,(
n
,
o
)
=>
{
data
.
navs
.
forEach
((
x
,
i
)
=>
{
if
(
x
.
top
&&
data
.
currentHeight
>=
x
.
top
&&
(
i
==
data
.
navs
.
length
-
1
||
data
.
currentHeight
<
data
.
navs
[
i
+
1
].
top
)
)
{
if
(
data
.
tab
!=
x
.
display
)
{
data
.
tab
=
x
.
display
;
return
;
}
else
{
return
;
}
}
});
},{
immediate
:
true
,
deep
:
false
})
const
methods
=
{
const
methods
=
{
changeShowOrderPreviewHandler
()
{
changeShowOrderPreviewHandler
()
{
data
.
showOrderPreview
=
!
data
.
showOrderPreview
;
data
.
showOrderPreview
=
!
data
.
showOrderPreview
;
...
@@ -580,10 +570,11 @@ export default defineComponent({
...
@@ -580,10 +570,11 @@ export default defineComponent({
if
(
r
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
if
(
r
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
if
(
r
.
data
.
data
)
{
if
(
r
.
data
.
data
)
{
data
.
tripImages
=
[]
data
.
tripImages
=
[]
if
(
r
.
data
.
data
.
feature
.
tripImageList
.
length
>
0
){
data
.
detailsImageList
=
[]
let
OtherFile
=
r
.
data
.
data
.
feature
.
tripImageList
let
header
=
r
.
data
.
data
.
feature
.
headerImage
let
header
=
r
.
data
.
data
.
feature
.
headerImage
let
footer
=
r
.
data
.
data
.
feature
.
footerImage
let
footer
=
r
.
data
.
data
.
feature
.
footerImage
if
(
r
.
data
.
data
.
feature
.
tripImageList
.
length
>
0
){
let
OtherFile
=
r
.
data
.
data
.
feature
.
tripImageList
OtherFile
.
forEach
((
x
,
i
)
=>
{
OtherFile
.
forEach
((
x
,
i
)
=>
{
let
obj
=
{
let
obj
=
{
header
:
header
,
header
:
header
,
...
@@ -592,6 +583,17 @@ export default defineComponent({
...
@@ -592,6 +583,17 @@ export default defineComponent({
}
}
data
.
tripImages
.
push
(
obj
)
data
.
tripImages
.
push
(
obj
)
})
})
}
if
(
r
.
data
.
data
.
feature
.
detailsImageList
.
length
>
0
){
let
OtherFile
=
r
.
data
.
data
.
feature
.
detailsImageList
OtherFile
.
forEach
((
x
,
i
)
=>
{
let
obj
=
{
header
:
header
,
page
:
x
,
footer
:
footer
,
}
data
.
detailsImageList
.
push
(
obj
)
})
}
}
console
.
log
(
data
.
tripImages
,
'-----'
)
console
.
log
(
data
.
tripImages
,
'-----'
)
// tripImageList detailsImageList headerImage footerImage
// tripImageList detailsImageList headerImage footerImage
...
@@ -689,6 +691,35 @@ export default defineComponent({
...
@@ -689,6 +691,35 @@ export default defineComponent({
document
.
querySelector
(
newval
).
scrollIntoView
(
true
)
document
.
querySelector
(
newval
).
scrollIntoView
(
true
)
}
}
}
}
watch
(()
=>
data
.
days
,(
n
,
o
)
=>
{
data
.
days
=
n
try
{
data
.
days
.
forEach
((
x
,
i
)
=>
{
var
object
=
document
.
getElementById
(
`days_
${
i
}
`
);
x
.
top
=
object
.
getBoundingClientRect
().
top
+
60
})
}
catch
(
error
)
{
console
.
log
(
'----异常'
)
}
methods
.
getTopNum
(
JSON
.
stringify
(
data
.
days
))
},{
immediate
:
true
,
deep
:
true
})
watch
(()
=>
data
.
currentHeight
,(
n
,
o
)
=>
{
data
.
navs
.
forEach
((
x
,
i
)
=>
{
if
(
x
.
top
&&
data
.
currentHeight
>=
x
.
top
&&
(
i
==
data
.
navs
.
length
-
1
||
data
.
currentHeight
<
data
.
navs
[
i
+
1
].
top
)
)
{
if
(
data
.
tab
!=
x
.
display
)
{
data
.
tab
=
x
.
display
;
return
;
}
else
{
return
;
}
}
});
},{
immediate
:
true
,
deep
:
false
})
methods
.
getData
()
methods
.
getData
()
return
{
return
{
...
...
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