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
b5f85b0f
Commit
b5f85b0f
authored
Jun 30, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d3dfafec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
44 deletions
+39
-44
tripList.vue
src/components/trip/tripList.vue
+32
-36
details.vue
src/pages/details.vue
+7
-8
No files found.
src/components/trip/tripList.vue
View file @
b5f85b0f
...
...
@@ -10,12 +10,12 @@
<q-td
key=
"startDate"
:props=
"props"
>
<span
class=
"text-red"
>
{{
props
.
row
.
startDate
}}
</span>
</q-td>
<q-td
key=
"
T
itle"
:props=
"props"
>
<q-td
key=
"
t
itle"
:props=
"props"
>
<div
style=
"max-width:435px;white-space: pre-wrap;"
>
<a
@
click=
"OpenNewUrl(props.row.LinkUrl)"
target=
"_blank"
>
{{
props
.
row
.
T
itle
}}
</a>
<a
>
{{
props
.
row
.
t
itle
}}
</a>
</div>
</q-td>
<q-td
key=
"
DayNum"
:props=
"props"
>
{{
props
.
row
.
D
ayNum
}}
</q-td>
<q-td
key=
"
dayNum"
:props=
"props"
>
{{
props
.
row
.
d
ayNum
}}
</q-td>
<q-td
key=
"FlightStatus"
:props=
"props"
>
<q-icon
color=
"grey"
name=
"iconfont iconhangbanxinxicopy"
size=
"14"
/>
</q-td>
...
...
@@ -23,24 +23,20 @@
<span
caption
>
$
</span>
<span
class=
"text-subtitle2 text-weight-medium"
>
{{
props
.
row
.
b2BPrice
}}
</span>
</q-td>
<q-td
key=
"tcState"
:props=
"props"
>
<span
:class=
"
{'text-orange':props.row.tcState>0,'text-pink':(props.row.tcState==0
&&
props.row.isSubstitution),'text-red':(props.row.tcState==0
&&
!props.row.isSubstitution)}">
{{
props
.
row
.
tcState
>
0
?
'有名額'
:(
props
.
row
.
tcState
==
0
&&
props
.
row
.
isSubstitution
?
'可候補'
:
'名額已滿'
)
}}
</span>
</q-td>
<q-td
key=
""
:props=
"props"
>
<span>
123
</span>
<q-td
key=
"totalSeat"
:props=
"props"
>
<span>
{{
props
.
row
.
totalSeat
}}
</span>
</q-td>
<q-td
key=
""
:props=
"props"
>
<span>
123
</span>
<q-td
key=
"
seat
"
:props=
"props"
>
<span>
{{
props
.
row
.
seat
}}
</span>
</q-td>
<q-td
key=
""
:props=
"props"
>
<span>
123
</span>
<q-td
key=
"seat"
:props=
"props"
>
<span
:class=
"
{'text-orange':props.row.seat>0,'text-pink':(props.row.seat==0
&&
props.row.isSubstitution),'text-red':(props.row.seat==0
&&
!props.row.isSubstitution)}">
{{
props
.
row
.
seat
>
0
?
'有名額'
:(
props
.
row
.
seat
==
0
&&
props
.
row
.
isSubstitution
?
'可候補'
:
'名額已滿'
)
}}
</span>
</q-td>
<q-td
key=
"TCID"
:props=
"props"
>
<!--
<q-btn
type=
"a"
@
click=
"OpenNewUrl(props.row.LinkUrl)"
target=
"_blank"
:label=
"props.row.Seat>0||props.row.Substitute?'我有興趣':'無法預訂'"
:color=
"props.row.Seat>0||props.row.Substitute?'indigo':'grey'"
rounded
unelevated
:disable=
"props.row.Seat==0&&props.row.Substitute"
/>
-->
<q-td
key=
"tcid"
:props=
"props"
>
<q-btn
type=
"a"
:label=
"props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'"
:color=
"props.row.seat>0||props.row.isSubstitution?'indigo':'grey'"
rounded
unelevated
:disable=
"props.row.seat==0&&props.row.isSubstitution"
/>
</q-td>
</q-tr>
</
template
>
...
...
@@ -61,13 +57,13 @@
<q-item>
<q-item-section>
<q-item-label
class=
"text-grey"
>
團體名稱
</q-item-label>
<q-item-label>
123
</q-item-label>
<q-item-label>
{{
props
.
row
.
title
}}
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label
class=
"text-grey"
>
天數
</q-item-label>
<q-item-label>
{{
props
.
row
.
remain
Num
}}
</q-item-label>
<q-item-label>
{{
props
.
row
.
day
Num
}}
</q-item-label>
</q-item-section>
</q-item>
<q-item>
...
...
@@ -94,17 +90,16 @@
<q-item-label
class=
"text-grey"
>
狀態
</q-item-label>
<q-item-label>
<span
:class=
"
{'text-orange':props.row.
tcState>0,'text-pink':(props.row.tcState==0
&&
props.row.isSubstitution),'text-red':(props.row.tcState==0
&&
!props.row.isSubstitution)}">
{{
props
.
row
.
tcState
>
0
?
'有名額'
:(
props
.
row
.
tcState
==
0
&&
props
.
row
.
isSubstitution
?
'可候補'
:
'名額已滿'
)
}}
</span>
:class=
"
{'text-orange':props.row.
seat>0,'text-pink':(props.row.seat==0
&&
props.row.isSubstitution),'text-red':(props.row.seat==0
&&
!props.row.isSubstitution)}">
{{
props
.
row
.
seat
>
0
?
'有名額'
:(
props
.
row
.
seat
==
0
&&
props
.
row
.
isSubstitution
?
'可候補'
:
'名額已滿'
)
}}
</span>
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label
class=
"text-grey"
>
報名
</q-item-label>
<!--
<q-btn
type=
"a"
@
click=
"OpenNewUrl(props.row.LinkUrl)"
target=
"_blank"
:label=
"props.row.Seat>0||props.row.Substitute?'我有興趣':'無法預訂'"
:color=
"props.row.Seat>0||props.row.Substitute?'indigo':'grey'"
rounded
unelevated
:disable=
"props.row.Seat==0&&props.row.Substitute"
/>
-->
<q-btn
type=
"a"
:label=
"props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'"
:color=
"props.row.seat>0||props.row.isSubstitution?'indigo':'grey'"
rounded
unelevated
:disable=
"props.row.seat==0&&props.row.isSubstitution"
/>
</q-item-section>
</q-item>
</q-list>
...
...
@@ -142,16 +137,16 @@
sortable
:
true
},
{
name
:
"
T
itle"
,
name
:
"
t
itle"
,
label
:
"團體名稱"
,
align
:
"left"
,
field
:
"
T
itle"
field
:
"
t
itle"
},
{
name
:
"
D
ayNum"
,
name
:
"
d
ayNum"
,
label
:
"天數"
,
align
:
"left"
,
field
:
"
D
ayNum"
field
:
"
d
ayNum"
},
{
name
:
"FlightStatus"
,
...
...
@@ -166,16 +161,17 @@
field
:
"b2BPrice"
},
{
name
:
"t
cState
"
,
name
:
"t
otalSeat
"
,
label
:
"位數"
,
align
:
"left"
,
field
:
"t
cState
"
field
:
"t
otalSeat
"
},
{
name
:
"
"
,
name
:
"seat
"
,
label
:
"可報名"
,
align
:
"left"
,
field
:
"
"
align
:
"left"
,
field
:
"seat
"
},
{
name
:
"Seat"
,
...
...
@@ -198,8 +194,8 @@
return
""
;
}
},
mounted
(){
console
.
log
(
this
.
plugData
,
'plugDataaaa'
);
mounted
()
{
console
.
log
(
this
.
plugData
,
'plugDataaaa'
);
}
};
...
...
src/pages/details.vue
View file @
b5f85b0f
...
...
@@ -85,22 +85,22 @@
<template
v-for=
"(item,index) in TripConfig.TripConfig.SortList"
>
<!-- 行程資訊 -->
<!-- TripListStyle 1月历 2列表 -->
<tripList
v-if=
"item.Id=='TripList'"
:key=
"index+10"
:plugData=
"dataList"
></tripList>
<tripcalendar
v-if=
"item.Id=='TripList'"
:key=
"index+
1
0"
:plugData=
"dataList"
></tripcalendar>
<tripList
v-if=
"item.Id=='TripList'"
:key=
"index+10
0
"
:plugData=
"dataList"
></tripList>
<tripcalendar
v-if=
"item.Id=='TripList'"
:key=
"index+
20
0"
:plugData=
"dataList"
></tripcalendar>
<!-- 每日行程 -->
<!-- TripDayStyle 1竖起排 2横起 -->
<headStyle3
v-if=
"item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==2"
id=
"tour_detail"
ref=
"tour_detail"
:tripList=
"dayList"
:isDirect=
"isDirect"
:key=
"index+3"
></headStyle3>
ref=
"tour_detail"
:tripList=
"dayList"
:isDirect=
"isDirect"
:key=
"index+3
00
"
></headStyle3>
<headStyle6
v-if=
"item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==1"
:tripList=
"dayList"
:isDirect=
"isDirect"
:key=
"index+
3
"
></headStyle6>
:isDirect=
"isDirect"
:key=
"index+
400
"
></headStyle6>
<!-- 行程特色 -->
<headStyle4
v-if=
"item.Id=='TripFeature'"
ref=
"feature"
id=
"feature"
:dataList=
"dataList"
:key=
"index+
4
"
>
<headStyle4
v-if=
"item.Id=='TripFeature'"
ref=
"feature"
id=
"feature"
:dataList=
"dataList"
:key=
"index+
500
"
>
</headStyle4>
<!-- 注意事项 -->
<headStyle5
v-if=
"item.Id=='Notice'"
id=
"note"
ref=
"note"
:dataList=
"dataList"
:key=
"index+
5
"
></headStyle5>
<headStyle5
v-if=
"item.Id=='Notice'"
id=
"note"
ref=
"note"
:dataList=
"dataList"
:key=
"index+
600
"
></headStyle5>
<!-- 需求单 -->
<diyForm
v-if=
"item.Id=='Order'"
:key=
"index+
1
00"
></diyForm>
<diyForm
v-if=
"item.Id=='Order'"
:key=
"index+
7
00"
></diyForm>
</
template
>
</template>
<div
class=
"quick-banner-block"
v-if=
"isShowNav"
:class=
"{'orange':TripConfig.TripConfig.TripBottonStyle==1
...
...
@@ -181,7 +181,6 @@
},
methods
:
{
getData
()
{
console
.
log
(
"msg"
,
this
.
msg
);
this
.
apipost
(
'b2b_get_GetB2BTravelInfoV1'
,
this
.
msg
,
r
=>
{
if
(
r
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
r
.
data
.
data
;
...
...
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