Merge remote-tracking branch 'origin/test' into test

src/css/index.css

@@ -293,6 +293,7 @@
   top: 2px;
   right: 0px;
   display: none;
+  cursor: pointer;
   background: url('../images/msg1.png') center center no-repeat;
 }
 .infoMsg:hover {

src/css/index.less

@@ -289,6 +289,7 @@
   }
 }
 .disclaimer {
+  cursor: pointer;
   height: 40px;
   width: 100%;
   line-height: 40px;
@@ -308,6 +309,7 @@
   position: absolute;
   top: 2px;
   right: 0px;
+  cursor: pointer;
   display: none;
   background: url('../images/msg1.png') center center no-repeat;
 }

src/css/landscape.css

@@ -27,6 +27,8 @@
     height: 20px;
     line-height: 20px;
     position: relative;
+    background: #fff;
+ 
   }
   .iframeWrap .conditionHintPub li {
     padding-right: 22px;
@@ -239,6 +241,7 @@
   .iframeWrap .illnessTable {
     color: #267FD7;
     line-height: 20px;
+    cursor: pointer;
   }
   .iframeWrap .illnessTable::before {
     color: #267FD7;
@@ -276,6 +279,7 @@
   .conditionHintAssistLis {
     /* position: relative; */
     background: #fff;
+    /* position: absolute; */
   }
   .conditionHintInspectNull {
     border-bottom: 1px solid #D1D1D1;
@@ -355,9 +359,10 @@
     line-height: 20px;
     text-align: center;
     bottom: 0;
-    background-color: #ececec;
+    background-color: #efefef;
     z-index: 98;
     float: left;
+    cursor: pointer;
   }
   .disclaimer a {
     display: block;
@@ -366,8 +371,9 @@
     width: 20px;
     height: 20px;
     position: absolute;
-    top: 0px;
-    right: 2px;
+    top: -15px;
+    left: 50%;
+    margin-left: -10px;
     display: none;
     background: url('../images/msg1.png') center center no-repeat;
     cursor: pointer;
@@ -391,10 +397,22 @@
   .infoMsgParent:hover .infoMsg {
     display: block;
   }
-  .conditionHintRecomDiagLis {
+  /* .conditionHintRecomDiagLis {
     background: #fff;
-    z-index: 2
+    z-index: 1
+  }
+  .conditionHintWzLis {
+    z-index: 2;
+  }
+  .conditionHintTg {
+    z-index: 3;
   }
+  .conditionHintTips {
+    z-index: 4;
+  }
+  .topZIndex {
+    z-index: 99;
+  } */
   .responsibility {
     text-align: center;
     font-size: 12px;
@@ -429,10 +447,18 @@
     left: 50%;
     margin: -36px 0 0 -14px;
     line-height: 18px;
+    color: #9C9C9C;
   }
   .disclaimerTip {
     margin-left: 0;
     line-height: 14px;
     height: 56px;
     margin: -28px 0 0 0;
+  }
+  .titleIcon {
+    position: relative;
+    width: 18px;
+    top: 1px;
+    display: block;
+    float: left;
   }

src/html/landscape.html

@@ -21,7 +21,7 @@
         </div>
         <ul class="push">
             <li class="conditionHintPub conditionHintRecomDiag">
-              <h4 href="javascript:void(0);"><i></i>推荐诊断</h4>
+              <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/yszd.png">推荐诊断</h4>
               <div class="conditionMain">
                 <p class="conditionHintRecomDiagLisNull pushEmpty">暂无推荐</p>
                 <ul class="clearfix conditionHintRecomDiagLis">
@@ -29,7 +29,7 @@
               </div>
             </li>
           <li class="conditionHintPub conditionHintWz">
-            <h4 href="javascript:void(0);"><i></i>问诊症状</h4>
+            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/inquire.png">问诊症状</h4>
             <div class="conditionMain">
               <p class="conditionHintWzNull pushEmpty">暂无推荐</p>
               <ul class="clearfix conditionHintWzLis">
@@ -37,7 +37,7 @@
             </div>
           </li>
           <li class="conditionHintPub conditionHintTg">
-            <h4 href="javascript:void(0);"><i></i>体格检查</h4>
+            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/tgjc.png">体格检查</h4>
             <div class="conditionMain">
                 <p class="conditionHintTgNull pushEmpty">暂无推荐</p>
                 <ul class="clearfix conditionHintTgLis">
@@ -46,7 +46,7 @@
             </div>
           </li>
           <li class="conditionHintPub conditionHintTips">
-            <h4 href="javascript:void(0);"><i></i>病情提示</h4>
+            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/tips.png">病情提示</h4>
             <div class="conditionMain conditionHintTipsNull">
               <span class="pushEmpty">暂无推荐</span>
             </div>

src/html/landscapePage.html

@@ -14,7 +14,7 @@
 
 <body>
   <div class="iframeContainer">
-    <iframe class="iframeContainer" src="./landspace.html" frameborder="0"></iframe>
+    <iframe class="iframeContainer" src="./landscape.html" frameborder="0"></iframe>
   </div>
 </body>
 

src/js/landscapeDom.js

@@ -1,5 +1,6 @@
 const $ = require("jquery")
 const { openNewWin } = require('./promise.js');
+const warningImg = require("../images/warning.png") 
 
 function bqtsFun(data){//病情提示
   for(var k = 0;k < data.length;k++){
@@ -74,7 +75,7 @@ function tjzdFun(data, type) {
         $(".conditionHintMay").css("display","block")
         if(type == 'warning') {
             tmpStr+= `<li class="infoMsgParent warning" data-name="${data[i].name}">
-                <img src="${require("../images/warning.png")}" class="warningImg">
+                <img src="${warningImg}" class="warningImg">
                 ${data[i].name}
                 <span  title="点击名称可看详细说明" class="infoMsg"></span>
             </li>`
@@ -126,18 +127,13 @@ function slideToggle(domName){//展开收起
     domName.append('<span class="slideDown"><i></i></span>')
   }
   domName.on('click',".slideDown",function(){   //展开
-    $(".conditionHintPub").css({"zIndex": "1"});
-    $(".push .conditionHintPub").find(".conditionMain").css({"height": "20px", "overflow": "hidden"});
+    $(this).parent().parent().parent().addClass("topZIndex")
     $(".slideUp").removeClass("slideUp").addClass("slideDown")
-    domName.parent().css({"height": "56px", "overflow": "auto"});
-    domName.parent().parent().css({"zIndex": "2"});
     domName.append('<span class="slideUp"><i></i></span>')
     $(this).remove()
   })
   
   domName.on('click',".slideUp",function(){ //收起
-    domName.parent().css({"height": "20px", "overflow": "hidden"});
-    domName.parent().parent().css({"zIndex": "1"});
     domName.append('<span class="slideDown"><i></i></span>')
     $(this).remove()
   })