Merge branch '00' into pre

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -45,7 +45,7 @@
         display: block;
         width: 100%;
         background: url($bg) no-repeat;
-        background-size: contain;
+        background-size: 100% auto;
     }
 
     &::before {
@@ -56,11 +56,12 @@
     &::after {
         @include common-deco('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/landing-box-footer.png');
         height: 85px;
+        margin-top: -1px;
     }
 
     .bg {
         @extend .trans-height;
-        width: 99.75%;
+        width: 100%;
         height: 115px;
         margin-top: -1px;
         overflow: hidden;

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

@@ -42,11 +42,16 @@ class MyTreasure extends Component {
 
   componentDidMount() {
     const { isEnd } = this.state;
+    const { userInfo, history } = this.props;
+    if(!userInfo.uid) {
+      history.push('/passport');
+    }
     if (isEnd) {
       this.startCountDown();
     }
     this.fetchMyTreasure();
     this.fetchActivityStatus();
+
   }
 
   // 页面加载时，初始化当前需要绑定手机号的奖品名字

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

@@ -423,7 +423,12 @@ class YearCourse extends Component {
     toYearWish = () => {
         const isLogin = !this.props.user.hasError
         if (isLogin) {
-            this.props.history.push('/year/yearWish')
+            if (!getParam('version')) {
+                this.props.history.push('/year/yearWish')
+            } else {
+                this.props.history.push(`/year/yearWish?version=${getParam('version')}`)
+            }
+          
         } else {
             this.toLogin()
         }
@@ -482,7 +487,7 @@ class YearCourse extends Component {
                                 {
                                     (bigcourse.courseList && bigcourse.courseList.length > 4) &&
                                     <button className="more-button" onClick={() => this.handleToMore('bigcourse')}>
-                                        {group.isMore ? '查看更多' : '收起'}
+                                        {bigcourse.isMore ? '查看更多' : '收起'}
                                     </button>
                                 }
                             </>
@@ -520,7 +525,7 @@ class YearCourse extends Component {
                                 {
                                     (freecourse.courseList && freecourse.courseList.length > 4) &&
                                     <button className="more-button" onClick={() => this.handleToMore('freecourse')}>
-                                        {group.isMore ? '查看更多' : '收起'}
+                                        {freecourse.isMore ? '查看更多' : '收起'}
                                     </button>
                                 }
                             </>
@@ -591,7 +596,7 @@ class YearCourse extends Component {
                                 {
                                     (groupcourse.courseList && groupcourse.courseList.length > 4) &&
                                     <button className="more-button" onClick={() => this.handleToMore('groupcourse')}>
-                                        {group.isMore ? '查看更多' : '收起'}
+                                        {groupcourse.isMore ? '查看更多' : '收起'}
                                     </button>
                                 }
                             </>