add

src/components/business-new/yqy-adjust.vue

@@ -9,7 +9,7 @@
       </div>
       <div>
         <div class="couse-list" v-infinite-scroll="loadMore" infinite-scroll-disabled="loading" infinite-scroll-distance="10" :style="'height:'+clientHeight">
-            <div :class="index%2==1 ? 'course-item end-left' : 'course-item'" :key="index" v-for="(item,index) in parmData">
+            <div :class="index%2==1 ? 'course-item end-left' : 'course-item'" :key="index" v-for="(item,index) in list">
                 <div class="course-pic" @click="goToPage(item)">
                   <img :src="item.appIndexCourseUrl" class="pic-tec" />
                   <span class="course-tag">{{item.disName}}</span>
@@ -81,7 +81,7 @@ export default {
   },
   mounted(){
  
-    //this.list = this.parmData;
+    this.list = this.parmData;
     if(window.__isAndroid){
       this.popHeight = this.statusBarHeight/2
     }else{
@@ -204,7 +204,7 @@ export default {
     },
 
     handelData(id,status){
-      let d = this.parmData;
+      let d = this.list;
       for(let i=0;i<d.length;i++){
         if(id == d[i].id){
           d[i].whetherFavors = status;
@@ -238,10 +238,10 @@ export default {
           }
 
           if(type == 'loadMore'){
-            _this.parmData =  [..._this.list ,...res.data];
+            _this.list =  [..._this.list ,...res.data];
 
           }else{
-            _this.parmData =  res.data || [];
+            _this.list =  res.data || [];
           }
         }
         ///_this.clientHeight = 'auto'

src/components/business-new/yqy-home-banner.vue

@@ -91,7 +91,7 @@ export default {
         itemData.appModuleInfo = item.appModuleInfo;
       }
 
-      // alert(JSON.stringify(itemData))
+     // alert(JSON.stringify(itemData))
       rocNative.dispatchEventByModuleCode({
           modeCode: itemData.appModuleInfo.code,
           jsonString: itemData.appModuleInfo.paramList

src/components/business-new/yqy-home-header.vue

@@ -9,7 +9,7 @@
       <div class="header-right" @click="goToPage">
         <img v-if="searchFix" class="info" src='../../images/msg2.png'>
         <img v-else class="info" src='../../images/msg1.png'>
-        <div :class="isMax?'num-max':'num-min'" class="info-count fs10" v-show="isShowMsg">{{count}}</div>
+        <div :class="isMax?'num-max':'num-min'" class="info-count fs10" v-show="msgCount>0">{{msgCount>99?'99+':msgCount}}</div>
       </div>
     </div>
   </div>
@@ -67,7 +67,10 @@ export default {
 
   },
   methods: {
+
     goToPage(){
+     // alert("000");
+      this.$emit('setAppMsg',false)
       this.pageBurialPoin({
         menuLevel:1,
         menuCode:'m_home',
@@ -197,7 +200,8 @@ html,body{
 }
 .num-min{
   max-width: px2rem(25px);
-  padding:0;
+  min-width: px2rem(15px);
+  /*padding:0;*/
 }
 .num-max{
   width: auto;

src/utils/index.js

@@ -237,22 +237,23 @@ export function jumpEvaluatPage(){
 // const apiUrl = 'https://dev-api.yunqueyi.com/'
 
 // test1地址
-const baseUrl =  'https://test1-sc.yunqueyi.com/'
-const apiUrl = 'https://test1-api.yunqueyi.com/'
+// 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/#/'
 
-const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
 
-export const jumpWebPageUrl =  'https://test1-phome.yunqueyi.com/appl/#/'
 
-//const devApiUri = 'https://test1-api.yunqueyi.com/'
+const baseUrl =  'https://uat-sc.yunqueyi.com/'
+const apiUrl = 'https://uat-api.yunqueyi.com/'
+const evaluatPageUrl = 'https://uat-phome.yunqueyi.com/gpr/#/home'
+export const jumpWebPageUrl =  'https://uat-phome.yunqueyi.com/appl/#/'
 
-// // uat地址
-// const baseUrl = 'http://uat-sc.yunqueyi.com/'
-// const apiUrl = 'http://uat-api.yunqueyi.com/'
-
-// // pro地址
-// const baseUrl = 'http://sc.yunqueyi.com/'
-// const apiUrl = 'http://api.yunqueyi.com/'
+// pro地址
+// 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/#/'
 
 
 // 为每个URL添加应用校验密钥

src/views/home/home-new.vue

@@ -8,7 +8,7 @@
 
                 <section class="home-header">
                     <div class="home-topMenu">
-                        <YqyHomeHeader :msgCount="msgCount" :searchFix="searchFix" :statusBarHeight="statusBarHeight" v-if="isHeightFromApp"/>
+                        <YqyHomeHeader :msgCount="msgCount" :searchFix="searchFix" :statusBarHeight="statusBarHeight" v-on:setAppMsg="goAppMsg"/>
                     </div>
                     <div class="banner-container swiper-container">
                         <div class="swiper-wrapper">
@@ -64,7 +64,7 @@
                     <YqyFiveMinutes :parmData="fiveList" v-if="fiveList.length>0"/>
                     
                     <!--为你推荐-->
-                    <YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList"  :userToken="userToken" v-on:setRefrshParm="getRefrshParm"/>
+                    <YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList" v-if="adjustList.length>0"  :userToken="userToken" v-on:setRefrshParm="getRefrshParm"/>
 
                     <!--返回顶部-->
                     <BackTop v-if="isShowBackTop"/>
@@ -137,6 +137,7 @@ export default {
             isFirstPull:true,
             updateStr:'',
             isRefreshFromBack:false,
+            isRefrshMsg:false,
         }
     },
     components:{
@@ -160,9 +161,18 @@ export default {
         _this.getUserInfo();
 
         window.__nativeCallMsg = function(params){
-             _this.msgCount = params.msgNum || '';
+            _this.msgCount = params.msgNum || '';
+            //alert(_this.msgCount);
         }
         window.__refresh = function(params){
+            // alert(_this.isRefrshMsg);
+            //点击消息
+            if(_this.isRefrshMsg){
+                window.__nativeCallMsg = function(params){
+                    _this.msgCount = params.msgNum || '';
+                    ///alert(_this.msgCount);
+                }
+            }
 
             //返回
             if(_this.isRefreshFromBack){
@@ -191,9 +201,9 @@ export default {
            
         }
 
-        alert("token之前");
+       // alert("token之前");
         window.__getUserInfo = function(parm){
-          alert("token:"+parm.userToken);
+         // alert("token:"+parm.userToken);
             _this.systemType = parm.systemType;
             _this.appVersion = parm.appVersion;
             _this.token = parm.userToken;
@@ -211,11 +221,12 @@ export default {
         _this.initAll()
 
 
-        // _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
+         // _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
+         // _this.msgCount = '2'
         // _this.isShowKeep = true;
         // _this.isHeightFromApp = true;
         // _this.getKeepData(_this.userToken);
-        //  _this.initByToken(_this.token);
+        // _this.initByToken(_this.token);
         // _this.getIconData(_this.token);
         // _this.isIntStyle =  'font-style pull-down';
         // _this.fiveTimePull();
@@ -251,6 +262,12 @@ export default {
     },
 
     methods:{
+
+        goAppMsg(){
+            
+            this.isRefrshMsg = true;
+           // alert(this.isRefrshMsg);
+        },
         hideKeepon(){
             this.isShowKeep = false;
         },
@@ -286,6 +303,7 @@ export default {
             this.getAdjustData(userToken);
             this.getNewsData(userToken);
             this.getEvaluctData(userToken);
+            window.addEventListener('scroll', this.scrollFun);
         },
 
         initAll(){
@@ -547,7 +565,7 @@ export default {
                 if(res.code === '000000'){
                     _this.adjustList = res.data || [];
                     if(_this.adjustList.length>0){
-                        window.addEventListener('scroll', _this.scrollFun);
+                        
                         _this.userToken = userToken
                     }
                     
@@ -636,10 +654,15 @@ export default {
                 this.isIntStyle = 'font-style pull-up';
                 this.isShowEvluat = false;
             }
+             var adjustTop = 0;
+
             //滚动条滚动到最新课程
             var newCourseTop = document.querySelector('#famus-teacher').offsetTop;
             var clientHeight = document.querySelector('#famus-teacher').clientHeight;
-            var adjustTop = document.querySelector('#adjust-u').offsetTop;
+            if(document.querySelector('#adjust-u')){
+                adjustTop = document.querySelector('#adjust-u').offsetTop;
+            }
+           
             var searchBox = document.querySelector('#search-top').offsetParent.offsetTop;
             //console.log(newCourseTop);
             if(scrollTop +clientHeight/2 >= newCourseTop){