Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00

src/components/activity/newyear-2019/common/prizes/index.js

@@ -115,6 +115,9 @@ class Prizes extends Component {
                   )
                 })
               }
+              <li>
+                <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/prize-placeholder.png" alt=""/>
+              </li>
             </ul>
           </div>
           <div className="show-more" onClick={this.showMore}>

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

@@ -28,6 +28,9 @@
     span {
         font-size: 12px;
         color: #fff;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 }
 #user-bullet-screen {

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

@@ -51,8 +51,7 @@ class UserBulletScreen extends Component {
     return `
               <li class="swiper-slide">
                 <img class="avatar" src="${item.avatar_file}" alt="">
-                <span>${item.user_name}</span>
-                <span>${item.msg}</span>
+                <span>${item.user_name} ${item.msg}</span>
               </li>
             `
   })
@@ -87,8 +86,7 @@ class UserBulletScreen extends Component {
                 <li className='swiper-slide' key={index}>
                   <img src={item['avatar_file']}
                        alt="" className="avatar"/>
-                  <span>{item.user_name}</span>
-                  <span>{item.msg}</span>
+                  <span>{item.user_name} {item.msg}</span>
                 </li>
               )
             })

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

@@ -404,7 +404,7 @@ class YearCourse extends Component {
                                                 <div className="coupon-course__footer">
                                                     {
                                                         item.is_buy == 1 &&
-                                                        <a onClick={this.toCourse} className="btn to-study">开始学习</a>
+                                                        <a onClick={() => this.toCourse(item.course_id)} className="btn to-study">开始学习</a>
                                                     }
                                                     {
                                                         item.is_buy == 0 &&
@@ -440,7 +440,7 @@ class YearCourse extends Component {
                                                 <div className="coupon-course__footer">
                                                     {
                                                         item.is_buy == 1 &&
-                                                        <a toCourse={this.toCourse} className="btn to-study">开始学习</a>
+                                                        <a onClick={() => this.toCourse(item.course_id)} className="btn to-study">开始学习</a>
                                                     }
                                                     {
                                                         item.is_buy == 0 &&

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

@@ -7,9 +7,10 @@ import TreasureNav from './nav'
 import CommonPopup from './../common/commonPopup/index'
 import cookie from "js-cookie"
 import {setCurrentUser, startFetchUser} from "@/store/userAction"
-import {SendMessageToApp, getParam} from '@/utils'
+import {SendMessageToApp, getParam, http} from '@/utils'
 import {addDays} from "date-fns"
 import {connect} from "react-redux"
+import { Toast } from 'antd-mobile';
 
 @connect(state => ({
     user: state.user
@@ -19,6 +20,8 @@ export default class index extends Component {
     state = {
         removable: 0, // 未拆宝箱的数量
         currentOpenId: 0, // 当前要拆的宝箱的队伍的ID
+        treasure_stage: 0, // 宝箱的活动阶段
+        active_stage: 0, // 整个活动的阶段
         userInfoList: [],
         userInfo: {},
         isAppUpdate: false,
@@ -32,6 +35,8 @@ export default class index extends Component {
         window['loginInfo'] = result => {
             _this.loginInfo(result)
         }
+
+        _this.getStage();
     }
 
     // 获取app登录数据
@@ -118,6 +123,21 @@ export default class index extends Component {
         }
     }
 
+    // 获取活动以及宝箱的阶段
+    getStage = () => {
+        http.get(`${API.home}/activity/stage`).then(res => {
+            const { code, data, msg } = res.data;
+            if(code === 200) {
+              // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
+              this.setState({
+                treasure_stage: data.treasure_stage
+              })
+            }else{
+                Toast.info(msg, 2);
+            }
+        });
+    }
+
     toYearWish = () => {
         const isLogin = !this.props.user.hasError
         if (isLogin) {
@@ -139,14 +159,14 @@ export default class index extends Component {
     }
 
     render() {
-        const {banner, removable} = this.state
+        const {banner, removable, treasure_stage} = this.state
         return (
             <div className={'year-index'}>
                 <div className="banner-treasure">
                     <div id="banner" className="banner-treasure__header"
                          style={{backgroundImage: `url(${banner})`}}></div>
                     <div className="banner-treasure__nav">
-                        <TreasureNav id="banner"/>
+                        <TreasureNav id="banner" treasure_stage={treasure_stage}/>
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
@@ -171,7 +191,9 @@ export default class index extends Component {
                 <LiveRoom/>
 
                 {/* 组队开宝箱 */}
-                <TreasureBox getRemovable={this.getRemovable} />
+                {
+                    treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable} />
+                }
 
                 {/*课程*/}
                 <YearCourse isAppUpdate={this.state.isAppUpdate} getSum={this.sonToPar.bind(this)}/>

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

@@ -40,7 +40,6 @@ class TreasureNav extends Component {
   }
 
   componentDidMount() {
-    this.initNav();
     window.addEventListener('scroll', this.calcNavActive)
   }
 
@@ -48,24 +47,22 @@ class TreasureNav extends Component {
     window.removeEventListener('scroll', this.calcNavActive);
   }
 
-  initNav = () => {
-    const { navs } = this.state;
-    http.get(`${API.home}/activity/stage`).then(res => {
-      const { code, data } = res.data;
-      if(code === 200) {
+  componentWillReceiveProps(nextProps) {
+    this.initNav(nextProps.treasure_stage);
+  }
 
-        // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
-        if(data.treasure_stage === 0) {
-          this.setState({
-            formatNavs: navs.filter(item => item.id !== 'year-treasure')
-          });
-        }else {
-          this.setState({
-            formatNavs: navs
-          })
-        }
-      }
-    });
+  initNav = (treasure_stage) => {
+    let {navs} = this.state;
+    // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
+    if(treasure_stage === 0) {
+      this.setState({
+        formatNavs: navs.filter(item => item.id !== 'year-treasure')
+      });
+    }else {
+      this.setState({
+        formatNavs: navs
+      })
+    }
   }
 
   calcNavActive = () => {