Commit f590eef5 by FE

pull and sovle

parents 9e29f131 7707bad1
......@@ -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)
? (
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 &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment