ggggg

src/components/business/course-list.vue

 <template>
 <section>
+<<<<<<< HEAD
     <GroupTitle :groupNum="groupNum" :showTitle="showTitle" :showOrder="showOrder" @order="orderAction"/>
     <div class="hot-teacher">
         <!-- <div :class="index>1 && (index+1 == cParmData.length)?'teacher-item item-end' : 'teacher-item'" :key="index"  -->
@@ -7,6 +8,27 @@
             v-for="(item,index) in cParmData" @click="goToPage(item)">
                 <div class="teacher-itemimg">
                     <img :src="item.courseInfoUrl"/>
+=======
+    <GroupTitle :groupNum="groupNum" />
+    <div class="cource-teach">
+        <div class="couse-list">
+            <div 
+              :class="index % 2 == 1 ? 'course-item end-left' : 'course-item'" 
+                v-for="(item, index) in parmData" :key="index">
+                <div class="course-pic" @click="goToPage(item)">
+                    <img v-lazy="item.courseInfoUrl" class="pic-tec" />
+                    <span class="course-tag">{{item.disName}}</span>
+                </div>
+                <p class="course-txt">
+                    {{item.name}}
+                </p>
+                <div class="course-opt">
+                    <span class="opt-info">{{!item.showTime ? '' : item.showTime + ' |'}} {{item.joinNum}}人已学</span>
+                    <span :class="item.whetherFavors==2?'opt collect':'opt collected'"@click="collectFun(item.whetherFavors,item.id,item.name)">
+              {{item.whetherFavors==2?'收藏':'已收藏'}}
+            </span>
+
+>>>>>>> parent of 4332b29... 排序组件
                 </div>
                 <div class="five-text">
                     <div class="teacher-itemname fs14 ellipsis-2" >
