add

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

@@ -165,6 +165,7 @@ export default {
     //收藏 取消收藏
     collectFun(status,id,name){
      // alert(this.userToken);
+      status = status == 1 ? 2 : 1;
       this.pageBurialPoin({
         menuLevel:1,
         menuCode:'m_home',
@@ -189,7 +190,7 @@ export default {
       _this.POST('contents/favors',parm).then(function(res){
 
         if(res.code === '000000'){
-          status = status == 1 ? 2 : 1;
+         
           _this.handelData(id,status);
         }else{
           //alert(res.message);

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

@@ -51,19 +51,20 @@ export default {
 
         //跳转
         goToPage(item,parm){
-            //console.log(item);
+            alert(jumpWebPageUrl);
+
             let _this = this;
             //let url = location.protocol+'//'+location.host+'/#/'
             //alert(url);
             if(parm == 'list'){
                 
                 rocNative.gotoNewWebActivity({
-                    url: jumpWebPageUrl+'teachers'
+                    pageUrl: 'https://test1-phome.yunqueyi.com/appl/#/teachers'
                 })
 
             }else{
                 rocNative.gotoNewWebActivity({
-                    url: jumpWebPageUrl+'teachersDetail?id='+item.id+"&from=appHome"
+                    pageUrl: jumpWebPageUrl+'teachersDetail?id='+item.id+"&from=appHome"
                 })
             }
             

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

@@ -48,7 +48,7 @@ export default {
       }else{
 
           rocNative.gotoNewWebActivity({
-              url: jumpWebPageUrl+'teachers'
+              pageUrl: jumpWebPageUrl+'teachers'
           })
         // this.$router.push({
         //     path: paramList[0].url,

src/components/business-new/yqy-home-learn-evaluation.vue

@@ -74,7 +74,8 @@ export default {
   },
   mounted(){
     this.isShow = this.isShowEvluat;
-    console.log(this.isShowEvluat)
+    this.parmObj = this.parmData
+    console.log(this.parmData)
   },
   methods: {
 
@@ -169,25 +170,34 @@ export default {
     padding:0 px2rem(10px);
     .evaluat-info{
       margin-top: px2rem(33px);
+      overflow: hidden;
       .evaluat-icon{
         height: px2rem(26px);
         width: px2rem(26px);
         border-radius: 50%;
         background: #D7E0EC;
-        display: inline-block;
-        vertical-align: middle;
+        display:inline-block;
+        position: relative;
+        float: left;
         img{
-          margin-top:px2rem(3px);
-          height: px2rem(23px);
-          width: px2rem(23px);
+          position: absolute;
+          left: 0;
+          top:0;
+          height: px2rem(26px);
+          width: px2rem(26px);
           display: inline-block;
           border-radius: 50%;
         }
       }
       
       .evaluat-persent{
+        margin-left: px2rem(5px);
         font-size: px2rem(13px);
         color:#AA813B;
+        height: px2rem(26px);
+        line-height: px2rem(26px);
+        display: inline-block;
+        float: left;
       }
     }
     .push-up{

src/components/business-new/yqy-teacher-list.vue

@@ -102,6 +102,7 @@ export default {
     //收藏 取消收藏
     collectFun(status,id){
      // alert(this.userToken)
+     status = status == 1 ? 2 : 1;
       this.pageBurialPoin({
           menuLevel:1,
           menuCode:'m_home',
@@ -123,7 +124,7 @@ export default {
       _this.POST('contents/favors',parm).then(function(res){
 
         if(res.code === '000000'){
-          status = status == 1 ? 2 : 1;
+          
           _this.handelData(id,status);
         }else{
           //alert(res.message);

src/utils/index.js

@@ -242,7 +242,7 @@ const apiUrl = 'https://test1-api.yunqueyi.com/'
 
 const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
 
-export const jumpWebPageUrl =  'https://test1-sc.yunqueyi.com/appl/#/'
+export const jumpWebPageUrl =  'https://test1-phome.yunqueyi.com/appl/#/'
 
 //const devApiUri = 'https://test1-api.yunqueyi.com/'
 

src/views/activity/activity.vue

@@ -53,21 +53,12 @@ export default {
         }
        //_this.token = 'AF22B142535B440883135309BBF3F3B0'
         this.getBaseInfo();
-    },
-    watch:{
-        token:function(){
-            if(this.token != null){
-                this.id = this.$route.query.categoryId
-                this.getTabData();
-                window.addEventListener('scroll', this.scrollFun);
-            }
-        }
-        
     },
 
 	mounted(){
       
-       
+        this.getTabData();
+        window.addEventListener('scroll', this.scrollFun);
     },
     beforeDestroyed(){
         window.removeEventListener('scroll', this.scrollFun)
@@ -113,7 +104,7 @@ export default {
             parm = {
                 id:_this.id,
                 setEntry: 'headers',
-                token:_this.userToken
+            
             }
             _this.GET('contents/contentList/tabById',parm).then(function(res){
 

src/views/home/home-new.vue

 <template>
     <div class="main-body" ref="wrapper" :style="{ height: (wrapperHeight-50) + 'px' }">
-        <mt-loadmore :top-method="loadTop"   ref="loadmore" :autoFill="isAutoFill" :bottom-all-loaded="allLoaded" :topDistance="topDistance">
+        
             <section :class="isIntStyle">
                 <!--展开收起学习评价-->
                 <YqyTopEvaluat  :isShowEvluat="isShowEvluat" v-if="isShowEvluat" :parmData="evaluctObj" v-on:evluatFun="getEluatFun"/>
@@ -66,7 +66,7 @@
                     </a>
                 </section>
             </section>
-        </mt-loadmore>
+        
     </div>
   	
 </template>
@@ -123,7 +123,7 @@ export default {
             userToken:'',
             isHeightFromApp:false,
             isFirstPull:true,
-            updateStr:''
+            updateStr:'',
         }
     },
     components:{
@@ -174,6 +174,7 @@ export default {
             if(parm.userMobile != ''){
                 _this.getKeepData(parm.userToken);
             }
+
             
             
             _this.initByToken(parm.userToken);
@@ -183,10 +184,11 @@ export default {
             
         }
         _this.initAll()
-        // _this.token = 'A19F2200C11A4E958650B2246039B560';
+        // _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
         // _this.isHeightFromApp = true;
         // _this.initByToken(_this.token);
 
+
         _this.getUserInfo();
         _this.getStatusHight();
        
@@ -322,16 +324,31 @@ export default {
 
             this.GET('contents/gp/v1/homepage', para).then(res => {
                 if(res.code == '000000'){
-
-                    _this.evaluctObj = res.data || {};
+                    // res.data = {
+                    //     avatarImageUrl: "https://test-file.yunqueyi.com/File/doctor_default.png",
+                    //     certificateAcquireNumOfHospital: 10,
+                    //     certificateAcquireNumOfSelf: 9,
+                    //     courseOverNumOfHospital:    10,
+                    //     courseOverNumOfSelf: 5,
+                    //     examOverNumOfHospital: 10,
+                    //     examOverNumOfSelf: 5,
+                    //     gradePKToHospital: 0.67,
+                    //     showFlag: true
+                    // }
+                    _this.evaluctObj =   res.data || {};
                     if(res.data.certificateAcquireNumOfSelf == 0 &&  res.data.courseOverNumOfSelf == 0 && res.data.examOverNumOfSelf == 0){
                         _this.isShowEvluat = false;
                     
                     }else{
+                        
                         _this.isShowEvluat = _this.evaluctObj.showFlag;
+                        if(_this.isShowEvluat){
+                            _this.fiveTimePull()
+                        }
                      
                     }
 
+
                 }else{
                    // alert(res.message);
                     rocNative.showNativeToast({