add

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

@@ -3,11 +3,7 @@
       <div :class="isFixed ? 'cource-header fixed' : 'cource-header'" :style="{paddingTop:ptop,height:menuHeight}">
           <div  class="font-title" :style="{top:isFixed?ptop:'0'}">
             {{title}}
-            <div class="change-part gray" @click="changeFun">
-              换一批
-              <img src="../../images/change.png"/>
-              
-            </div>
+            
           </div>
           
       </div>
@@ -50,6 +46,7 @@ export default {
     return {
       list:[],
       pageNo:1,
+      isDisabled:false,
       pageSize:10,
       title:'为您推荐',
       isCollected:'',
@@ -57,7 +54,7 @@ export default {
       loading:true,//是否滚动加载
       isLoading:false,//加载中
       noMore:false,
-      clientHeight:0,
+      clientHeight:'auto',
       isShowLoading:true,
       menuHeight:0,
       ptop:0,
@@ -138,19 +135,20 @@ export default {
         actionCode:'c_change',
       })
 
-      this.clientHeight = document.documentElement.clientHeight+'px';
-      document.documentElement.scrollTop = document.documentElement.scrollTop - 20;
-      document.body.scrollTop = document.body.scrollTop - 20;
+
+      // this.clientHeight = document.documentElement.clientHeight+'px';
+      // document.documentElement.scrollTop = document.documentElement.scrollTop - 100;
+      // document.body.scrollTop = document.body.scrollTop - 100;
       //console.log(document.documentElement.scrollTop);
       this.loading = true;
       this.noMore = false;
-      this.pageNo++;
       this.list = [];
-      this.getData();
+      this.getData("change");
     },
 
     //滑动加载更多
     loadMore(){
+     
       let _this = this;
       if(!_this.noMore){
         _this.pageNo += 1;
@@ -215,35 +213,31 @@ export default {
         token:_this.token,
         setEntry: 'headers'
       }
+      
 
       _this.GET('contents/courses/recommendCourseList',parm).then(function(res){
 
         if(res.code === '000000'){
-          
+          if(res.data == null || !res.data){
+            res.data = [];
+            _this.isLoading = false;
+            _this.noMore = true;
+            _this.loading = true;
+          }else{
+            _this.isLoading = true;
+            _this.noMore = false;
+            _this.loading = false;
+          }
+
           if(type == 'loadMore'){
-            if(res.data == null || !res.data){
-              res.data = [];
-              _this.isLoading = false;
-              _this.noMore = true;
-              _this.loading = false;
-            }
-          
+            _this.list =  [..._this.list ,...res.data];
 
-            _this.list =  [..._this.list ,...res.data] || [];
           }else{
-            _this.noMore = false;
-            _this.isLoading = false;
             _this.list =  res.data || [];
           }
-        }else{
-          _this.isLoading = false;
-          _this.noMore = false;
-          _this.loading = false;
         }
-        _this.clientHeight = 'auto'
+        ///_this.clientHeight = 'auto'
 
-        _this.isLoading = false;
-        _this.loading = false;
       },function(){
         _this.isLoading = false;
         _this.noMore = false;
@@ -273,7 +267,7 @@ export default {
   padding:0 px2rem(15px);
 }
 .cource-header{
-  margin: 0 0 px2rem(11px) 0;
+ /* margin: 0 0 px2rem(11px) 0;*/
   overflow: hidden;
   
   .font-title{

src/components/business-new/yqy-category-three-1.vue

@@ -112,11 +112,13 @@ export default {
         .category-left{
             width: px2rem(170px);
             height: px2rem(195px); 
+            border-radius: px2rem(3px);
         }
         .category-img{
             width: 100%;
             height: 100%;
             display: block;
+            border-radius: px2rem(3px);
         }
         .mt5{
             margin-top:  px2rem(5px);
@@ -128,6 +130,7 @@ export default {
             .right-img{
                 width: px2rem(170px);
                 height: px2rem(95px);
+                border-radius: px2rem(3px);
             }
             
         }
@@ -137,7 +140,10 @@ export default {
         margin-top:px2rem(15px);
         width: 100%;
         height: px2rem(65px);
-
+        border-radius: px2rem(3px);
+        img{
+             border-radius: px2rem(3px);
+        }
     }
 }
 </style>

src/components/business-new/yqy-five-minutes.vue

@@ -268,6 +268,7 @@ export default {
                 width:100%;
                 height: 100%;
                 display: inline-block;
+                border-radius: px2rem(3px);
             }
         }
         .five-text{

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

@@ -203,12 +203,12 @@ export default {
             width: px2rem(50px);
             height: px2rem(50px);
             border-radius: 50%;
-    
+            text-align: center;
         }
         .tea-itemimg{
-            width: px2rem(39px);
-            height: px2rem(44px);
-            margin-top: px2rem(6px);
+            width: px2rem(45px);
+            height: px2rem(45px);
+            margin-top: px2rem(5px);
             border-radius: 50%;
         }
         .tea-itemname{

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

@@ -108,6 +108,10 @@ export default {
               let isPullIndex = _this.isShow ? '1' : '2';
               _this.$emit('evluatFun',{isPull:isPullIndex});
             }
+
+            // _this.isShow = _this.parmObj.showFlag;
+            //   let isPullIndex = _this.isShow ? '1' : '2';
+            //   _this.$emit('evluatFun',{isPull:isPullIndex});
            
           }else{
             ///alert(res.message);

src/components/common/topNav.vue

@@ -33,7 +33,7 @@
             },
             title:{//标题
                 type:String,
-                default:''
+                default:'暂无数据'
             },
             isNavFix:{//是否fix定位
                 type:Boolean,

src/utils/mixins.js

@@ -92,9 +92,15 @@ module.exports = {
                 paramList = ''
             }else if( modeCode === 'M100' || modeCode === 'M300' ) {
              
-                let urlPara = this.getUrlParmByCode(paramList)
+                let urlPara = this.getUrlParmByCode(paramList);
+                
                 // paramList[0].value += urlPara;
-                paramList[0] && (paramList[0].value += urlPara);
+                if(paramList[0]){
+                    if( paramList[0].value.indexOf("?") == -1){
+                        paramList[0].value += urlPara
+                    }
+                }
+               // paramList[0] && (paramList[0].value += urlPara);
 
 
             }else if( modeCode === 'M400') {
@@ -112,7 +118,7 @@ module.exports = {
             if(typeof paramList === 'string' && !paramList){
                 paramList = []
             }
-
+            console.log(paramList);
             return paramList;
         },
 

src/views/activity/activity.vue

@@ -8,6 +8,9 @@
                     <img :src="item.imageUrl" class="img"/>
                    <!--  <div class="time">活动时间：9月3日-9月9日</div> -->
                 </div>
+                <div class="no-show">
+                    暂无数据
+                </div>
             </div>
             <BackTop v-if="isShowBackTop" :burialPoint="pointStyle"></BackTop>
         </section>
@@ -25,7 +28,7 @@ export default {
             tittle:'',
             list:[],
             bgColor:'#fff',
-            navTitle:'',
+            navTitle:'活动',
             isBorder:true,
             isNavFix:true,
             id:'1',
@@ -46,9 +49,9 @@ export default {
             let jh = JSON.stringify(parm)
             
             _this.token = parm.userToken;
-           
-           
+         
         }
+       //_this.token = 'AF22B142535B440883135309BBF3F3B0'
         this.getBaseInfo();
     },
     watch:{
@@ -64,7 +67,7 @@ export default {
 
 	mounted(){
       
-        
+       
     },
     beforeDestroyed(){
         window.removeEventListener('scroll', this.scrollFun)
@@ -158,6 +161,11 @@ export default {
         padding: px2rem(15px);
         background: #fff;
     }
+    .no-show{
+        font-size: px2rem(15px);
+        color: #999;
+        text-align: center;
+    }
     .activity-count{
         color: #999;
         font-size: px2rem(15px);

src/views/home/home-new.vue

@@ -134,7 +134,7 @@ export default {
             _this.userMobile = parm.userMobile;
         }
 
-     //  _this.token = 'AF22B142535B440883135309BBF3F3B0'
+    // _this.token = 'AF22B142535B440883135309BBF3F3B0'
 
         this.getUserInfo();
         window.__getStatusBarHeight = function(parm){