返场

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

@@ -605,11 +605,14 @@ class YearCourse extends Component {
             removable,
             sum,
         } = this.state
-        const { stage } = this.props
+        const { stage,treasureStage } = this.props
         return (
             <div className={'year-index-course'}>
 
                 {/*浮框*/}
+
+                {
+                    Number(treasureStage) === 1 &&
                     <div className='nav-right'>
                         <span onClick={this.toBoxList} className='nav-right__link'>
                         未开宝箱
@@ -626,6 +629,23 @@ class YearCourse extends Component {
                             }
                         </a>
                     </div>
+                }
+
+                {
+                    Number(treasureStage) === 0 &&
+                    <div className='nav-right-wish nav-right'>
+                        <a onClick={() => this.toYearWish()} className='nav-right__link'>
+                            心愿单
+                            {
+                                sum > 0 &&
+                                <i className="nav-right__number">{sum}</i>
+                            }
+                        </a>
+                    </div>
+                }
+
+
+
 
                 {/* 重磅好课 */}
                 <CommonContainer title='重磅好课' id='year-course'>
@@ -673,6 +693,8 @@ class YearCourse extends Component {
                 </CommonContainer>
 
                 {/* 人气好课免费学 */}
+                {
+                    Number(stage) !== 3 &&
                     <CommonContainer title='人气好课免费学' id='year-free'>
                         <a className='boss__add' href="/active/givecourse?activename=shuangdan">更有42本技术书籍免费送</a>
                         {
@@ -720,10 +742,11 @@ class YearCourse extends Component {
                             </>
                         }
                     </CommonContainer>
+                }
 
                 {/* stage，活动阶段 0-不在活动时间 1-预热 2-正式 3-返场 */}
                 {
-                    Number(stage) === 2 &&
+                    Number(stage) !== 1 &&
                     <>
                         {/* 精品好课1分开抢 */}
                         <CommonContainer title='精品好课1分开抢' id='year-group'>
@@ -998,7 +1021,7 @@ class YearCourse extends Component {
                     </>
                 }
                 {
-                    Number(stage) !== 2 &&
+                    Number(stage) === 1 &&
                     <>
                         {/* 精品好课1分开抢 */}
                         <CommonContainer title='精品好课1分开抢' id='year-group'>

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

@@ -416,5 +416,8 @@
       line-height: 14px;
     }
   }
+  .nav-right-wish {
+
+  }
 
 }
\ No newline at end of file

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

@@ -133,7 +133,7 @@ export default class index extends Component {
                     <div id="banner" className="banner-treasure__header"
                          style={{backgroundImage: `url(${banner})`}}></div>
                     <div className="banner-treasure__nav">
-                        <TreasureNav id="banner" treasure_stage={treasure_stage}/>
+                        <TreasureNav id="banner" treasure_stage={treasure_stage} activeStage={activity_stage}/>
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
@@ -148,7 +148,7 @@ export default class index extends Component {
                 }
 
                 {/* 课程 */}
-                <YearCourse stage={activity_stage} isAppUpdate={this.state.isAppUpdate} />
+                <YearCourse stage={activity_stage} treasureStage={treasure_stage} isAppUpdate={this.state.isAppUpdate} />
 
                 {/*好友加入队伍提醒；获得宝箱提醒；开售提醒弹窗，需要自取，注意修改文案*/}
                 {
@@ -181,6 +181,9 @@ export default class index extends Component {
                         </div>
                     </CommonPopup>
                 }
+
+
+                <div className={'btm-rule'}>* 本活动解释权归北京七月在线科技有限公司所有 *</div>
             </div>
         )
     }

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

@@ -59,6 +59,12 @@
     }
   }
 
+  .btm-rule {
+    color: #fff;
+    font-size: 12px;
+    width: 100%;
+    text-align: center;
+  }
 }
 
 .year-index + .year19-index {

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

@@ -48,22 +48,23 @@ class TreasureNav extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    this.initNav(nextProps.treasure_stage);
+    this.initNav(nextProps.treasure_stage,nextProps.activeStage);
   }
 
-  initNav = (treasure_stage) => {
+  initNav = (treasure_stage,activeStage) => {
     let {navs} = this.state;
     // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
+    let data = this.state.navs
     if(treasure_stage === 0) {
+      data = navs.filter(item => item.id !== 'year-treasure')
+    }
+    if(activeStage === 3) {
+      data = data.filter(item => item.id !== 'year-free')
+    }
     this.setState({
-        formatNavs: navs.filter(item => item.id !== 'year-treasure')
-      });
-    }else {
-      this.setState({
-        formatNavs: navs
+      formatNavs: data
     })
   }
-  }
 
   calcNavActive = () => {
     const { formatNavs } = this.state;

src/components/activity/newyear-2019/year-wish/index.js

@@ -149,7 +149,7 @@ class YarnWish extends Component {
                     list.length > 0
                     ? <>
                         {
-                            activityStage === 2 &&
+                            activityStage !== 1 &&
                             <>
 
                                 <CommonContainer>
@@ -322,7 +322,7 @@ class YarnWish extends Component {
                             </>
                         }
                         {
-                            activityStage !== 2 &&
+                            activityStage === 1 &&
                             <>
                                 <CommonContainer>
                                     <div className='groupcourse course-box'>