solve conflict

src/components/detail/index.js

@@ -426,11 +426,7 @@ class Detail extends Component {
     }
 
     render() {
-<<<<<<< HEAD
-        const {course: {course_info = {}}, barInfo, singleBox, singleType} = this.state;
-=======
         const { course: { course_info={} }, barInfo, singleBox, singleType, isRedPacket } = this.state;
->>>>>>> 065cd9254ee2ef96b11c0c8966485b5deb121f6c
         let courseInfo = '',
             service = '',
             number = 0,
@@ -504,7 +500,6 @@ class Detail extends Component {
                         </div>
                     }
 
-<<<<<<< HEAD
                     {/*vip课程显示*/}
                     {
                         course_info.vip_range &&
@@ -526,16 +521,6 @@ class Detail extends Component {
                                 })
                             }
                         </p>
-=======
-                
-
-                {/*vip课程显示*/}
-                {
-                    course_info.vip_range &&
-                    <div className="vip">
-                        <p>已开通年会员：{course_info.vip_range}</p>
-                        <p>年会员QQ群：{course_info.course_qq}，加群请备注您的学号：{course_info.uid}</p>
->>>>>>> 065cd9254ee2ef96b11c0c8966485b5deb121f6c
                     </div>
 
                     {/*试听弹窗*/}
@@ -579,7 +564,6 @@ class Detail extends Component {
                         <ShareRank courseInfo={course_info}/>
                     }
 
-<<<<<<< HEAD
                     {/**
                      * 拼团
                      * is_aist: 是否AI特训营
@@ -594,7 +578,6 @@ class Detail extends Component {
                             invitedFriends={this.invitedFriends}
                         />
                     }
-=======
                 {/* 红包 */}
                 {
                     isRedPacket && 
@@ -603,12 +586,7 @@ class Detail extends Component {
                     />
                 }
 
-                {/*分享赚钱*/}
-                {
-                    course_info.is_dist &&
-                    <ShareRank courseInfo={course_info} />
-                }
->>>>>>> 065cd9254ee2ef96b11c0c8966485b5deb121f6c
+                
 
                     {/*砍价*/}
                     {