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
8e007732
Commit
8e007732
authored
Mar 04, 2025
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'B2C' of
http://gitlab.oytour.com/zk123/jz_travel
into B2C
parents
60c0f1cd
e9727a0b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
155 additions
and
67 deletions
+155
-67
index.vue
pages/jiuzhai/components/sign/index.vue
+19
-4
jz_Line.vue
pages/jiuzhai/jz_Line.vue
+8
-1
jz_LineDetail.vue
pages/jiuzhai/jz_LineDetail.vue
+128
-62
No files found.
pages/jiuzhai/components/sign/index.vue
View file @
8e007732
...
...
@@ -107,7 +107,7 @@
<view
style=
"font-size: 12px; padding-bottom: 3px"
v-if=
"priceStauts.length > 0"
>
<view
v-if=
"priceStauts[line][index] > 0"
style=
"color:#FF3166"
>
¥
{{
priceStauts
[
line
][
index
]
}}
</view>
<view
v-if=
"priceStauts[line][index] == -1"
>
售罄
</view>
<view
v-if=
"priceStauts[line][index] == -1"
>
售罄
</view>
<view
v-if=
"priceStauts[line][index] == -2"
>
候补
</view>
</view>
</view>
...
...
@@ -313,8 +313,16 @@
const
price
=
this
.
priceList
.
find
(
p
=>
p
.
startDate
==
ds
)
if
(
price
)
{
isexsit
=
true
if
(
price
.
remainNum
>
0
)
days
.
push
(
this
.
$utils
.
getretailer
()
?
price
.
b2BPrice
:
price
.
b2CPrice
)
if
(
price
.
remainNum
>
0
){
let
priceNum
=
0
// #ifdef MP-DI
priceNum
=
price
.
b2CPrice
/// #endif
// #ifdef MP-AG
priceNum
=
price
.
b2BPrice
/// #endif
days
.
push
(
priceNum
)
}
else
if
(
price
.
isSubstitution
==
1
)
days
.
push
(
-
2
)
else
...
...
@@ -334,7 +342,14 @@
// if (x.startDate == `${year}-${m}-${d}`) {
// isexsit = true;
// if (x.remainNum > 0) {
// days.push(this.$utils.getretailer() ? x.b2BPrice : x.b2CPrice);
// let priceNum = 0
// // #ifdef MP-DI
// priceNum = x.b2CPrice
// // #endif
// // #ifdef MP-AG
// priceNum = x.b2BPrice
// // #endif
// days.push(priceNum);
// //days.push(x.b2CPrice);
// } else {
// days.push(-1);
...
...
pages/jiuzhai/jz_Line.vue
View file @
8e007732
...
...
@@ -498,7 +498,14 @@
</view>
<view
class=
"price"
style=
"text-align: unset;"
>
<text>
¥
</text>
<text
class=
"money"
>
{{
parseFloat
(
$utils
.
getretailer
()?
item
.
b2BPrice
:
item
.
b2CPrice
).
toFixed
(
2
)
}}
</text>
<text
class=
"money"
>
<!-- #ifdef MP-DI -->
{{
parseFloat
(
item
.
b2CPrice
).
toFixed
(
2
)
}}
<!-- #endif -->
<!-- #ifdef MP-AG -->
{{
parseFloat
(
item
.
b2BPrice
).
toFixed
(
2
)
}}
<!-- #endif -->
</text>
</view>
</view>
</view>
...
...
pages/jiuzhai/jz_LineDetail.vue
View file @
8e007732
This diff is collapsed.
Click to expand it.
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