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

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

@@ -174,11 +174,17 @@ export default class index extends Component {
                 <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>
                 {/* 大咖直播 */}

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

@@ -25,15 +25,15 @@ class TreasureNav extends Component {
         },
         {
           id: 'year-free',
-          name: '免费专区'
+          name: '免费学'
         },
         {
           id: 'year-group',
-          name: '一分拼团'
+          name: '1分拼团'
         },
         {
           id: 'year-discount',
-          name: '一折专区'
+          name: '抄低专区'
         },
       ]
     };