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
b9e8a607
Commit
b9e8a607
authored
Aug 26, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
8ec771d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
5 deletions
+44
-5
FreeDetail.vue
src/components/FreeTravel/FreeDetail.vue
+40
-3
OrderConfirmation.vue
src/components/FreeTravel/OrderConfirmation.vue
+4
-2
No files found.
src/components/FreeTravel/FreeDetail.vue
View file @
b9e8a607
...
...
@@ -11,7 +11,7 @@
</div>
<div
class=
"Content basefix"
style=
"margin-top:20px;margin-bottom:50px"
>
<div
class=
"left"
style=
"width:795px;margin-right:47px"
>
<p
class=
"pfR"
>
{{
dataDetail
.
prod_name
}}
</p>
<p
class=
"pfR"
>
{{
rePlace
(
dataDetail
.
prod_name
)
}}
</p>
<p
class=
"f14 c99"
style=
"margin:15px 0"
>
{{
dataDetail
.
introduction
}}
</p>
<el-row
class=
"titleEl f14"
>
...
...
@@ -175,7 +175,7 @@
</div>
</div>
</div>
<div
class=
"right
"
style=
"width:358px;border:1px solid rgba(224, 224, 224, 1);box-sizing:border-box"
>
<div
ref=
"rightDiv"
:class=
"rightNav?'rightFixed right':'right'"
:style=
"
{right:rightFixed}
" style="width:358px;border:1px solid rgba(224, 224, 224, 1);box-sizing:border-box">
<div
style=
"width:100%;height:72px;line-height:72px;background:rgba(237,244,255,1);padding-left:20px;box-sizing:border-box"
>
<span
class=
"cee f26 pfR"
>
¥
{{
msgObj
.
MySelfTotalPrice
}}
</span>
<!--
<span
class=
"c66 f12"
>
/起
</span>
-->
...
...
@@ -211,6 +211,7 @@ export default {
},
data
()
{
return
{
rightNav
:
false
,
eventTypeindex
:
-
1
,
mealTypeindex
:
-
1
,
LiactiveIndex
:
0
,
...
...
@@ -245,10 +246,13 @@ export default {
},
eventnoList
:[],
pkg_no
:
""
,
scrollTop
:
0
,
rightFixed
:
"0"
,
}
},
created
(){
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
this
.
rightFixed
=
(
document
.
body
.
offsetWidth
-
1200
)
/
2
+
"px"
;
},
mounted
()
{
let
list
=
[];
...
...
@@ -256,10 +260,28 @@ export default {
this
.
id
=
id
;
this
.
getDetails
(
id
)
this
.
getMealList
(
id
);
this
.
scrollobj
=
document
.
getElementsByClassName
(
'el-scrollbar__wrap'
)[
0
];
this
.
$nextTick
(()
=>
{
this
.
scrollobj
.
addEventListener
(
'scroll'
,
this
.
handleScroll
);
})
},
methods
:
{
handleScroll
(){
// console.log("this.scrollobj",this.scrollobj.scrollTop)
this
.
scrollTop
=
this
.
scrollobj
.
scrollTop
;
if
(
this
.
scrollobj
.
scrollTop
>
550
){
this
.
rightNav
=
true
;
}
else
{
this
.
rightNav
=
false
;
}
},
rePlace
(
str
){
return
str
.
replace
(
'KKday'
,
'印象之旅'
);
},
PriceChange
(){
let
that
=
this
;
that
.
msgObj
.
price1
=
that
.
mealTypeItem
.
price1
;
...
...
@@ -282,10 +304,20 @@ export default {
let
that
=
this
;
if
(
that
.
msgObj
.
s_date
==
""
||
!
that
.
msgObj
.
s_date
){
this
.
Error
(
"请选择日期!"
)
if
(
this
.
scrollTop
>
750
){
this
.
scrollobj
.
scrollTop
=
690
;
}
return
;
}
if
(
that
.
msgObj
.
price1_qty
+
that
.
msgObj
.
price2_qty
+
that
.
msgObj
.
price3_qty
+
that
.
msgObj
.
price4_qty
==
0
){
this
.
Error
(
"出行人数至少一人!"
);
if
(
this
.
scrollTop
>
750
){
this
.
scrollobj
.
scrollTop
=
690
;
}
return
;
}
that
.
msgObj
.
DomainUrl
=
that
.
DomainUrl
;
...
...
@@ -517,6 +549,11 @@ export default {
<
style
>
@import
'../../assets/css/common.css'
;
.FreeDetail
.rightFixed
{
position
:
fixed
;
top
:
0
;
/* right: 18.5%; */
}
.FreeDetail
.Content
.ListDiv
.commomStyle
.fysm
li
img
{
margin-right
:
6px
;
}
...
...
src/components/FreeTravel/OrderConfirmation.vue
View file @
b9e8a607
...
...
@@ -170,7 +170,7 @@
</div>
<div
style=
"padding:15px"
>
<el-row
class=
"cee f22"
>
<el-col
:span=
"10"
>
{{
freeMsg
.
prod_name
}}
</el-col>
<el-col
:span=
"10"
>
{{
rePlace
(
freeMsg
.
prod_name
)
}}
</el-col>
<el-col
:span=
"14"
style=
"text-align:right"
>
<p
class=
"cee f22 pfR"
v-if=
"dataDetail.prod"
>
<span
v-if=
"dataDetail.prod.policy_no=='1'"
>
不扣手续费,退全额
</span>
...
...
@@ -298,7 +298,9 @@ export default {
},
methods
:
{
rePlace
(
str
){
return
str
.
replace
(
'KKday'
,
'印象之旅'
);
},
GenderSelect
(){
this
.
$forceUpdate
()
},
...
...
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