课程优化等

src/components/business/five-minutes.vue

@@ -8,7 +8,7 @@
                     <img v-lazy="item.appImageUrl"/>
                 </div>
                     <div class="five-text">
-                        <div class="teacher-itemname fs14">{{item.title}}</div>
+                        <div class="teacher-itemname fs14" v-html="item.title">{{item.title}}</div>
                         <div class="five-tag fs11">
                             <span class="m-tag">#{{item.categoryName}}</span>
                             <span class="m-play" @click.stop="playFun(item)">

src/components/business/group-title.vue

@@ -72,7 +72,7 @@ export default {
     &-item {
       position: relative;
       span {
-        margin-right: px2rem(20px);
+        margin-right: px2rem(30px);
       }
       img {
         position: absolute;

src/components/business/health-comics.vue

@@ -14,8 +14,8 @@
                     </div>
                     <div class="tea-txt">
                         <!-- <div class="tea-name">{{item.doctorName}}</div> -->
-                        <div class="tea-position">
-                            {{item.headerName}}
+                        <div class="tea-position" v-html="item.headerName">
+                            <!-- {{item.headerName}} -->
                         </div>
                     </div>
                 </div>

src/components/business/hot-labels.vue

@@ -4,7 +4,8 @@
         <span>{{title}}</span>
     </section>
 
-    <section class="history-labels-item" @click="hotLabel(item.resourceType, item.structureId, item.resourceUrl, item.labelName, item)" v-for="(item, index) in allLabels" :key="index">
+    <!-- <section class="history-labels-item" @click="hotLabel(item.resourceType, item.structureId, item.resourceUrl, item.labelName, item)" v-for="(item, index) in allLabels" :key="index"> -->
+    <section class="history-labels-item" @click="gotoPage(item)" v-for="(item, index) in allLabels" :key="index">
         <span class="history-labels-item-name">{{item.keyword}}</span>
     </section>
 </article>
@@ -31,6 +32,39 @@ export default {
         this.getData()
     },
     methods: {
+        gotoPage(itemData){
+            console.log('itemData', itemData)
+            // 如果没有跳转信息，则直接到搜索结果页面
+            if(!itemData.appModuleInfo){
+                this.searchAction(itemData.keyword)
+                return
+            }
+            let paramList = this.setEventByModuleCode(itemData);
+            if(paramList !== 'NO') {
+                rocNative.dispatchEventByModuleCode({
+                    modeCode: itemData.appModuleInfo.code,
+                    jsonString: paramList
+                })
+            }
+            this.pageBurialPoin({
+                menuLevel: 1,
+                menuCode: 'm_home',
+                functionCode: 'f_module',
+                actionCode: 'c_module',
+                labelId: itemData.id,
+                labelValue: itemData.keyword,
+            })
+        },
+        searchAction(searchText) {
+            if(this.showDelete) return
+            this.$router.push({
+                path: '/result',
+                query: {
+                    searchText: searchText
+                }
+            })
+        },
+
         //   ...mapMutations([
         //     'SET_CLEAR_VUEX'
         //   ]),

src/main.js

@@ -23,6 +23,10 @@ Vue.use(VueLazyload, {
 	// lazyComponent: true
 })
 
+Vue.filter('filterName2', function (item) {
+	return '222'
+})
+
 // 可调试
 Vue.config.devtools = true;
 Vue.use(Mint)

src/utils/index.js

@@ -228,7 +228,7 @@ export function jumpEvaluatPage(){
 
 // dev地址
 // const baseUrl = 'http://192.168.140.14:10201/'
-const baseUrl = 'http://10.177.10.110:10201/'
+const baseUrl = 'http://10.177.10.149:10201/'
 // const baseUrl = 'http://192.168.140.14:10201/'
 // const baseUrl = 'https://dev-sc.yunqueyi.com/'
 const apiUrl = 'https://dev-api.yunqueyi.com/'

src/utils/mixins.js

@@ -100,6 +100,7 @@ module.exports = {
                     }
                 }
             } else if (modeCode === 'M400') {
+                debugger
                 let path = paramList[0]['key'];
                 let v = paramList[0]['value'];
                 let query = this.setRouterParm(paramList);
@@ -107,8 +108,12 @@ module.exports = {
                     url:v,
                     query:query
                 }]
+                this.$router.push({
+                    path: v,
+                    query: query
+                })
                 //alert(this.token);
-               
+               return 'NO'
             }
             if(typeof paramList === 'string' && !paramList){
                 paramList = []

src/views/result.vue

@@ -9,11 +9,11 @@
       <section></section>
       <NoResultPage/>
       <SplitLine borderWidth="3px"/>
-      <CourseAdjust v-show="adjustList.length > 0" :paraData="adjustList"/>
+      <CourseAdjust v-show="adjustList.length > 0" :parmData="adjustList"/>
     </article>
 
     <!-- 有结果页面 -->
-    <article v-show="showTab1 || showTab2 || showTab3 || showTab4">
+    <article v-show="showTab1 || showTab2 || showTab3 || showTab4" style="position:relative;">
       <div class="navbar-container" >
         <div class="navbar-container-item" v-show="showTab0" :class="{'bt-2': navIndex === '0'}" @click="navIndex = '0'">综合</div>
         <div class="navbar-container-item" v-show="showTab1" :class="{'bt-2': navIndex === '1'}" @click="navIndex = '1'">课程</div>
@@ -21,6 +21,7 @@
         <div class="navbar-container-item" v-show="showTab3" :class="{'bt-2': navIndex === '3'}" @click="navIndex = '3'">讲师</div>
         <div class="navbar-container-item" v-show="showTab4" :class="{'bt-2': navIndex === '4'}" @click="navIndex = '4'">健康漫画</div>
       </div>
+      <div class="fixed-split-line"></div>
       <div class="list-container" v-show="navIndex === '0' && showTab0">
         <!-- 课程 -->
         <div v-show="showTab1">
@@ -146,14 +147,14 @@ export default {
     }
     if(window.__isWeb) {
       _this.getAdjustData()
-      // _this.search()
+      _this.search()
     }
     window.__refresh = function(){
       _this.getUserInfo()
     }
   },
   mounted(){
-    // this.search(this.searchText)
+    this.search()
     // this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll')
   },
   methods: {
@@ -168,6 +169,7 @@ export default {
           para = {
               searchCategory: '1,2,3,4',
               searchValue: _this.searchText,
+              keywordColor: 'rgba(244,122,72,1)',
               sortItem: 1,
               pageNo: 1,
               pageSize: 100,
@@ -290,7 +292,7 @@ export default {
   .mint-search {
     position: fixed;
     top: 0px;
-    z-index: 20;
+    z-index: 3 !important;
     height: 66px;
     width: 100%;
     border-bottom: 1px solid #E7E7E7 !important;
@@ -306,7 +308,7 @@ export default {
     display: -ms-flexbox;
     display: flex;
     padding: 30px 10px 8px;
-    z-index: 1;
+    z-index: 3;
   }
   .mint-searchbar-cancel {
     margin-left: 10px;
@@ -326,32 +328,41 @@ export default {
 <style lang="scss" scoped>
   @import '../style/mixin.scss';
   .navbar-container {
+    width: 100%;
+    height: px2rem(57px);
     display: flex;
     position: fixed;
     top: px2rem(60px);
     left: 0;
     z-index: 2;
     flex-direction: row;
-    border-bottom: 1px solid #E7E7E7;
+    // border-bottom: 1px solid #E7E7E7;
     background: #fff;
-    padding-top: 10px;
+    // margin-top: 10px;
     margin-bottom: 6px;
     &-item {
       display: inline-flex;
-      margin: px2rem(15px) px2rem(15px) px2rem(-1px);
+      margin: px2rem(25px) px2rem(15px) px2rem(-1px);
       padding-bottom: px2rem(11px);
       font-size: px2rem(14px);
       color: #666;
     }
     .bt-2 {
       color: #449284;
-      border-bottom: px2rem(3px) solid #449284;
+      border-bottom: px2rem(2px) solid #449284;
     }
   }
   .list-container {
     margin: 0;
     padding-top: px2rem(120px);
   }
+  .fixed-split-line {
+    position: fixed;
+    width: 100%;
+    top: 117px;
+    z-index: 1;
+    border-bottom: 1px solid #e7e7e7;
+  }
   .mt-80 {
     padding-top: px2rem(80px);
   }