Merge branch 'Branch_tag-app-1128-sousuo' of...

Merge branch 'Branch_tag-app-1128-sousuo' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-app into Branch_tag-app-1128-sousuo

src/components/business/course-list.vue

@@ -97,7 +97,9 @@ export default {
     },
     watch: {
         orderNum(val) {
-            this.orderAction(1, true)
+            if (this.showOrder) {
+                this.orderAction(1, true)
+            }
         }
     },
     components: {
@@ -189,6 +191,7 @@ export default {
                 })
             }
             this.searchForOrder('1', this.cSearchText, orderIndex, this.groupNum, this.parmData).then( param => {
+                // this.$refs.courseListGT.resetShowOrderIndex()
                 this.list = param
             })
         }

src/components/business/five-minutes.vue

@@ -99,7 +99,9 @@ export default {
             }
         },
         orderNum(val) {
-            this.orderAction(1, true)
+            if (this.showOrder) {
+                this.orderAction(1, true)
+            }
         }
     },
     created() {

src/components/business/health-comics.vue

@@ -85,7 +85,9 @@ export default {
     },
     watch: {
         orderNum(val) {
-            this.orderAction(1, true)
+            if (this.showOrder) {
+                this.orderAction(1, true)
+            }
         }
     },
     mounted() {

src/components/business/teacher-list.vue

@@ -93,7 +93,9 @@ export default {
     },
     watch: {
         orderNum(val) {
-            this.orderAction(1, true)
+            if (this.showOrder) {
+                this.orderAction(1, true)
+            }
         }
     },
     methods: {
@@ -105,7 +107,7 @@ export default {
                 action_code = 'c_teacher';
                 label_id = item.id;
 
-            let itemData={
+            let itemData = {
                 "title":"",
                 "imageUrl":"",
                 "appModuleInfo":{

src/utils/index.js

@@ -81,21 +81,20 @@ export function jumpEvaluatPage(){
   return evaluatPageUrl
 }
 
-
 // // dev地址
 // // const baseUrl = 'http://10.177.10.149:8080/'
 // const baseUrl = 'https://dev-sc.yunqueyi.com/'
 // const apiUrl = 'https://dev-api.yunqueyi.com/'
 // const evaluatPageUrl = 'https://dev-phome.yunqueyi.com/gpr/#/home'
-// export const jumpWebPageUrl =  'https://dev-phome.yunqueyi.com/appl/#/'
+// export const jumpWebPageUrl =  'https://dev-phome.yunqueyi.com/'
 
 // // test1地址
 // const baseUrl = 'https://test1-sc.yunqueyi.com/'
 // const apiUrl = 'https://test1-api.yunqueyi.com/'
 // const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
-// export const jumpWebPageUrl =  'https://test1-phome.yunqueyi.com/appl/#/'
+// export const jumpWebPageUrl =  'https://test1-phome.yunqueyi.com/'
 
-// uat地址
+// uat地址 
 const baseUrl = 'https://uat-sc.yunqueyi.com/'
 const apiUrl = 'https://uat-api.yunqueyi.com/'
 const evaluatPageUrl = 'https://uat-phome.yunqueyi.com/gpr/#/home'
@@ -105,7 +104,7 @@ export const jumpWebPageUrl =  'https://uat-phome.yunqueyi.com/'
 // const baseUrl = 'https://sc.yunqueyi.com/'
 // const apiUrl = 'https://api.yunqueyi.com/'
 // const evaluatPageUrl = 'https://phome.yunqueyi.com/gpr/#/home'
-// export const jumpWebPageUrl =  'https://phome.yunqueyi.com/appl/#/'
+// export const jumpWebPageUrl =  'https://phome.yunqueyi.com/'
 
 
 // 为每个URL添加应用校验密钥

src/utils/mixins.js

@@ -97,6 +97,7 @@ module.exports = {
 
         // 根据条件排序
         async searchForOrder(searchCategory = '1', searchValue = '', sortItem = 1, pageSize = 10, sourceData = []) {
+            if(pageSize <=0 ) return;
             let str2 = (searchValue || '').replace(/[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\?]/g, '');// 去掉特殊字符
             let _this = this,
                 para = {

src/views/result.vue

@@ -42,7 +42,7 @@
       <div class="list-container" v-show="navIndex === '0' && showTab0">
         <!-- 课程 -->
         <div v-show="showTab1">
-          <CourseList ref="courseListRef" :parmData="contentAppModels" :groupNum="contentAppModelCount"/>
+          <CourseList :parmData="contentAppModels" :groupNum="contentAppModelCount"/>
           <ShowAllItem @showAllItem="showAllItem" itemIndex="1" />
           <SplitLine borderWidth="3px"/>
         </div>
@@ -66,7 +66,7 @@
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '1' && showTab1">
-        <CourseList :showTitle="showTitle" :showOrder="showOrder" :parmData="contentAppModelsAll" :groupNum="contentAppModelCount"/>
+        <CourseList ref="courseListRef" :showTitle="showTitle" :showOrder="showOrder" :parmData="contentAppModelsAll" :groupNum="contentAppModelCount"/>
         <NoMoreItem/>
       </div>
       <div class="list-container" v-show="navIndex === '2' && showTab2">
@@ -218,7 +218,7 @@ export default {
               keywordColor: 'rgba(244,122,72,1)',
               sortItem: 1,
               pageNo: 1,
-              pageSize: 100,
+              pageSize: 4,
               token: _this.token,
               setEntry: 'headers',
           }
@@ -234,19 +234,16 @@ export default {
           // _this.searchText = ''
           _this.navIndex = '0'
           if (res.code == '000000') {
-            console.log(res)
             // 课程
             _this.contentAppModels = this.spliceCertenNumData(res.data.contentAppModels, 4)
             _this.contentAppModelsAll = res.data.contentAppModels
             _this.contentAppModelCount = res.data.contentAppModelCount + ''
-            if(res.data.contentAppModelCount > 100){
-              _this.searchForOrder('1', str2, 1, res.data.contentAppModelCount).then( param => {
-                _this.contentAppModelsAll = param
-                console.log('2222', param)
-              })
-            }
-            // _this.$refs.courseListRef.resetGT()
-            _this.setOrderNum((_this.orderNum + 1))
+            // if(res.data.contentAppModelCount > 100){
+            //   _this.searchForOrder('1', str2, 1, res.data.contentAppModelCount).then( param => {
+            //     _this.contentAppModelsAll = param
+            //   })
+            // }
+            // _this.$refs.courseListRef.orderAction(1, true)
             if(res.data.contentAppModelCount === 0){
               _this.showTab1 = false
             }
@@ -271,6 +268,7 @@ export default {
             if(res.data.educationContentCount === 0){
               _this.showTab4 = false
             }
+            _this.setOrderNum((_this.orderNum + 1))
           }
       })
     },