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
ad6e6f11
Commit
ad6e6f11
authored
Aug 23, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uodate
parent
e7a2653a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
14 deletions
+29
-14
FreeDetail.vue
src/components/FreeTravel/FreeDetail.vue
+20
-5
OrderConfirmation.vue
src/components/FreeTravel/OrderConfirmation.vue
+7
-7
newHead.vue
src/components/global/newHead.vue
+2
-2
No files found.
src/components/FreeTravel/FreeDetail.vue
View file @
ad6e6f11
...
...
@@ -81,22 +81,22 @@
<el-row
style=
"margin-bottom:10px"
>
<el-col
:span=
"17"
><span
class=
"f12"
>
{{
mealTypeItem
.
price1_age_range
}}
</span></el-col>
<el-col
:span=
"2"
><span
class=
"cee"
>
¥
{{
mealTypeItem
.
price1_b2c
}}
</span></el-col>
<el-col
:span=
"5"
>
<el-input-number
size=
"mini"
v-model=
"msgObj.price1_qty"
:min=
"0"
></el-input-number></el-col>
<el-col
:span=
"5"
>
<el-input-number
@
change=
"PriceChange"
size=
"mini"
v-model=
"msgObj.price1_qty"
:min=
"0"
></el-input-number></el-col>
</el-row>
<el-row
v-if=
"mealTypeItem.price2_age_range!='~' && mealTypeItem.price2_age_range!='0~0'"
style=
"margin-bottom:10px"
>
<el-col
:span=
"17"
><span
class=
"f12"
>
{{
mealTypeItem
.
price2_age_range
}}
</span></el-col>
<el-col
:span=
"2"
><span
class=
"cee"
>
¥
{{
mealTypeItem
.
price2_b2c
}}
</span></el-col>
<el-col
:span=
"5"
>
<el-input-number
size=
"mini"
v-model=
"msgObj.price2_qty"
:min=
"0"
></el-input-number></el-col>
<el-col
:span=
"5"
>
<el-input-number
@
change=
"PriceChange"
size=
"mini"
v-model=
"msgObj.price2_qty"
:min=
"0"
></el-input-number></el-col>
</el-row>
<el-row
v-if=
"mealTypeItem.price3_age_range!='~'&& mealTypeItem.price3_age_range!='0~0'"
style=
"margin-bottom:10px"
>
<el-col
:span=
"17"
><span
class=
"f12"
>
{{
mealTypeItem
.
price3_age_range
}}
</span></el-col>
<el-col
:span=
"2"
><span
class=
"cee"
>
¥
{{
mealTypeItem
.
price3_b2c
}}
</span></el-col>
<el-col
:span=
"5"
>
<el-input-number
size=
"mini"
v-model=
"msgObj.price3_qty"
:min=
"0"
></el-input-number></el-col>
<el-col
:span=
"5"
>
<el-input-number
@
change=
"PriceChange"
size=
"mini"
v-model=
"msgObj.price3_qty"
:min=
"0"
></el-input-number></el-col>
</el-row>
<el-row
v-if=
"mealTypeItem.price4_age_range!='~'&& mealTypeItem.price4_age_range!='0~0'"
>
<el-col
:span=
"17"
><span
class=
"f12"
>
{{
mealTypeItem
.
price4_age_range
}}
</span></el-col>
<el-col
:span=
"2"
><span
class=
"cee"
>
¥
{{
mealTypeItem
.
price4_b2c
}}
</span></el-col>
<el-col
:span=
"5"
>
<el-input-number
size=
"mini"
v-model=
"msgObj.price4_qty"
:min=
"0"
></el-input-number></el-col>
<el-col
:span=
"5"
>
<el-input-number
@
change=
"PriceChange"
size=
"mini"
v-model=
"msgObj.price4_qty"
:min=
"0"
></el-input-number></el-col>
</el-row>
</div>
...
...
@@ -177,7 +177,7 @@
</div>
<div
class=
"right"
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"
>
¥
{{
dataDetail
.
b2c_p
rice
}}
</span>
<span
class=
"cee f26 pfR"
>
¥
{{
msgObj
.
MySelfTotalP
rice
}}
</span>
<!--
<span
class=
"c66 f12"
>
/起
</span>
-->
</div>
<p
style=
"padding-left:20px;margin-top:20px"
>
...
...
@@ -241,6 +241,7 @@ export default {
Mobile_Device
:
null
,
ProductPic
:
''
,
ProductType
:
''
,
MySelfTotalPrice
:
0
,
},
eventnoList
:[],
pkg_no
:
""
,
...
...
@@ -259,6 +260,20 @@ export default {
},
methods
:
{
PriceChange
(){
let
that
=
this
;
that
.
msgObj
.
price1
=
that
.
mealTypeItem
.
price1
;
that
.
msgObj
.
price2
=
that
.
mealTypeItem
.
price2
;
that
.
msgObj
.
price3
=
that
.
mealTypeItem
.
price3
;
that
.
msgObj
.
price4
=
that
.
mealTypeItem
.
price4
;
that
.
msgObj
.
price1_b2c
=
that
.
mealTypeItem
.
price1_b2c
;
that
.
msgObj
.
price2_b2c
=
that
.
mealTypeItem
.
price2_b2c
;
that
.
msgObj
.
price3_b2c
=
that
.
mealTypeItem
.
price3_b2c
;
that
.
msgObj
.
price4_b2c
=
that
.
mealTypeItem
.
price4_b2c
;
that
.
msgObj
.
MySelfTotalPrice
=
that
.
msgObj
.
price1_qty
*
that
.
mealTypeItem
.
price1_b2c
+
that
.
msgObj
.
price2_qty
*
that
.
mealTypeItem
.
price2_b2c
+
that
.
msgObj
.
price3_qty
*
that
.
mealTypeItem
.
price3_b2c
+
that
.
msgObj
.
price4_qty
*
that
.
mealTypeItem
.
price4_b2c
;
},
YdBtn
(){
if
(
this
.
isLogin
==
0
){
this
.
Error
(
"请先登录"
);
...
...
src/components/FreeTravel/OrderConfirmation.vue
View file @
ad6e6f11
...
...
@@ -181,37 +181,37 @@
</el-row>
<p
style=
"margin:15px 0"
class=
"f14"
><span
class=
"c99"
style=
"margin-right:20px"
>
日期
</span><span
class=
"c66"
>
{{
freeMsg
.
dateStr
}}
</span></p>
<p
class=
"f14"
><span
class=
"c99"
style=
"margin-right:20px"
>
人数
</span>
<
!--
<
p
class=
"f14"
><span
class=
"c99"
style=
"margin-right:20px"
>
人数
</span>
<span
v-if=
"freeMsg.price1_qty>0"
class=
"c66"
>
(
{{
freeMsg
.
price1_age_range
}}
) x
{{
freeMsg
.
price1_qty
}}
</span>
<span
v-if=
"freeMsg.price2_qty>0"
class=
"c66"
>
(
{{
freeMsg
.
price2_age_range
}}
) x
{{
freeMsg
.
price2_qty
}}
</span>
<span
v-if=
"freeMsg.price3_qty>0"
class=
"c66"
>
(
{{
freeMsg
.
price3_age_range
}}
) x
{{
freeMsg
.
price3_qty
}}
</span>
<span
v-if=
"freeMsg.price4_qty>0"
class=
"c66"
>
(
{{
freeMsg
.
price4_age_range
}}
) x
{{
freeMsg
.
price4_qty
}}
</span>
</p>
</p>
-->
</div>
</div>
<div
style=
"margin-top:20px;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:0 20px;box-sizing:border-box"
>
<span
class=
"f20"
>
订单总额
</span>
<span
class=
"f20
pfR
"
>
订单总额
</span>
<span
style=
"float:right"
class=
"cee f26 pfR"
>
¥
{{
freeMsg
.
MySelfTotalPrice
}}
</span>
</div>
<div
class=
"f14"
style=
"padding:20px"
>
<el-row
v-if=
"freeMsg.price1_qty>0"
>
<el-row
style=
"margin-bottom:7px"
v-if=
"freeMsg.price1_qty>0"
>
<el-col
:span=
"6"
>
(
{{
freeMsg
.
price1_age_range
}}
) x
{{
freeMsg
.
price1_qty
}}
</el-col>
<el-col
:span=
"12"
><div
class=
"dashDiv"
></div></el-col>
<el-col
style=
"text-align:center"
:span=
"6"
>
¥
{{
freeMsg
.
price1_b2c
}}
</el-col>
</el-row>
<el-row
v-if=
"freeMsg.price2_qty>0"
>
<el-row
style=
"margin-bottom:7px"
v-if=
"freeMsg.price2_qty>0"
>
<el-col
:span=
"6"
>
(
{{
freeMsg
.
price2_age_range
}}
) x
{{
freeMsg
.
price2_qty
}}
</el-col>
<el-col
:span=
"12"
><div
class=
"dashDiv"
></div></el-col>
<el-col
style=
"text-align:center"
:span=
"6"
>
¥
{{
freeMsg
.
price2_b2c
}}
</el-col>
</el-row>
<el-row
v-if=
"freeMsg.price3_qty>0"
>
<el-row
style=
"margin-bottom:7px"
v-if=
"freeMsg.price3_qty>0"
>
<el-col
:span=
"6"
>
(
{{
freeMsg
.
price3_age_range
}}
) x
{{
freeMsg
.
price3_qty
}}
</el-col>
<el-col
:span=
"12"
><div
class=
"dashDiv"
></div></el-col>
<el-col
style=
"text-align:center"
:span=
"6"
>
¥
{{
freeMsg
.
price3_b2c
}}
</el-col>
</el-row>
<el-row
v-if=
"freeMsg.price4_qty>0"
>
<el-row
style=
"margin-bottom:7px"
v-if=
"freeMsg.price4_qty>0"
>
<el-col
:span=
"6"
>
(
{{
freeMsg
.
price4_age_range
}}
) x
{{
freeMsg
.
price4_qty
}}
</el-col>
<el-col
:span=
"12"
><div
class=
"dashDiv"
></div></el-col>
<el-col
style=
"text-align:center"
:span=
"6"
>
¥
{{
freeMsg
.
price4_b2c
}}
</el-col>
...
...
src/components/global/newHead.vue
View file @
ad6e6f11
...
...
@@ -222,12 +222,12 @@
</li>
<!-- 自由行 -->
<li
:class=
"{_active: navActive === 11}"
>
<
!-- <
li :class="{_active: navActive === 11}">
<div @click="handleSelect('/FreeHome', 11), navActive = 11">
<span>自由行</span>
<span class="__splice">|</span>
</div>
</li>
</li>
-->
<li
:class=
"{_active: navActive === 2}"
>
<div
@
click=
"handleSelect('/IndependentTravel', 2), navActive = 2"
>
<span>
定制游
</span>
...
...
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