返场页面显示修改

src/components/blessingPreheat/index.js

@@ -111,6 +111,10 @@ class BlessingPreheat extends Component {
           id: 'best-courses'
         },
         {
+          text: '大咖直播',
+          id: 'live'
+        },
+        {
           text: '幸运大抽奖',
           id: 'lucky-draw'
         },
@@ -122,10 +126,6 @@ class BlessingPreheat extends Component {
           text: 'AI测试',
           id: 'ai-test'
         },
-        {
-          text: '大咖直播',
-          id: 'live'
-        },
       ],
       index: 0,
       userHasError: props.user.hasError,
@@ -142,8 +142,12 @@ class BlessingPreheat extends Component {
   }
 
   componentDidMount() {
+    const _this = this;
     this.fetchUserBlessing()
-    this.setInitialNavActiveStatus()
+    setTimeout(function(){
+      // 这里有获取ID的步骤，由于运营过多的调整，导致顺序不定，所以包含ID的title必须要放到判断中（防止出现多个title），设置定时器是因为如果返回较慢 获取不到ID导致报错
+      _this.setInitialNavActiveStatus()
+    }, 0);
     window.addEventListener('scroll', throttle(this.calcNavActive, 100))
     if (is_weixin()) {
       wxShare({
@@ -616,7 +620,7 @@ class BlessingPreheat extends Component {
           index={index}
         />
 
-        {/* 精品课程特惠专区 */}
+        {/* 精品课程特惠专区--返场 */}
         {
           onlyShow && (
             <>
@@ -632,11 +636,21 @@ class BlessingPreheat extends Component {
           )
         }
 
+        {/* 大咖直播--返场 */}
+        {
+          onlyShow && <Live isFormal={isFormal} isLogin={isLogin}/>
+        }
+
         {/* 抽奖--正式 */}
         {
           isFormal === 1 &&
           <>
-            <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}}/>
+            <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: onlyShow ? '30px 0 10px' : '60px 0 10px'}}/>
+            {
+              onlyShow ? (
+                <p>活动已结束</p>
+              ) : null
+            }
             <div className="formal-draw-btns">
               <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
               <button className='prize-record' onClick={this.getMyPrizeRecord}>中奖记录></button>
@@ -648,6 +662,11 @@ class BlessingPreheat extends Component {
 
         {/* 积福气 */}
         <ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '30px 0 15px'}}/>
+        {
+          onlyShow ? (
+            <p>活动已结束</p>
+          ) : null
+        }
         <Link className="blessing__sort" to="/blessingRank"></Link>
 
 
@@ -664,11 +683,10 @@ class BlessingPreheat extends Component {
         />
 
         {/* 幸运大抽奖--预热 */}
-        <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}}/>
-
         {
           isFormal === 0 &&
           <>
+            <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}}/>
             <p className="luck-draw__tip">- 将于11月11日10点开启 -</p>
             <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
             <LuckDraw/>
@@ -676,20 +694,6 @@ class BlessingPreheat extends Component {
 
         }
 
-
-        {/* 抽奖--正式 */}
-        {
-          isFormal === 1 &&
-          <>
-            <div className="formal-draw-btns">
-              <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
-              <button className='prize-record' onClick={this.getMyPrizeRecord}>中奖记录></button>
-            </div>
-            <FormalDraw toLogin={this.toLogin}/>
-          </>
-
-        }
-
         {/*定金--只在预热期间显示*/}
         {
           isFormal === 0 &&
@@ -736,7 +740,11 @@ class BlessingPreheat extends Component {
           <SharePopup isClose={isClose} toClose={() => this.handleToHide('shareMark')}/>
         }
         <ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}}/>
-
+        {
+              onlyShow ? (
+                <p>活动已结束</p>
+              ) : null
+            }
         <div className="test__record" onClick={() => this.handleToShow('showRecordList', true)}>
           测试记录>
         </div>
@@ -750,7 +758,11 @@ class BlessingPreheat extends Component {
 
         <RankList></RankList>
 
-        <Live isFormal={isFormal} isLogin={isLogin}/>
+        {/* 大咖直播 -- 正式活动 */}
+        {
+          !onlyShow && <Live isFormal={isFormal} isLogin={isLogin}/>
+        }
+
         {
           addressPopupVisible &&
           <div className="address-mask">

src/components/blessingPreheat/index.scss

 #blessing-preheat {
     background: #5327FA;
+    padding-bottom: 30px;
 }
 
 .test__record {