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
7f9aa695
Commit
7f9aa695
authored
Feb 17, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
ee145b92
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
25 deletions
+40
-25
allDay.vue
src/components/trip/block/allDay.vue
+1
-0
trip.vue
src/components/trip/trip.vue
+1
-1
detailsNew.vue
src/pages/scheduledTrip/detailsNew.vue
+38
-24
No files found.
src/components/trip/block/allDay.vue
View file @
7f9aa695
<
template
>
<div
class=
"block-item"
>
<q-carousel
swipeable
animated
v-model=
"slide"
infinite
...
...
src/components/trip/trip.vue
View file @
7f9aa695
<
template
>
<div
class=
"q-mt-lg"
>
<div
class=
"q-mt-lg"
:class=
"
{'q-px-md':$q.platform.is.mobile}"
>
<div
class=
"text-subtitle1 text-weight-bold row items-center"
>
<span
class=
"col"
>
每日行程
</span>
<span
class=
""
>
...
...
src/pages/scheduledTrip/detailsNew.vue
View file @
7f9aa695
...
...
@@ -144,10 +144,13 @@
></calendar>
</q-popup-proxy>
</q-field>
<order-preview
class=
"q-pa-md"
:price=
"currentPrice"
@
reset=
"resetHandler"
></order-preview>
<template
v-if=
"currentPrice&¤tPrice.startDate"
>
<order-preview
class=
"q-pa-md"
:price=
"currentPrice"
@
reset=
"resetHandler"
></order-preview>
</
template
>
</div>
<div
class=
"bg-white rounded-borders q-mt-md"
v-if=
"dataList.priceList.length > 0"
>
<div
class=
"q-pa-md row"
>
...
...
@@ -190,7 +193,12 @@
</div>
</div>
</div>
<div
v-if=
"dataList"
style=
"max-width: 1200px; margin-left: auto; margin-right: auto"
class=
"q-mt-xl row"
:class=
"
{ 'q-px-md': $q.screen.width
<
1220
}"
>
<div
v-if=
"dataList"
style=
"max-width: 1200px; margin-left: auto; margin-right: auto"
class=
"q-mt-xl row"
:class=
"{ 'q-px-md': $q.screen.width < 1220&&$q.screen.width>760, }"
>
<div
class=
"col q-ml-xl position-relative"
v-if=
"days.length>0&&dayList.length>3&¤tHeight > days[0].top-60&¤tHeight < navs[2].top&&$q.platform.is.desktop"
>
<div
style=
"position: sticky; top: 100px"
>
...
...
@@ -198,7 +206,7 @@
class=
"trip-module text-subtitle2 cursor-pointer q-mb-lg"
v-for=
"(x, i) in days"
:key=
"i"
@
click=
"goScrollHandler(x.top +
2
0)"
@
click=
"goScrollHandler(x.top +
40
0)"
:class=
"{
'active-trip-moduleDay text-red active':
currentHeight >= x.top &&
...
...
@@ -210,12 +218,12 @@
</div>
</div>
<div
:class=
"{'col-8':$q.platform.is.desktop,'col':$q.platform.is.mobile}"
>
<div
class=
"text-h5 text-weight-bold text-left"
id=
"feature"
>
行程特色
</div>
<div
class=
"text-h5 text-weight-bold text-left"
id=
"feature"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
行程特色
</div>
<div
class=
"q-mt-md trip-text q-pb-xl"
v-html=
"dataList.feature.featureContent"
v-if=
"dataList.feature.featureContent != ''"
></div>
<div
class=
"q-mt-md q-pb-xl"
id=
"setZoom"
ref=
"diyContext"
:style=
"{ zoom: zoomDiyContext }"
v-html=
"dataList.feature.featureHtml"
v-if=
"dataList.feature.featureHtml != ''"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"product"
>
行程介紹
</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}"
>
行程介紹
</div>
<div
class=
"q-pb-xl"
>
<smaple
:trip=
"dataList"
></smaple>
<smaple
:trip=
"dataList"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></smaple>
<
template
v-if=
"dataList.dayList.length<=3"
>
<trip
:trip=
"dataList"
@
change=
"changeTripShowHandler"
></trip>
</
template
>
...
...
@@ -223,17 +231,17 @@
<block
:currentHeightDay=
"currentHeight"
:days=
"days"
:tripList=
"dayList"
:isDirect=
"isDirect"
:clickDate=
"clickDate"
></block>
</
template
>
</div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"price"
>
費用說明
</div>
<div
class=
"text-subtitle1 text-weight-bold q-my-md"
>
費用包含
</div>
<div
class=
"q-mt-md trip-text"
v-html=
"dataList.feature.feeInclude"
></div>
<div
class=
"text-subtitle1 text-weight-bold q-my-md"
>
費用不含
</div>
<div
class=
"q-mt-md trip-text q-pb-xl"
v-html=
"dataList.feature.feeNonInclude"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"warning"
>
購買須知
</div>
<div
class=
"q-mt-lg trip-text bg-orange-1 q-pa-md rounded-borders q-mb-xl"
style=
"border: 1px dashed var(--q-color-warning)"
v-html=
"dataList.feature.importantTip"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"tips"
>
溫馨提示
</div>
<div
class=
"q-mt-lg trip-text bg-white q-pa-md rounded-borders q-mb-xl"
style=
"border: 1px dashed var(--q-color-info)"
v-html=
"dataList.feature.warmTip"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"cancelTips"
>
取消政策
</div>
<div
class=
"q-mt-lg trip-text q-mb-xl"
>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"price"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
費用說明
</div>
<div
class=
"text-subtitle1 text-weight-bold q-my-md"
:class=
"{'q-px-md':$q.platform.is.mobile}"
>
費用包含
</div>
<div
class=
"q-mt-md trip-text"
v-html=
"dataList.feature.feeInclude"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></div>
<div
class=
"text-subtitle1 text-weight-bold q-my-md"
:class=
"{'q-px-md':$q.platform.is.mobile}"
>
費用不含
</div>
<div
class=
"q-mt-md trip-text q-pb-xl"
v-html=
"dataList.feature.feeNonInclude"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"warning"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
購買須知
</div>
<div
class=
"q-mt-lg trip-text bg-orange-1 q-pa-md rounded-borders q-mb-xl"
style=
"border: 1px dashed var(--q-color-warning)"
v-html=
"dataList.feature.importantTip"
:class=
"{'q-mx-md':$q.platform.is.mobile}"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"tips"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
溫馨提示
</div>
<div
class=
"q-mt-lg trip-text bg-white q-pa-md rounded-borders q-mb-xl"
style=
"border: 1px dashed var(--q-color-info)"
v-html=
"dataList.feature.warmTip"
:class=
"{'q-px-md':$q.platform.is.mobile}"
></div>
<div
class=
"text-h5 text-weight-bold text-left q-mt-xl"
id=
"cancelTips"
:class=
"{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}"
>
取消政策
</div>
<div
class=
"q-mt-lg trip-text q-mb-xl"
:class=
"{'q-px-md':$q.platform.is.mobile}"
>
<ul
class=
"no-padding text-grey-9 q-ml-md"
>
<li>
所选日期 15 天(含)之前取消,收取手续费 0%
</li>
<li
class=
"q-mt-sm"
>
所选日期 8 ~ 14 天之间取消,收取手续费 30%
</li>
...
...
@@ -540,11 +548,14 @@ export default defineComponent({
// console.log('异常信息', error)
}
if
(
data
.
dataList
.
feature
.
featureHtml
!=
''
)
{
let
tw
=
parseFloat
(
diyContext
.
value
.
getBoundingClientRect
().
width
)
/
1000.0
let
tw
=
$q
.
platform
.
is
.
desktop
?
parseFloat
(
diyContext
.
value
.
getBoundingClientRect
().
width
)
/
1000.0
:
parseFloat
(
diyContext
.
value
.
getBoundingClientRect
().
width
)
/
1123.0
if
(
$q
.
platform
.
is
.
mobile
){
let
zoombox
=
document
.
querySelector
(
"#setZoom"
);
let
div
=
zoombox
.
getElementsByTagName
(
"div"
)[
0
]
div
.
style
.
zoom
=
document
.
documentElement
.
clientWidth
/
980.0
let
divArr
=
document
.
querySelectorAll
(
"#setZoom>div"
)
for
(
let
i
=
0
;
i
<
divArr
.
length
;
i
++
){
let
div
=
divArr
[
i
]
div
.
style
.
zoom
=
div
.
offsetWidth
>
1000
?
0.999
:
document
.
documentElement
.
clientWidth
/
1123.0
}
}
data
.
zoomDiyContext
=
tw
>
1
?
1
:
tw
.
toFixed
(
2
)
}
...
...
@@ -695,4 +706,7 @@ export default defineComponent({
line-height
:
58px
;
opacity
:
0
;
}
#setZoom
>
div
{
zoom
:
calc
(
100
/
1000
)
}
</
style
>
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