Merge branch 'dev-app-home-1029' into Branch_tag-app

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

@@ -60,8 +60,8 @@ export default {
       isShowLoading:true,
       menuHeight:0,
       ptop:20,
-      popHeight:27,
-      menuptop:45,
+      popHeight:0,
+      menuptop:0,
     }
   },
   props:{
@@ -101,14 +101,14 @@ export default {
     window.__getStatusBarHeight = function(parm){
            
       if(window.__isAndroid){
-        _this.popHeight = parm.statusBarHeight/2
+        _this.popHeight = parseInt(parm.statusBarHeight)/2
       }else{
         _this.popHeight = parm.statusBarHeight
       }
-      _this.ptop = _this.popHeight+7+'px';
+      _this.ptop = _this.popHeight+'px';
 
-      _this.menuptop = _this.popHeight+7+36+'px'
-     // alert(parm.statusBarHeight+'kkkkk');
+      _this.menuptop = _this.popHeight+36+'px'
+      ///alert(_this.menuptop);
        
     }
     this.getStatusHight()
@@ -361,12 +361,13 @@ export default {
   
     z-index: 112;
     .font-title{
-      background: #fff;
+      background: #44A99B;
       padding:0 px2rem(15px);
+      color:#fff;
     }
   }
   .bgFill{
-    background: #ddd
+    background: #44A99B;
   }
 
 }

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

@@ -10,7 +10,7 @@
             <div class="tea-listbox">
                 <div class="tea-item" :key="index" v-for="(item,index) in parmData" @click="goToPage(item)">
                     <div class="head-pic">
-                        <img class="tea-itemimg" :src="item.appImageUrl"/>
+                        <img class="tea-itemimg" :src="item.avatarImageUrl"/>
                     </div>
                     <span class="tea-itemname">{{item.name}}</span>
                 </div>

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

@@ -144,9 +144,9 @@ html,body{
   z-index: 2;
 }
 .banner-item{
-  width: px2rem(50px);
+  width: px2rem(60px);
   display: inline-block;
-  margin-right: px2rem(18px);
+  margin-right: px2rem(15px);
   text-align: center;
 
 }

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

@@ -9,7 +9,7 @@
       <div class="bgFill" :style="{height:ptop}"></div>
       <div class="fixBox">
          <div class="header-right" @click="goToPage">
-          <img v-if="searchFix" class="info" src='../../images/msg2.png'>
+          <img v-if="searchFix" class="info" src='../../images/msg1.png'>
           <img v-else class="info" src='../../images/msg1.png'>
           <div :class="isMax?'num-max':'num-min'" class="info-count fs10" v-show="msgCount>0">{{msgCount>99?'99+':msgCount}}</div>
         </div>
@@ -59,15 +59,15 @@ export default {
   created(){
     let _this = this;
     window.__getStatusBarHeight = function(parm){
-           
+      //lert(parm.statusBarHeight)
       if(window.__isAndroid){
-        _this.popHeight = parm.statusBarHeight/2
+        _this.popHeight = parseInt(parm.statusBarHeight)/2.5
       }else{
         _this.popHeight = parm.statusBarHeight
       }
-      _this.ptop = _this.popHeight+7+'px';
+      _this.ptop = _this.popHeight+'px';
 
-      _this.menuptop = _this.popHeight+7+'px'
+      _this.menuptop = _this.popHeight+'px'
      // alert(parm.statusBarHeight);
        
     }
@@ -145,7 +145,7 @@ html,body{
   width: px2rem(20px);
   height: px2rem(20px);
   position: relative;
-  margin:px2rem(5px) 0;
+  margin-top:px2rem(5px);
  float: right;
   img{
     width: 100%;
@@ -183,14 +183,14 @@ html,body{
      
   }
   .fixBox{
-    background: #fff;
-    height:px2rem(40px);
+    background: #44A99B;
+    height:px2rem(30px);
     padding:0 px2rem(25px);
-    padding-top: px2rem(7px)
+   /* padding-top: px2rem(7px)*/
 
   }
   .bgFill{
-    background: #ddd;
+    background: #44A99B;
   }
   .search-transparent::-webkit-input-placeholder{ 
       color:#666;
@@ -205,8 +205,8 @@ html,body{
 }
 .fixBox{
     padding:0 px2rem(25px);
-    height: px2rem(40px);
-    padding-top: px2rem(7px)
+    height: px2rem(30px);
+   /* padding-top: px2rem(7px)*/
 
 }
 .search-menu{

src/views/home/home-new.vue

@@ -138,6 +138,13 @@ export default {
             updateStr:'',
             isRefreshFromBack:false,
             isRefrshMsg:false,
+            isFailSwiper:1,
+            isFailCatagory1:false,
+            isFailCatagory2:false,
+            isFailCatagory3:false,
+            isFailTeaches:false,
+            isFailFive:false,
+
         }
     },
     components:{
@@ -175,15 +182,11 @@ export default {
         }
 
         window.__refresh = function(params){
-             //__getToken()
-            // alert('__refresh');
-            //alert(JSON.stringify(params))
-
+            _this.isShowEvluat = false;
+            _this.isIntStyle =  '';
             //返回
             if(_this.isRefreshFromBack){
-                //alert("返回了，token:"+_this.userToken);
-                // _this.adjustList = [];
-                // _this.newsDatalist = [];
+                
                 _this.getAdjustData(_this.userToken);
                 _this.getNewsData(_this.userToken);
             } else if(_this.isShowEvluat && !_this.isRefreshFromBack){
@@ -230,13 +233,13 @@ export default {
         
 
 
-       //   _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
+        //  _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
        //  _this.msgCount = '2'
        //  _this.isShowKeep = true;
        //  _this.isHeightFromApp = true;
        //  _this.getKeepData(_this.userToken);
-       //   _this.initByToken(_this.token);
-       //  _this.getIconData(_this.token);
+         // _this.initByToken(_this.token);
+         // _this.getIconData(_this.token);
        // _this.isIntStyle =  'font-style pull-down';
        //  _this.fiveTimePull();
 
@@ -273,6 +276,30 @@ export default {
 
     methods:{
 
+        //再次执行请求
+        sendAgain(){
+            let _this = this;
+            if(_this.isFailSwiper == 2){
+                _this.getSwiper()
+            }
+            if(_this.isFailCatagory1){
+                _this.getIconData();
+            }
+            if(_this.isFailCatagory2){
+                _this.this.getMiddel();
+            }
+            if(_this.isFailCatagory3){
+                _this.this.getCategoryData();
+            }
+            if(_this.isFailTeaches){
+                _this.getYqDoctorData();
+            }
+            if(_this.isFailFive){
+                _this.getFiveData();
+            }
+
+        },
+
         goAppMsg(){
             
             this.isRefrshMsg = true;
@@ -318,7 +345,7 @@ export default {
 
         initAll(){
             this.getSwiper()
-            this.getUpdateData();
+           /// this.getUpdateData();
             this.getMiddel();
             this.getIconData();
             this.getCategoryData();
@@ -400,16 +427,17 @@ export default {
                     }else{
                         
                         _this.isShowEvluat = _this.evaluctObj.showFlag;
+                        if(!_this.isShowEvluat){
+                           _this.isIntStyle = ''
+                        }else{
+                            _this.fiveTimePull();
+                            _this.isIntStyle = 'font-style pull-down'
+                        }
                         
                      
                     }
 
 
-                }else{
-                   // alert(res.message);
-                    // rocNative.showNativeToast({
-                    //     message: res.message
-                    // })
                 }
 
                 if(!_this.isShowEvluat){
@@ -435,11 +463,10 @@ export default {
             }
             this.GET('contents/HomeColumn/Information', para).then(res => {
                 if(res.code == '000000'){
-                    //alert("000");
+                    
                     _this.iconList = res.data && res.data.iconColumnInformationModels || []
-                    //alert(_this.userToken);
-                    //_this.userToken = userToken
                 }
+                
             })
         },
 
@@ -459,6 +486,7 @@ export default {
                    /// console.log(_this.list);
                     
                 }
+               
             })
         },
 
@@ -502,6 +530,7 @@ export default {
                 if(res.code == '000000'){
                     _this.yqDoctorList = res.data && res.data.pCourseDoctorModels || []
                 }
+                
             })
         },
 
@@ -547,6 +576,7 @@ export default {
 
                     _this.fiveList = _this.handelFive(res.fiveMinutesMedicalContentList) || []
                 }
+                
             })
         },
 
@@ -601,14 +631,14 @@ export default {
             this.GET('contents/courses/queryCourseCount', para).then(res => {
                 if(res.code == '000000'){
                     if(res.data != null){
-                        _this.updateTotal = res.data.courseCount + res.data.fiveHospCount || 0
-                        if(_this.updateTotal > 0){
-                            _this.showNewCorse =  true;
+                        // _this.updateTotal = res.data.courseCount + res.data.fiveHospCount || 0
+                        // if(_this.updateTotal > 0){
+                        //     _this.showNewCorse =  true;
                         
-                            _this.updateStr = _this.updateTotal>9 ? '9+' : _this.updateTotal
-                        }else{
-                            _this.showNewCorse =  false
-                        } 
+                        //     _this.updateStr = _this.updateTotal>9 ? '9+' : _this.updateTotal
+                        // }else{
+                        //     _this.showNewCorse =  false
+                        // } 
                     }
                     
                 }
@@ -711,6 +741,7 @@ export default {
            let setTimer = setInterval(function(){
                 _this.isIntStyle = 'font-style pull-up';
                 _this.isShowEvluat = false;
+                ///alert("0")
                 clearInterval(setTimer)
             },5000);
            
@@ -744,9 +775,17 @@ export default {
           
             this.GET('/contents/HomeColumn/Information', para).then(res => {
                 if(res.code == '000000'){
-                    _this.listSwiper = res.data.iconColumnInformationModels || []
+                    _this.listSwiper = res.data.iconColumnInformationModels || [];
+
+                    
                     _this.swiperFun();
                 }
+                if( _this.listSwiper.length == 0){
+                    _this.isFailSwiper += 1;
+                }
+                _this.isFailSwiper = _this.listSwiper.length == 0 ? 2 : 1 ;
+                
+                
             })
         },
 
@@ -765,6 +804,7 @@ export default {
                    // console.log(res);
                     _this.listMiddle = res.data && res.data.iconColumnInformationModels || []
                 }
+                _this.isFailCatagory2 = _this.listMiddle.length == 0 ? true : false;
             })
         },
 
@@ -826,20 +866,20 @@ export default {
     }
     .banner-container.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{
         width: 2px;
-        height: 8px;
+        height: 7px;
         background: #fff;
         margin:6px 0 0 0;
         float: left;
         opacity: 0.4;
         
     }
-    .banner-container .swiper-pagination-bullet-active{
+    .banner-container.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet-active{
         opacity: 1
     }
 
     .banner-pagination{
         width: 2px;
-        background: #fff;
+        z-index: 100;
         right: 10px;
         top:10px;
         position: absolute;