Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jz_Travel
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
zhengke
jz_Travel
Commits
adaf1f13
Commit
adaf1f13
authored
Jun 04, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整订单计价
parent
95d3bf45
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
jz_Reserve.vue
pages/jiuzhai/jz_Reserve.vue
+12
-11
jz_SureOrder.vue
pages/jiuzhai/jz_SureOrder.vue
+4
-4
No files found.
pages/jiuzhai/jz_Reserve.vue
View file @
adaf1f13
...
@@ -334,27 +334,27 @@
...
@@ -334,27 +334,27 @@
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
儿童(占床)
</text>
<text
style=
"margin-right: 30rpx;"
>
儿童(占床)
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
ChirdNeedBedNum
}}
人 × ¥
{{
(
$utils
.
getretailer
()?
currentPriceInfo
.
b2BPrice
:
currentPriceInfo
.
b2CPrice
)
+
currentPriceInfo
.
childNeedPrice
}}
</view>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
ChirdNeedBedNum
}}
人 × ¥
{{
(
$utils
.
getretailer
()?
currentPriceInfo
.
b2BPrice
:
currentPriceInfo
.
b2CPrice
)
+
(
currentPriceInfo
.
childNeedPrice
?
currentPriceInfo
.
childNeedPrice
:
0
)
}}
</view>
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.ChirdNoBedNum>0"
>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.ChirdNoBedNum>0"
>
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
儿童(不占床)
</text>
<text
style=
"margin-right: 30rpx;"
>
儿童(不占床)
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
ChirdNoBedNum
}}
人 × ¥
{{
(
$utils
.
getretailer
()?
currentPriceInfo
.
b2BPrice
:
currentPriceInfo
.
b2CPrice
)
+
currentPriceInfo
.
childNoNeedPrice
}}
</view>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
ChirdNoBedNum
}}
人 × ¥
{{
(
$utils
.
getretailer
()?
currentPriceInfo
.
b2BPrice
:
currentPriceInfo
.
b2CPrice
)
-
(
currentPriceInfo
.
childNoNeedPrice
?
currentPriceInfo
.
childNoNeedPrice
:
0
)
}}
</view>
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.BabyNum>0"
>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.BabyNum>0"
>
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
婴儿
</text>
<text
style=
"margin-right: 30rpx;"
>
婴儿
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
BabyNum
}}
人 × ¥
{{
currentPriceInfo
.
babyPrice
}}
</view>
{{
orderMsg
.
BabyNum
}}
人 × ¥
{{
currentPriceInfo
.
babyPrice
?
currentPriceInfo
.
babyPrice
:
0
}}
</view>
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.
BabyNum>0
&¤tPriceInfo.babyChargePrice>0"
>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderMsg.
ChirdNum>0&¤tPriceInfo.babyChargePrice
&¤tPriceInfo.babyChargePrice>0"
>
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
婴儿
(附加费)
</text>
<text
style=
"margin-right: 30rpx;"
>
儿童
(附加费)
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
<view
style=
"text-align: right;"
>
{{
orderMsg
.
Baby
Num
}}
人 × ¥
{{
currentPriceInfo
.
babyChargePrice
}}
</view>
{{
orderMsg
.
Chird
Num
}}
人 × ¥
{{
currentPriceInfo
.
babyChargePrice
}}
</view>
</view>
</view>
</view>
</view>
...
@@ -491,11 +491,11 @@
...
@@ -491,11 +491,11 @@
let
money
=
price
*
this
.
orderMsg
.
ManNum
let
money
=
price
*
this
.
orderMsg
.
ManNum
money
+=
price
*
this
.
orderMsg
.
ChirdNum
money
+=
price
*
this
.
orderMsg
.
ChirdNum
money
+=
this
.
currentPriceInfo
.
babyChargePrice
*
this
.
orderMsg
.
ChirdNeedBe
dNum
money
+=
(
this
.
currentPriceInfo
.
babyChargePrice
?
this
.
currentPriceInfo
.
babyChargePrice
:
0
)
*
this
.
orderMsg
.
Chir
dNum
money
+=
this
.
currentPriceInfo
.
babyPrice
*
this
.
orderMsg
.
BabyNum
money
+=
(
this
.
currentPriceInfo
.
babyPrice
?
this
.
currentPriceInfo
.
babyPrice
:
0
)
*
this
.
orderMsg
.
BabyNum
money
+=
this
.
currentPriceInfo
.
childNeedPrice
*
this
.
orderMsg
.
ChirdNeedBedNum
money
+=
(
this
.
currentPriceInfo
.
childNeedPrice
?
this
.
currentPriceInfo
.
childNeedPrice
:
0
)
*
this
.
orderMsg
.
ChirdNeedBedNum
if
(
this
.
orderMsg
.
ChirdNoBedNum
>
0
)
{
if
(
this
.
orderMsg
.
ChirdNoBedNum
>
0
)
{
money
-=
this
.
currentPriceInfo
.
childNoNeedPrice
*
this
.
orderMsg
.
ChirdNoBedNum
money
-=
(
this
.
currentPriceInfo
.
childNoNeedPrice
?
this
.
currentPriceInfo
.
childNoNeedPrice
:
0
)
*
this
.
orderMsg
.
ChirdNoBedNum
}
}
this
.
price
=
money
this
.
price
=
money
...
@@ -639,7 +639,8 @@
...
@@ -639,7 +639,8 @@
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
console
.
log
(
'fail:'
,
err
);
console
.
log
(
'fail:'
,
err
);
uni
.
showToast
({
uni
.
showToast
({
title
:
"支付失败"
title
:
"支付失败"
,
icon
:
"none"
})
})
setTimeout
(()
=>
{
setTimeout
(()
=>
{
uni
.
redirectTo
({
uni
.
redirectTo
({
...
...
pages/jiuzhai/jz_SureOrder.vue
View file @
adaf1f13
...
@@ -434,7 +434,7 @@
...
@@ -434,7 +434,7 @@
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
儿童(不占床)
</text>
<text
style=
"margin-right: 30rpx;"
>
儿童(不占床)
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
{{
orderData
.
model
.
ChirdNum
-
orderData
.
model
.
ChirdNeedBedNum
}}
人 × ¥
{{
(
orderData
.
model
.
Unit_Price
+
(
orderData
.
modelPrice
.
ChildNoNeedPrice
?
orderData
.
modelPrice
.
ChildNoNeedPrice
:
0
))
}}
</view>
<view
style=
"text-align: right;"
>
{{
orderData
.
model
.
ChirdNum
-
orderData
.
model
.
ChirdNeedBedNum
}}
人 × ¥
{{
(
orderData
.
model
.
Unit_Price
-
(
orderData
.
modelPrice
.
ChildNoNeedPrice
?
orderData
.
modelPrice
.
ChildNoNeedPrice
:
0
))
}}
</view>
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderData.model.BabyNum>0"
>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderData.model.BabyNum>0"
>
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
...
@@ -443,12 +443,12 @@
...
@@ -443,12 +443,12 @@
<view
style=
"text-align: right;"
>
<view
style=
"text-align: right;"
>
{{
orderData
.
model
.
BabyNum
}}
人 × ¥
{{
orderData
.
modelPrice
.
BabyPrice
?
orderData
.
modelPrice
.
BabyPrice
:
0
}}
</view>
{{
orderData
.
model
.
BabyNum
}}
人 × ¥
{{
orderData
.
modelPrice
.
BabyPrice
?
orderData
.
modelPrice
.
BabyPrice
:
0
}}
</view>
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderData.model.
Baby
Num>0&&orderData.modelPrice.BabyChargePrice&&orderData.modelPrice.BabyChargePrice>0"
>
<view
class=
"flex f12 grey"
style=
"margin-bottom:40rpx;"
:key=
"index"
v-if=
"orderData.model.
Chird
Num>0&&orderData.modelPrice.BabyChargePrice&&orderData.modelPrice.BabyChargePrice>0"
>
<view
style=
"flex:1"
>
<view
style=
"flex:1"
>
<text
style=
"margin-right: 30rpx;"
>
婴儿
(附加费)
</text>
<text
style=
"margin-right: 30rpx;"
>
儿童
(附加费)
</text>
</view>
</view>
<view
style=
"text-align: right;"
>
<view
style=
"text-align: right;"
>
{{
orderData
.
model
.
Baby
Num
}}
人 × ¥
{{
orderData
.
modelPrice
.
BabyChargePrice
}}
</view>
{{
orderData
.
model
.
Chird
Num
}}
人 × ¥
{{
orderData
.
modelPrice
.
BabyChargePrice
}}
</view>
</view>
</view>
</view>
</view>
...
...
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