Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
陈峰
2019-02-22 14:21:03 +0800
Commit
b53b136accf3b67b609f13da30d50d55e43043c5
2 parents
f7d56765
5ec3d913
Merge branch 'hotfix/fix-yoluck-status' into 'release/6.8.6'
修改待开奖文案 See merge request
!1696
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
apps/activity/views/partial/yoluck/counter.hbs
apps/activity/views/partial/yoluck/prize-item.hbs
apps/activity/views/partial/yoluck/product-item-status.hbs
public/hbs/activity/yoluck/prize-item.hbs
public/hbs/activity/yoluck/product-item-status.hbs
apps/activity/views/partial/yoluck/counter.hbs
View file @
b53b136
...
...
@@ -21,7 +21,7 @@
{{/
isEqualOr
}}
{{#
isEqualOr
status
3
}}
<div
class=
"counter-num"
>
等待开奖中
</div>
<div
class=
"counter-num"
>
待开奖
</div>
{{/
isEqualOr
}}
{{#
isEqualOr
status
4
}}
...
...
@@ -29,7 +29,7 @@
{{/
isEqualOr
}}
{{#
isEqualOr
status
5
}}
<div
class=
"counter-num"
>
等待开奖中
</div>
<div
class=
"counter-num"
>
待开奖
</div>
{{/
isEqualOr
}}
</div>
...
...
apps/activity/views/partial/yoluck/prize-item.hbs
View file @
b53b136
...
...
@@ -13,7 +13,7 @@
{{/
ifcond
}}
{{#
ifcond
status
'==='
3
}}
<div
class=
"btn"
>
等待开奖中
</div>
<div
class=
"btn"
>
待开奖
</div>
{{/
ifcond
}}
{{#
ifcond
status
'==='
4
}}
...
...
@@ -21,7 +21,7 @@
{{/
ifcond
}}
{{#
ifcond
status
'==='
5
}}
<div
class=
"btn"
>
等待开奖中
</div>
<div
class=
"btn"
>
待开奖
</div>
{{/
ifcond
}}
{{#
isEqualOr
status
1
2
6
}}
...
...
apps/activity/views/partial/yoluck/product-item-status.hbs
View file @
b53b136
...
...
@@ -11,13 +11,13 @@
<a
class=
"btn ok js-join"
data-id=
"
{{
id
}}
"
>
参加抽奖
</a>
{{/
isEqualOr
}}
{{#
isEqualOr
status
3
}}
<div
class=
"btn cancel"
>
等待开奖中
</div>
<div
class=
"btn cancel"
>
待开奖
</div>
{{/
isEqualOr
}}
{{#
isEqualOr
status
4
}}
<div
class=
"btn cancel"
>
活动结束
</div>
{{/
isEqualOr
}}
{{#
isEqualOr
status
5
}}
<div
class=
"btn cancel"
>
等待开奖中
</div>
<div
class=
"btn cancel"
>
待开奖
</div>
{{/
isEqualOr
}}
</div>
...
...
public/hbs/activity/yoluck/prize-item.hbs
View file @
b53b136
...
...
@@ -13,7 +13,7 @@
{{/
ifcond
}}
{{#
ifcond
status
'==='
3
}}
<div
class=
"btn"
>
等待开奖中
</div>
<div
class=
"btn"
>
待开奖
</div>
{{/
ifcond
}}
{{#
ifcond
status
'==='
4
}}
...
...
@@ -21,7 +21,7 @@
{{/
ifcond
}}
{{#
ifcond
status
'==='
5
}}
<div
class=
"btn"
>
等待开奖中
</div>
<div
class=
"btn"
>
待开奖
</div>
{{/
ifcond
}}
{{#
is-equal-or
status
1
2
6
}}
...
...
public/hbs/activity/yoluck/product-item-status.hbs
View file @
b53b136
...
...
@@ -12,7 +12,7 @@
{{/
is-equal-or
}}
{{#
is-equal-or
status
3
}}
<div
class=
"btn cancel"
>
等待开奖中
</div>
<div
class=
"btn cancel"
>
待开奖
</div>
{{/
is-equal-or
}}
{{#
is-equal-or
status
4
}}
...
...
@@ -20,6 +20,6 @@
{{/
is-equal-or
}}
{{#
is-equal-or
status
5
}}
<div
class=
"btn cancel"
>
等待开奖中
</div>
<div
class=
"btn cancel"
>
待开奖
</div>
{{/
is-equal-or
}}
</div>
...
...
Please
register
or
login
to post a comment