Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
activities
/
web-lottery
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
1
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ce6f971a
authored
Oct 26, 2022
by
Lays-lzq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修复参与人数模式下的错误
parent
e91fcc9b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
8 deletions
+19
-8
components/Lottery/Timing/JoinButton.vue
+1
-4
components/Lottery/Timing/Rewards.vue
+2
-1
components/Lottery/Timing/TimingStatus.vue
+16
-3
components/Lottery/Timing/img/gift.png
+0
-0
No files found.
components/Lottery/Timing/JoinButton.vue
View file @
ce6f971a
...
...
@@ -3,10 +3,7 @@
<div
class=
"btn-box"
:style=
"
{ '--btnBottom': btnBottom }">
<template
v-if=
"+lotteryInfo.status === LOTTERY_STATUS.teaser"
>
<button
v-if=
"lotteryInfo.condition === 1"
class=
"join-btn pre"
>
未开始
</button>
<button
v-if=
"lotteryInfo.condition === 2"
class=
"join-btn pre countdown"
>
<template
v-if=
"hours > 0"
>
{{
hours
|
filterNum
}}
:
</
template
>
{{ minutes | filterNum }}:{{ seconds | filterNum }}后开始
</button>
<button
v-if=
"lotteryInfo.condition === 2"
class=
"join-btn pre"
>
等待开奖
</button>
</
template
>
<
template
v-if=
"+lotteryInfo.status === LOTTERY_STATUS.start"
>
<template
v-if=
"lotteryInfo.userTimes === 0 && lotteryInfo.isDraw"
>
...
...
components/Lottery/Timing/Rewards.vue
View file @
ce6f971a
...
...
@@ -10,7 +10,8 @@
<div
class=
"intro__sub"
>
本场活动奖品:
</div>
<div
class=
"intro__rewards"
>
<div
v-for=
"item in lotteryInfo.prizeConfigs"
:key=
"item.id"
class=
"intro__rewards-item"
>
<img
:src=
"item.icon"
alt=
""
/>
<img
v-if=
"item.icon"
:src=
"item.icon"
alt=
""
/>
<img
v-else
src=
"./img/gift.png"
alt=
""
/>
<div>
{{
item
.
name
}}
</div>
</div>
</div>
...
...
components/Lottery/Timing/TimingStatus.vue
View file @
ce6f971a
...
...
@@ -19,7 +19,7 @@
</template>
<
template
v-if=
"type === 2"
>
<div
class=
"joinnum-box"
>
<p>
参与人数满
{{
lotteryInfo
.
joinNum
}}
人自动开奖
(当前参与
{{
lotteryInfo
.
activeNum
}}
人)
</p>
<p>
参与人数满
{{
lotteryInfo
.
joinNum
}}
人自动开奖
( 当前参与
{{
lotteryInfo
.
activeNum
}}
人 )
</p>
</div>
</
template
>
</section>
...
...
@@ -134,9 +134,22 @@ export default {
color
:
#999
;
}
.joinnum-box
{
font-size
:
14px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
font-size
:
13px
;
font-family
:
PingFangSC-Medium
,
PingFang
SC
;
font-weight
:
500
;
color
:
#fff6da
;
line-height
:
18.5px
;
p
{
color
:
#999999
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
padding
:
0
9px
;
height
:
23px
;
background
:
rgba
(
0
,
0
,
0
,
0.21
);
border-radius
:
11.5px
;
}
}
}
...
...
components/Lottery/Timing/img/gift.png
0 → 100644
View file @
ce6f971a
7.93 KB
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