Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
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
baiguangyao
mr-julyedu
Commits
f590eef5
Commit
f590eef5
authored
Oct 30, 2019
by
FE
Browse files
Options
Browse Files
Download
Plain Diff
pull and sovle
parents
9e29f131
7707bad1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
src/components/blessingPreheat/collectBlessing/index.js
+11
-12
No files found.
src/components/blessingPreheat/collectBlessing/index.js
View file @
f590eef5
...
...
@@ -86,7 +86,7 @@ class CollectBlessing extends Component {
{
item
.
rules
.
map
(
item
=>
{
return
(
<
p
>
<
p
key
=
{
item
.
id
}
>
{
item
.
text
}
<
span
>
{
item
.
des
}
<
/span
>
<
/p
>
...
...
@@ -104,17 +104,16 @@ class CollectBlessing extends Component {
<
i
className
=
"collect-blessing__num"
>
{
index
+
1
}
<
/i
>
<
p
className
=
"collect-blessing__title"
>
{
item
}
<
/p
>
{
(
index
===
0
&&
isLogin
&&
isSign
)
?
(
<
a
className
=
"collect-blessing__content"
onClick
=
{
handleToShowNotice
}
>
+
5
点
<
br
/>
福气值
<
/a
>
)
:
(
<
Link
to
=
'/passport'
className
=
"collect-blessing__content"
>
点击
<
br
/>
签到
<
/Link
>
)
index
===
0
&&
(
isLogin
&&
isSign
)
&&
<
a
className
=
"collect-blessing__content"
onClick
=
{
handleToShowNotice
}
>
+
5
点
<
br
/>
福气值
<
/a
>
}
{
index
===
0
&&
(
!
isLogin
||
!
isSign
)
&&
<
Link
to
=
'/passport'
className
=
"collect-blessing__content"
>
点击
<
br
/>
签到
<
/Link
>
}
{
index
===
1
&&
...
...
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