Merge branch 'limit-free' into pre

src/components/Index/index.js

@@ -71,12 +71,6 @@ class Index extends Component {
       if (res.data.code === 200) {
         const {data} = res.data || {}
         const modules = Array.isArray(data.modules) ? data.modules : []
-        modules.forEach(item => {
-          if (item.name === '限时免费') {
-            item.showMoreButon = item.list.length && item.list.length > 4
-            item.list = item.list.slice(0, 4)
-          }
-        })
         this.setState({
           banner: data.banner,
           lives: data.lives,
@@ -258,8 +252,7 @@ function CourseList({modules, toDetail}) {
       {
         modules.show_more === 2 ?
           modules.name === '限时免费'
-            ? modules.showMoreButon &&
-            <Link className="more" to={'/free'}>更多 ></Link>
+            ? <Link className="more" to={'/free'}>更多 ></Link>
             : <Link className="more" to={modules.more_page}>更多 ></Link>
           : null
       }
@@ -284,21 +277,6 @@ function CourseList({modules, toDetail}) {
                 </div>
               )
 
-              /*const bottom = (
-                <div>
-                  {
-                    item.is_limit_free
-                      ? <LimitFree course={item}/>
-                      : item.is_buy
-                      ? <a className="isbuy">已购买</a>
-                      : <p className="course-price">
-                        <span className="new">¥{item.discounts_price}</span>
-                        <span className="old">¥{item.price}</span>
-                      </p>
-                  }
-                </div>
-              )*/
-
               const bottom = <Bottom course={item}/>
 
               const status = item.is_limit_free ? null : <div>