add

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

@@ -82,6 +82,7 @@ export default {
   mounted(){
  
     this.list = this.parmData;
+    
     if(window.__isAndroid){
       this.popHeight = this.statusBarHeight/2
     }else{
@@ -96,6 +97,12 @@ export default {
       // LOADING
   },
   methods: {
+    getStatusHight(){
+        rocNative.getStatusBarHeight({
+            __funcName: '__getStatusBarHeight'
+        })
+        
+    },
 
     //跳转
     goToPage(item){

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

@@ -55,7 +55,7 @@ export default {
         goToPage(item,parm){
             let _this = this,
                 url = '',action_code = '',label_id = '';
-
+                //alert(_this.userToken);
             if(parm == 'list'){
                 url = jumpWebPageUrl+'teachers?userToken='+_this.userToken;
                 action_code = 'c_more'
@@ -102,7 +102,7 @@ export default {
                 }
             };
 
-            //alert(JSON.stringify(itemData))
+            alert(JSON.stringify(itemData))
 
             rocNative.dispatchEventByModuleCode({
                 modeCode: itemData.appModuleInfo.code,

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

@@ -41,26 +41,28 @@ export default {
   methods: {
     goToPage(itemData){
       let paramList = this.setEventByModuleCode(itemData);
-      let code = '';
-      //alert(JSON.stringify(itemData))
+      let code = '',categoryId = '',item = {};
+    
       if(itemData.appModuleInfo && itemData.appModuleInfo.code == 'M500'){
         //let url = jumpWebPageUrl+'activity?categoryId=1';
         code = 'M300';
         let url = '';
         if(itemData.appModuleInfo.paramList.length>0){
           if(itemData.appModuleInfo.paramList[0].value.indexOf('activity') > -1){
-            url = itemData.appModuleInfo.paramList[0].value + '?categoryId=1&userToken='+this.userToken;
+            url = itemData.appModuleInfo.paramList[0].value + '?categoryId='+itemData.appModuleInfo.paramList[1].value+'&userToken='+this.userToken;
           }
           if(itemData.appModuleInfo.paramList[0].value.indexOf('teachers') > -1){
             url = itemData.appModuleInfo.paramList[0].value+'?userToken='+this.userToken;
           }
-          //alert(url);
+          alert(url);
           
         }
         
 
         ///itemData.appModuleInfo.code = 'M300';
-        let item = {
+         item = {
+            "name":itemData.name,
+            "id":itemData.id,
             "title":"",
             "imageUrl":"",
             "appModuleInfo":{
@@ -88,15 +90,17 @@ export default {
                 ]
             }
         };
-        itemData.appModuleInfo = item.appModuleInfo;
+        //itemData.appModuleInfo = item.appModuleInfo;
+      }else{
+        item = itemData;
       }
 
      // alert(JSON.stringify(itemData))
       rocNative.dispatchEventByModuleCode({
-          modeCode: itemData.appModuleInfo.code,
-          jsonString: itemData.appModuleInfo.paramList
+          modeCode: item.appModuleInfo.code,
+          jsonString: item.appModuleInfo.paramList
       })
-      //console.log(itemData.name);
+      console.log(itemData);
      
       this.pageBurialPoin({
         menuLevel:1,

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

@@ -45,28 +45,49 @@ export default {
       default:false,
     }
   },
+  created(){
+    let _this = this;
+    window.__getStatusBarHeight = function(parm){
+            
+      if(window.__isAndroid){
+        _this.popHeight = parm.statusBarHeight/2
+      }else{
+        _this.popHeight = parm.statusBarHeight
+      }
+      _this.ptop = _this.popHeight+7+'px';
+      _this.menuptop = _this.popHeight+7+'px'
+     // alert(parm.statusBarHeight);
+       
+    }
+  },
 
   mounted(){
-    
-    if(window.__isAndroid){
-      this.popHeight = this.statusBarHeight/2
-    }else{
-      this.popHeight = this.statusBarHeight
-    }
-    this.count =  this.msgCount;
-    this.ptop = this.popHeight+7+'px';
-    this.menuptop = this.popHeight+7+'px'
+   // this.getStatusHight();
+    // if(window.__isAndroid){
+    //   this.popHeight = this.statusBarHeight/2
+    // }else{
+    //   this.popHeight = this.statusBarHeight
+    // }
+    // this.count =  this.msgCount;
+    // this.ptop = this.popHeight+7+'px';
+    // this.menuptop = this.popHeight+7+'px'
    // console.log(this.statusBarHeight);
-    if(this.msgCount == ''){
-      this.isShowMsg = false
-    }
-    if(this.count>=99){
-      this.count += '+';
-      this.isMax = true
-    }
+    // if(this.msgCount == ''){
+    //   this.isShowMsg = false
+    // }
+    // if(this.count>=99){
+    //   this.count += '+';
+    //   this.isMax = true
+    // }
 
   },
   methods: {
+    getStatusHight(){
+        rocNative.getStatusBarHeight({
+            __funcName: '__getStatusBarHeight'
+        })
+        
+    },
 
     goToPage(){
      // alert("000");

src/utils/index.js

@@ -237,17 +237,17 @@ 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 evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
-// export const jumpWebPageUrl =  'https://test1-phome.yunqueyi.com/appl/#/'
+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 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/#/'
+// 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/#/'
 
 // pro地址
 // const baseUrl =  'https://sc.yunqueyi.com/'

src/utils/yqyServerRegister.js

@@ -32,6 +32,10 @@
             if(t == 'closeAudioView'){
                 __closeAudioView(n);
             }
+            if(t == 'getToken'){
+                __getToken(n);
+            }
+            
             
 
         },

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-on:setAppMsg="goAppMsg"/>
+                        <YqyHomeHeader :msgCount="msgCount" :searchFix="searchFix"  v-on:setAppMsg="goAppMsg"/>
                     </div>
                     <div class="banner-container swiper-container">
                         <div class="swiper-wrapper">
@@ -164,15 +164,18 @@ export default {
             _this.msgCount = params.msgNum || '';
             //alert(_this.msgCount);
         }
+
+
+        window.__getToken = function(params){
+            //alert(params.userToken);
+           // _this.userToken = params.userToken
+            // _this.getUserInfo();
+           // _this.initByToken(params.userToken);
+        }
+
         window.__refresh = function(params){
-            // alert(_this.isRefrshMsg);
-            //点击消息
-            if(_this.isRefrshMsg){
-                window.__nativeCallMsg = function(params){
-                    _this.msgCount = params.msgNum || '';
-                    ///alert(_this.msgCount);
-                }
-            }
+             //__getToken()
+
 
             //返回
             if(_this.isRefreshFromBack){
@@ -181,14 +184,11 @@ export default {
                 // _this.newsDatalist = [];
                 _this.getAdjustData(_this.userToken);
                 _this.getNewsData(_this.userToken);
-            }
-            //alert(_this.isShowEvluat);
-
-            //第一次进来及时
-            if(_this.isShowEvluat && !_this.isRefreshFromBack){
+            } else if(_this.isShowEvluat && !_this.isRefreshFromBack){
                 _this.isIntStyle =  'font-style pull-down';
                 _this.fiveTimePull();
-
+            } else {
+                _this.getUserInfo();
             }
           
         }
@@ -197,10 +197,11 @@ export default {
             
             _this.statusBarHeight = parm.statusBarHeight;
             _this.isHeightFromApp = true;
-           // alert(_this.statusBarHeight);
+            // alert(parm.statusBarHeight);
            
         }
 
+
        // alert("token之前");
         window.__getUserInfo = function(parm){
          // alert("token:"+parm.userToken);
@@ -221,12 +222,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();
@@ -280,7 +281,7 @@ export default {
         swiperFun(){
             
             var swiper = new Swiper('.swiper-container', {
-                speed: 500,
+                speed: 600,
                 loop: true,
                 observer:true,
                 observeParents:true,
@@ -324,6 +325,11 @@ export default {
             })
             
         },
+        getToken(){
+             rocNative.getToken({
+                __funcName: '__getToken'
+            })
+        },
 
         //获取版本号
         getUserInfo(){
@@ -392,9 +398,9 @@ export default {
 
                 }else{
                    // alert(res.message);
-                    rocNative.showNativeToast({
-                        message: res.message
-                    })
+                    // rocNative.showNativeToast({
+                    //     message: res.message
+                    // })
                 }
 
                 if(!_this.isShowEvluat){
@@ -694,7 +700,7 @@ export default {
                 _this.isIntStyle = 'font-style pull-up';
                 _this.isShowEvluat = false;
                 clearInterval(setTimer)
-            },60000);
+            },5000);
            
            
         },