Merge branch 'modeTree' into icss6.0

src/css/icssIndex.less

@@ -9,7 +9,7 @@
 
 .recommendInfoWrapper {
     border: 1px solid #F2F2F2;
-    margin-bottom: 15px;
+    margin-bottom: 5px;
 
     h4 {
         color: #000;
@@ -462,7 +462,31 @@
         top: 2px;
     }  
 }
-
+.loading{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    z-index: 100;
+    display: none;
+}
+.loadingMask{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=50);";
+}
+.loadingImg{
+    width: 40px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin: -20px 0 0 -20px;
+}
 .emergency {
     position: fixed;
     right: 20px;

src/html/icssIndex.html

@@ -31,6 +31,11 @@
             <img class="emptyImg" src="./images/empty.png" alt="空">
             <p class="emptyTxt">内容暂无推送信息~</p>
           </div>
+          <div class="loading">
+            <div class="loadingMask"></div>
+            <img class="loadingImg" src="./images/loading.gif" alt="loading">
+            <!-- <p class="loadingTxt">loading~</p> -->
+          </div>
         </div>
       </div>
       <p class="responsibility"></p>

src/js/icssIndex.js

@@ -2,6 +2,7 @@ require('./../css/reset.css');
 require('./../css/icssIndex.less');
 require('./../css/popup.css');
 require('./../images/empty.png')
+require('./../images/loading.gif')
 require('./../images/right.png')
 // require('./popupEdit.js');
 var Promise = require("bluebird");
@@ -28,6 +29,8 @@ let msg;
 function getMRInfo() {
    return post(config.getMr2,{mrId:mrId})
 }
+$('.loading').css("display","block")
+$('.empty').css("display","none")
 getMRInfo().then(res =>{
     if(res.data.code == '0'){
         msg = res.data.data
@@ -267,7 +270,7 @@ function getPageInfo(configArr) {
           console.log(err);
         })
       } else{
-        getPushInfo.then(res =>{
+        getPushInfo().then(res =>{
           diagWaring = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['警惕'] || []
           diagFirst = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['拟诊'] || []
           diagPossible = res&&res.data&&res.data.data&&res.data.data.dis&&res.data.data.dis['可能诊断'] || []
@@ -454,8 +457,11 @@ function renderPageData(confArr,diagWaring,diagFirst,diagPossible,diagIdentify,l
           break;
       } 
     }
+    $('.loading').css("display","none")
     if(renderNum > 0 || diagWaring.length > 0){
       $(".empty").css("display","none")
+    }else{
+      $(".empty").css("display","block")
     }
 }