Commit feef485b by xuzhenghua

bug

parent 48722676
......@@ -22,7 +22,6 @@ class SystemBulletScreen extends Component {
this.swiper && this.swiper.destroy()
}
initializeSwiper = () => {
const _this = this
this.swiper = new Swiper('.sys-bullet-screen-swiper-container', {
......@@ -62,18 +61,16 @@ class SystemBulletScreen extends Component {
}, 1000)
} else {
setTimeout(() => {
++this.count;
swiper.slideNext()
}, 3000)
}
}
transitionEnd = () => {
const {
bullets = []
} = this.props
const {bullets} = this.props
const len = bullets.length * 3
if (++this.count === len) {
setTimeout(() => {
this.sysNotice.style.height = `0px`
......@@ -87,7 +84,7 @@ class SystemBulletScreen extends Component {
removeSystemNotices = e => {
e.persist()
if(e.target === this.sysNotice){
if (e.target === this.sysNotice) {
this.setState({
showNotices: false
})
......
@import "../user-bullet-screen/bullet-screen";
#system-bullet-screen {
@extend .bullet-screen;
overflow: hidden;
margin-top: 11px;
margin-bottom: 16px;
......@@ -25,9 +26,9 @@
span {
display: inline-block;
white-space: nowrap;
overflow: visible;
line-height: 30px;
}
}
@extend .bullet-screen;
}
......@@ -16,7 +16,7 @@ class UserBulletScreen extends Component {
this.getBulletScreenData(true)
}
componentWillUpdate() {
componentWillUnmount() {
this.swiper && this.swiper.destroy()
}
......
......@@ -86,7 +86,8 @@ export default (props) => {
{/* 第三:奖品,任意线上课程兑换券 */}
{
(!bind_phone && !bind_address && prize_type === 5) &&
<a className="team-result">文案待定</a>
<a className="team-result">关注服务号“七月在线实验室” 回复“领课”
</a>
}
</>
)
......
......@@ -273,8 +273,8 @@
background-repeat: no-repeat;
background-size: cover;
position: fixed;
top: 50%;
right: 0;
bottom: 20%;
margin-top: -57px;
z-index: 22;
.nav-right__link {
......
......@@ -131,23 +131,7 @@ export default class index extends Component {
</div>
<div className="banner-treasure__decorate"></div>
</div>
{/*浮框*/}
<div className='nav-right'>
<span onClick={this.toBoxList} className='nav-right__link'>
未开宝箱
{
removable > 0 &&
<i className="nav-right__number">{removable}</i>
}
</span>
<a onClick={() => this.toYearWish()} className='nav-right__link'>
心愿单
{
this.state.txt1 > 0 &&
<i className="nav-right__number">{this.state.txt1}</i>
}
</a>
</div>
{/* 大咖直播 */}
<LiveRoom/>
......
......@@ -21,6 +21,7 @@ class TreasureRank extends Component {
http.get(`${API.home}/sys/treasure/ranking`).then(res => {
const { code, data } = res.data;
if(code === 200) {
if(JSON.stringify(data) !== '{}') {
if(data.length > 5) {
this.setState({
rank: data.filter((item, index) => index < 5),
......@@ -35,6 +36,7 @@ class TreasureRank extends Component {
});
}
}
}
});
}
......@@ -56,6 +58,9 @@ class TreasureRank extends Component {
render() {
const { rank, isMore } = this.state;
return (
<>
{
rank.length !== 0 &&
<div data-skip="rank">
<div className="rank-title">
<i className="rank-title__decorate"></i>
......@@ -102,6 +107,8 @@ class TreasureRank extends Component {
</div>
</div>
</div>
}
</>
)
}
}
......
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