@@ -63,14 +85,6 @@ export default {
         groupNum: {
             type: String,
             default: '0'
-        },
-        showTitle: {
-            type: Boolean,
-            default: true
-        },
-        showOrder: {
-            type: Boolean,
-            default: false
         }
     },
     computed: {

src/components/business/five-minutes.vue

 <template>
     <section>
+<<<<<<< HEAD
         <GroupTitle groupTitle="5分钟医学院" :groupNum="groupNum" :showTitle="showTitle" :showOrder="showOrder" @order="orderAction"/>
+=======
+        <GroupTitle groupTitle="5分钟医学院" :groupNum="groupNum"/>
+>>>>>>> parent of 4332b29... 排序组件
         <div class="hot-teacher">
             <div :class="index>1 && (index+1 == parmData.length)?'teacher-item item-end' : 'teacher-item'" :key="index" 
                 v-for="(item,index) in parmData" @click="goToPage(item)">
@@ -62,14 +66,6 @@ export default {
         groupNum: {
             type: String,
             default: '0'
-        },
-        showTitle: {
-            type: Boolean,
-            default: true
-        },
-        showOrder: {
-            type: Boolean,
-            default: false
         }
     },
     computed: {

src/components/business/group-title.vue

 <template>
   <section class="group-title">
+<<<<<<< HEAD
       <article v-show="showTitle" class="group-title-title">
         <span>{{groupTitle}}</span><span class="group-title-title-ml-6" v-show="isShowNum">（{{groupNum}}）</span>
       </article>
@@ -13,13 +14,17 @@
           <img src="../../images/sousuo/sort-down.png" v-show="showOrderIndex === 2"/>
         </div>
       </article>
+=======
+      <span class="group-title-name">{{groupTitle}} </span>
+      <span v-show="isShowNum"> ({{groupNum}})</span>
+>>>>>>> parent of 4332b29... 排序组件
   </section>
 </template>
 <script>
 export default {
   data() {
       return {
-        showOrderIndex: 1
+        
       }
   },
   props: {
@@ -34,25 +39,7 @@ export default {
     groupNum: {
       type: String,
       default: "0"
-    },
-    showTitle: {
-      type: Boolean,
-      default: true
-    },
-    showOrder: {
-      type: Boolean,
-      default: false
     }
-  },
-  methods: {
-    toggle() {
-      this.showTitle = !showTitle
-      this.showOrder = !showOrder
-    },
-    order(index) {
-      this.showOrderIndex = index
-      this.$emit('order', index)
-    } 
   }
 }
 </script>
@@ -63,6 +50,7 @@ export default {
   margin-left: px2rem(15px);
   display: flex;
   flex-direction: row;
+<<<<<<< HEAD
   &-order {
     display: flex;
     flex-direction: row;
@@ -87,6 +75,13 @@ export default {
   }
   &-title {
     padding: px2rem(20px) 0 px2rem(10px);
+=======
+  &-name {
+    margin-right: px2rem(6px);
+  }
+  span {
+    padding: px2rem(20px) 0 px2rem(15px);
+>>>>>>> parent of 4332b29... 排序组件
     font-size: px2rem(18px);
     font-weight: 500;
     color: #28344C;

src/components/business/health-comics.vue

 <template>
 <section>
+<<<<<<< HEAD
     <GroupTitle groupTitle="健康漫画" :groupNum="groupNum" :showTitle="showTitle" :showOrder="showOrder" @order="orderAction"/>
+=======
+    <GroupTitle groupTitle="健康漫画" :groupNum="groupNum" />
+>>>>>>> parent of 4332b29... 排序组件
     <div class="font-style">
         <div class="teach-opt">
             <div class="teach-list">
@@ -45,14 +49,6 @@ export default {
         groupNum: {
             type: String,
             default: '0'
-        },
-        showTitle: {
-            type: Boolean,
-            default: true
-        },
-        showOrder: {
-            type: Boolean,
-            default: false
         }
     },
     computed: {

src/components/business/teacher-list.vue

 <template>
 <section>
+<<<<<<< HEAD
     <GroupTitle groupTitle="讲师" :groupNum="groupNum" :showTitle="showTitle" :showOrder="showOrder" @order="orderAction"/>
+=======
+    <GroupTitle groupTitle="讲师" :groupNum="groupNum" />
+>>>>>>> parent of 4332b29... 排序组件
     <div class="font-style">
         <div class="teach-opt">
             <div class="teach-list">
@@ -58,14 +62,6 @@ export default {
         groupNum: {
             type: String,
             default: '0'
-        },
-        showTitle: {
-            type: Boolean,
-            default: true
-        },
-        showOrder: {
-            type: Boolean,
-            default: false
         }
     },
     mounted() {

src/style/common.scss

-img {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  user-select: none;
-}
+// * {
+//   -webkit-user-select: none;
+//   -moz-user-select: none;
+//   -o-user-select: none;
+//   user-select: none;
+// }
 
 body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, li, a, p, h1, h2, h3, h4,h5, h6, i, b, textarea, button, input, select, figure, figcaption, {
     padding: 0;

src/views/result.vue

@@ -50,19 +50,19 @@
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '1' && showTab1">
-        <CourseList :showTitle="showTitle" :showOrder="showOrder" :parmData="contentAppModelsAll" :groupNum="contentAppModelCount"/>
+        <CourseList :parmData="contentAppModelsAll" :groupNum="contentAppModelCount"/>
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '2' && showTab2">
-        <FiveMinutes :showTitle="showTitle" :showOrder="showOrder" :parmData="fiveMinutesMedicalContentListAll" :groupNum="fiveMinutesMedicalContentListCount"/>
+        <FiveMinutes :parmData="fiveMinutesMedicalContentListAll" :groupNum="fiveMinutesMedicalContentListCount"/>
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '3' && showTab3">
-        <TeacherList :showTitle="showTitle" :showOrder="showOrder" :parmData="pCourseDoctorModelsAll" :groupNum="pCourseDoctorModelCount"/>
+        <TeacherList :parmData="pCourseDoctorModelsAll" :groupNum="pCourseDoctorModelCount"/>
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '4' && showTab4">
-        <HealthComics :showTitle="showTitle" :showOrder="showOrder" :parmData="educationContentsAll" :groupNum="educationContentCount"/>
+        <HealthComics :parmData="educationContentsAll" :groupNum="educationContentCount"/>
         <NoMoreItem/>
       </div>
     </article>
@@ -114,10 +114,14 @@ export default {
       showTab1: true,
       showTab2: true,
       showTab3: true,
+<<<<<<< HEAD
       showTab4: true,
       showTitle: false,
       showOrder: true,
       adjustList: []
+=======
+      showTab4: true
+>>>>>>> parent of 4332b29... 排序组件
     }
   },
   components: {
@@ -160,8 +164,12 @@ export default {
     }
   },
   mounted(){
+<<<<<<< HEAD
     this.getUserInfo()
     this.search()
+=======
+    this.search(this.searchText)
+>>>>>>> parent of 4332b29... 排序组件
     // this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll')
   },
   methods: {
@@ -176,6 +184,7 @@ export default {
 
     },
     // 搜索结果
+<<<<<<< HEAD
     search() {
       this.pageBurialPoin({
           ...m_search_search,
@@ -183,6 +192,9 @@ export default {
           createdTime: new Date().getTime(),
       })
       this.showLoading = true
+=======
+    search(searchText) {
+>>>>>>> parent of 4332b29... 排序组件
       let _this = this,
           para = {
               searchCategory: '1,2,3,4',
@@ -202,7 +214,6 @@ export default {
       this.showTab3 = true
       this.showTab4 = true
       this.GET(url, para).then(res => {
-          this.showLoading = false
           _this.searchText = ''
           _this.navIndex = '0'
           if (res.code == '000000') {
@@ -377,11 +388,15 @@ export default {
       margin: px2rem(25px) px2rem(15px) px2rem(-1px);
       padding-bottom: px2rem(11px);
       font-size: px2rem(14px);
-      color: #666;
+      color: #449284;
     }
     .bt-2 {
+<<<<<<< HEAD
       color: #449284;
       border-bottom: px2rem(2px) solid #449284;
+=======
+      border-bottom: px2rem(3px) solid #449284;
+>>>>>>> parent of 4332b29... 排序组件
     }
   }
   .list-container {