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
f475f85a
Commit
f475f85a
authored
Jan 16, 2025
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/zk123/jz_travel
parents
b617bafc
1c8edc8b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
jz_Line.vue
pages/jiuzhai/jz_Line.vue
+1
-0
jz_SureOrder.vue
pages/jiuzhai/jz_SureOrder.vue
+8
-1
No files found.
pages/jiuzhai/jz_Line.vue
View file @
f475f85a
...
...
@@ -583,6 +583,7 @@
})
},
onLoad
(
option
)
{
console
.
log
(
"option"
,
option
);
if
(
option
&&
option
.
LineTeamIds
)
{
let
NewArr
=
[];
NewArr
=
option
.
LineTeamIds
.
split
(
","
);
...
...
pages/jiuzhai/jz_SureOrder.vue
View file @
f475f85a
...
...
@@ -501,6 +501,14 @@
orderData
.
modelPrice
.
BabyChargePrice
}}
</view>
</view>
<view
class=
"flex f12 grey"
style=
"margin-bottom: 40rpx"
:key=
"index"
v-if=
" orderData.model&& orderData.model.DiscountMoney&&orderData.model.DiscountMoney>0"
>
<view
style=
"flex: 1"
>
<text
style=
"margin-right: 30rpx"
>
优惠金额
</text>
</view>
<view
style=
"text-align: right"
>
{{
orderData
.
model
.
DiscountMoney
}}
</view>
</view>
</view>
</view>
<view
class=
"empty-block"
></view>
...
...
@@ -699,7 +707,6 @@
if
(
tempData
&&
tempData
.
mall
&&
tempData
.
mall
.
wechatmessage
)
{
tempObj
=
tempData
.
mall
.
wechatmessage
;
}
var
tmplIds
=
[];
if
(
tempObj
&&
tempObj
.
length
>
0
)
{
tempObj
.
forEach
((
x
)
=>
{
...
...
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