bug

src/components/activity/newyear-2019/common/system-bullet-screen/index.js

@@ -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
       })

src/components/activity/newyear-2019/common/system-bullet-screen/system-bullet-screen.scss

 @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;
 }

src/components/activity/newyear-2019/common/user-bullet-screen/index.js

@@ -16,7 +16,7 @@ class UserBulletScreen extends Component {
     this.getBulletScreenData(true)
   }
 
-  componentWillUpdate() {
+  componentWillUnmount() {
     this.swiper && this.swiper.destroy()
   }
 

src/components/activity/newyear-2019/myTreasure/prize.js

@@ -86,7 +86,8 @@ export default (props) => {
       {/* 第三：奖品，任意线上课程兑换券 */}
       {
         (!bind_phone && !bind_address && prize_type === 5) &&
-        <a className="team-result">文案待定</a>
+        <a className="team-result">关注服务号“七月在线实验室” 回复“领课”
+        </a>
       }
     </>
   )

src/components/activity/newyear-2019/preheat/YearCourse/index.scss

@@ -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 {

src/components/activity/newyear-2019/preheat/index.js

@@ -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/>
 

src/components/activity/newyear-2019/treasure-box/rank.js

@@ -21,18 +21,20 @@ class TreasureRank extends Component {
     http.get(`${API.home}/sys/treasure/ranking`).then(res => {
       const { code, data } = res.data;
       if(code === 200) {
-        if(data.length > 5) {
-          this.setState({
-            rank: data.filter((item, index) => index < 5),
-            rankList: data,
-            isMore: true,
-          });
-        }else {
-          this.setState({
-            rank: data,
-            rankList: data,
-            isMore: false,
-          });
+        if(JSON.stringify(data) !== '{}') {
+          if(data.length > 5) {
+            this.setState({
+              rank: data.filter((item, index) => index < 5),
+              rankList: data,
+              isMore: true,
+            });
+          }else {
+            this.setState({
+              rank: data,
+              rankList: data,
+              isMore: false,
+            });
+          }
         }
       }
     });
@@ -56,52 +58,57 @@ class TreasureRank extends Component {
   render() {
     const { rank, isMore } = this.state;
     return (
-      <div data-skip="rank">
-        <div className="rank-title">
-          <i className="rank-title__decorate"></i>
-          <h2 className="rank-title__txt">宝箱达人榜</h2>
-          <i className="rank-title__decorate"></i>
-        </div>
-        <p className="rank-desc">宝箱数量前50名可额外获得一份奖品，数量相同的用时短者排名在前</p>
-        <dl className="rank-header">
-          <dd className="rank-column">排名</dd>
-          <dd className="rank-column">用户</dd>
-          <dd className="rank-column">宝箱数量</dd>
-          <dd className="rank-column">奖品</dd>
-        </dl>
-        <div className="rank-body">
-          {
-            rank.map((item, index) => (
-              <dl className="rank-item" key={index}>
-                <dd className="rank-column">
-                  {
-                    index <= 2
-                    ? <span className="rank-column__number" data-num={index}></span>
-                    : <span>{index+1}</span>
-                  }
-                </dd>
-                <dd className="rank-column">
-                  <span className="rank-column__name">{item.user_name}</span>
-                </dd>
-                <dd className="rank-column">
-                  <span>{item.num}</span>
-                </dd>
-                <dd className="rank-column">
-                  {
-                    item.url
-                    ? <a className="rank-column__txt" href={item.url}>{item.prize_name}</a>
-                    : <span className="rank-column__txt">{item.prize_name}</span>
-                  }
-                </dd>
-              </dl>
-            ))
-          }
-          <div className="rank-more" onClick={this.switchMoreRank}>
-            <span className="rank-more__txt">{isMore? '展开' : '收起'}</span>
-            <i className="rank-more__icon" data-more={isMore}></i>
+      <>
+        {
+          rank.length !== 0 &&
+          <div data-skip="rank">
+            <div className="rank-title">
+              <i className="rank-title__decorate"></i>
+              <h2 className="rank-title__txt">宝箱达人榜</h2>
+              <i className="rank-title__decorate"></i>
+            </div>
+            <p className="rank-desc">宝箱数量前50名可额外获得一份奖品，数量相同的用时短者排名在前</p>
+            <dl className="rank-header">
+              <dd className="rank-column">排名</dd>
+              <dd className="rank-column">用户</dd>
+              <dd className="rank-column">宝箱数量</dd>
+              <dd className="rank-column">奖品</dd>
+            </dl>
+            <div className="rank-body">
+              {
+                rank.map((item, index) => (
+                  <dl className="rank-item" key={index}>
+                    <dd className="rank-column">
+                      {
+                        index <= 2
+                        ? <span className="rank-column__number" data-num={index}></span>
+                        : <span>{index+1}</span>
+                      }
+                    </dd>
+                    <dd className="rank-column">
+                      <span className="rank-column__name">{item.user_name}</span>
+                    </dd>
+                    <dd className="rank-column">
+                      <span>{item.num}</span>
+                    </dd>
+                    <dd className="rank-column">
+                      {
+                        item.url
+                        ? <a className="rank-column__txt" href={item.url}>{item.prize_name}</a>
+                        : <span className="rank-column__txt">{item.prize_name}</span>
+                      }
+                    </dd>
+                  </dl>
+                ))
+              }
+              <div className="rank-more" onClick={this.switchMoreRank}>
+                <span className="rank-more__txt">{isMore? '展开' : '收起'}</span>
+                <i className="rank-more__icon" data-more={isMore}></i>
+              </div>
+            </div>
           </div>
-        </div>
-      </div>
+        }
+      </>
     )
   }
 }