pull pre and slove conflict

src/components/Index/index.js

@@ -109,10 +109,10 @@ class Index extends Component {
     }
 
     toCourseDetail = (id) => {
-        const { dispatch, history } = this.props;
+        const {dispatch, history} = this.props;
         // dispatch(getCourses(id, () => {
-            history.push(`/detail?id=${id}`);
-            return false;
+        history.push(`/detail?id=${id}`);
+        return false;
         // }));
     }
 
@@ -138,7 +138,7 @@ class Index extends Component {
                 <div className='index-swiper'>
                     {
                         this.state.banner && this.state.banner.length > 0 &&
-                        <TopSwiper bannerList={this.state.banner} />
+                        <TopSwiper bannerList={this.state.banner}/>
                     }
                 </div>
 
@@ -148,10 +148,10 @@ class Index extends Component {
                             this.state.tabdata.map((item, index) => {
                                 return (
                                     <li key={index}>
-                                        <Link to={item.href}>
-                                            <img src={item.src} alt="" />
+                                        <a href={item.href}>
+                                            <img src={item.src} alt=""/>
                                             <span>{item.name}</span>
-                                        </Link>
+                                        </a>
                                     </li>
                                 )
                             })
@@ -159,7 +159,7 @@ class Index extends Component {
                     </ul>
                 </div>
 
-                <p className="borderTop" />
+                <p className="borderTop"/>
 
                 {
 
@@ -181,7 +181,7 @@ class Index extends Component {
                                     modules={item}
                                     toDetail={this.toCourseDetail}
                                 />
-                                <p className="borderTop" />
+                                <p className="borderTop"/>
                             </div>
                         )
                     }) : null
@@ -366,7 +366,7 @@ function ScrollBox(props) {
 
                                         {/*公开课需预约、付费课不需要预约*/}
                                         {
-                                            ( item.is_prepare || item.is_free === 0) && item.live_status === 0 &&
+                                            (item.is_prepare || item.is_free === 0) && item.live_status === 0 &&
                                             <p className="item-time">时间：{item.live_start_time}</p>
                                         }
                                         {

src/components/detail/index.js

@@ -579,8 +579,12 @@ class Detail extends Component {
                         <ShareRank courseInfo={course_info}/>
                     }
 
+<<<<<<< HEAD
                     {
                     /**
+=======
+                    {/**
+>>>>>>> 3d5db90ae5dc465dc6afedc3741fb67d7d7e3f0b
                      * 拼团
                      * is_aist: 是否AI特训营
                      * group_status: 团状态，3：课程有小团 用户没参加小团；4：用户参加了小团
@@ -595,9 +599,12 @@ class Detail extends Component {
                             invitedFriends={this.invitedFriends}
                         />
                     }
+<<<<<<< HEAD
                 
 
                 
+=======
+>>>>>>> 3d5db90ae5dc465dc6afedc3741fb67d7d7e3f0b
 
                     {/*砍价*/}
                     {

src/components/study/myCourses/index.js

@@ -167,7 +167,7 @@ class MyCourses extends Component {
                     :
                     <div className="empty">
                         <p><i className='iconfont iconfish'/></p>
-                        <p className='empty-prompt'>还是咸鱼一条，快去翻身~</p>
+                        <p className='empty-prompt'>您还没有课程哦，赶快去选课吧~</p>
                         <p>
                             <Link className='select-course' to='/classify'>去选课</Link>
                         </p>