Commit f41284bf by FE

Merge branch '00' into dev

parents 60d68290 e6594804
...@@ -67,11 +67,12 @@ class Prizes extends Component { ...@@ -67,11 +67,12 @@ class Prizes extends Component {
innerOffsetTop = 0.12458, innerOffsetTop = 0.12458,
footerOffsetTop = 0.595, footerOffsetTop = 0.595,
h = this.prizeList.scrollHeight, h = this.prizeList.scrollHeight,
scrollListHeight = headHeight + h - (innerOffsetTop * headHeight) - (footerOffsetTop * footerHeight) + footerHeight scrollListHeight = headHeight + h - (innerOffsetTop * headHeight) - (footerOffsetTop * footerHeight) + footerHeight,
bottomOffset = 27
this.prizeBox.style.height = `${scrollListHeight}px` this.prizeBox.style.height = `${scrollListHeight + bottomOffset}px`
this.innerBox.style.height = `${h}px` this.innerBox.style.height = `${h}px`
this.bg.style.height = `${h - footerHeight + innerOffsetTop * headHeight}px` this.bg.style.height = `${h - footerHeight + innerOffsetTop * headHeight + bottomOffset}px`
} }
return {unfoldList: !prev.unfoldList} return {unfoldList: !prev.unfoldList}
}) })
......
...@@ -248,7 +248,9 @@ class MyTreasure extends Component { ...@@ -248,7 +248,9 @@ class MyTreasure extends Component {
http.get(`${API.home}/sys/treasure/my`).then(res => { http.get(`${API.home}/sys/treasure/my`).then(res => {
const { code, data } = res.data; const { code, data } = res.data;
if (code === 200) { if (code === 200) {
this.rule = data.rule; this.setState({
rule: data.rule
});
if (Array.isArray(data.team) && data.team.length > 0) { if (Array.isArray(data.team) && data.team.length > 0) {
this.initNoSplitInfo(data.team); this.initNoSplitInfo(data.team);
this.judgeIsHaveId(data.team); this.judgeIsHaveId(data.team);
...@@ -263,10 +265,6 @@ class MyTreasure extends Component { ...@@ -263,10 +265,6 @@ class MyTreasure extends Component {
isEmpty: true, isEmpty: true,
}); });
} }
} else if (code === 4030 || code === 4040) {
this.setState({
isEmpty: true,
});
} }
}); });
} }
...@@ -402,6 +400,7 @@ class MyTreasure extends Component { ...@@ -402,6 +400,7 @@ class MyTreasure extends Component {
isCreate, isCreate,
createInfo, createInfo,
prizeName, prizeName,
rule,
} = this.state; } = this.state;
return ( return (
<div data-skip="treasure"> <div data-skip="treasure">
...@@ -530,6 +529,12 @@ class MyTreasure extends Component { ...@@ -530,6 +529,12 @@ class MyTreasure extends Component {
</Mask> </Mask>
</div> </div>
} }
<div className="activity-rule__header">
<i className="activity-rule__decorate"></i>
<h2 className="activity-rule__title">活动规则</h2>
<i className="activity-rule__decorate"></i>
</div>
<div className="activity-rule__body" dangerouslySetInnerHTML={{__html: rule}}></div>
</div> </div>
) )
} }
......
...@@ -47,6 +47,39 @@ ...@@ -47,6 +47,39 @@
color: #090909; color: #090909;
background-color: #FFE319; background-color: #FFE319;
} }
.activity-rule__header {
display: flex;
align-items: center;
justify-content: center;
margin: 49px 0 0;
}
.activity-rule__title {
margin: 0 16px;
font-size: 18px;
color: #FFE300;
line-height: 1;
}
.activity-rule__decorate {
display: inline-block;
width: 11px;
height: 12px;
background-size: cover;
background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/icon-decorate-0.png');
}
.activity-rule__body {
margin: 13px 0 0;
padding: 0 21px 40px;
p {
font-size: 12px;
color: #FFE300;
line-height: 18px;
}
}
} }
// 所有弹窗 // 所有弹窗
......
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