zhangxc 6 年 前
コミット
2caead6510
3 ファイル変更58 行追加37 行削除
  1. 26 25
      src/css/landscape.css
  2. 20 11
      src/html/landscape.html
  3. 12 1
      src/js/landscapeDom.js

+ 26 - 25
src/css/landscape.css

@@ -14,7 +14,8 @@
   .push {
     width: 55%;
     float: left;
-    padding: 13px 0
+    padding: 13px 5px 13px 0;
+    border-right: 1px solid  #EFEEEE;
   }
   .treat {
     width: 35%;
@@ -38,7 +39,7 @@
     margin-bottom: 8px;
   }
   .iframeWrap .conditionHintPub .conditionMain {
-    margin: 0 40px 0 100px;
+    margin: 0 0px 0 85px;
     height: 20px;
     overflow: hidden;
     white-space: nowrap;
@@ -215,6 +216,9 @@
     padding-bottom: 5px;
     float: left;
   }
+  .iframeWrap .conditionHintTips .mayIllness:hover  span{
+    color: #267FD7;
+  } 
   .iframeWrap .conditionHintTips .mayIllness span {
     position: relative;
     border-bottom: 1px solid #D1D1D1;
@@ -239,16 +243,16 @@
     background: url("../images/tips.png") center center no-repeat;
   }
   .iframeWrap .illnessTable {
-    color: #267FD7;
+    color: #040428;
     line-height: 20px;
     cursor: pointer;
   }
   .iframeWrap .illnessTable::before {
-    color: #267FD7;
+    color: #040428;
     content: "【"
   }
   .iframeWrap .illnessTable::after {
-    color: #267FD7;
+    color: #040428;
     content: "】"
   }
   .iframeWrap h4 {
@@ -279,7 +283,6 @@
   .conditionHintAssistLis {
     /* position: relative; */
     background: #fff;
-    /* position: absolute; */
   }
   .conditionHintInspectNull {
     border-bottom: 1px solid #D1D1D1;
@@ -371,9 +374,8 @@
     width: 20px;
     height: 20px;
     position: absolute;
-    top: -15px;
-    left: 50%;
-    margin-left: -10px;
+    top: 0;
+    right: 2px;
     display: none;
     background: url('../images/msg1.png') center center no-repeat;
     cursor: pointer;
@@ -394,25 +396,12 @@
     position: relative;
     top: 2px;
   }
+  .infoMsgParent:hover {
+    color: #267FD7;
+  }
   .infoMsgParent:hover .infoMsg {
     display: block;
   }
-  /* .conditionHintRecomDiagLis {
-    background: #fff;
-    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;
@@ -461,4 +450,16 @@
     top: 1px;
     display: block;
     float: left;
+    margin-right: 8px;
+  }
+  .treatPlan .titleIcon{
+    right: -11px;
+  }
+  .pushBox {
+    padding-right: 40px;
+    background: #fff
+  }
+  .pushBoxBorder {
+    border: 1px solid #3A73E1;
+    border-radius: 4px;
   }

+ 20 - 11
src/html/landscape.html

@@ -21,32 +21,41 @@
         </div>
         <ul class="push">
             <li class="conditionHintPub conditionHintRecomDiag">
-              <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/yszd.png">推荐诊断</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">
-                </ul>
+                <div class="pushBox">
+                  <ul class="clearfix conditionHintRecomDiagLis">
+                  </ul>
+                </div>
+                
               </div>
             </li>
           <li class="conditionHintPub conditionHintWz">
-            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/inquire.png">问诊症状</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">
-              </ul>
+              <div class="pushBox">
+                <ul class="clearfix conditionHintWzLis">
+                </ul>
+              </div>
+              
             </div>
           </li>
           <li class="conditionHintPub conditionHintTg">
-            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/tgjc.png">体格检查</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">
+                <div class="pushBox">
+                  <ul class="clearfix conditionHintTgLis">
                   
-                </ul>
+                  </ul>
+                </div>
+                
             </div>
           </li>
           <li class="conditionHintPub conditionHintTips">
-            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/tips.png">病情提示</h4>
+            <h4 href="javascript:void(0);"><img class="titleIcon" src="./../images/tips.png">病情提示:</h4>
             <div class="conditionMain conditionHintTipsNull">
               <span class="pushEmpty">暂无推荐</span>
             </div>
@@ -55,7 +64,7 @@
         </ul>
         <ul class="treat">
             <li class="conditionHintPub conditionHintZhiliao">
-                <h4 href="javascript:void(0);"><p class="treatPlan"><i></i>治疗方案</p><span class="diseaseName"></span></h4>
+                <h4 href="javascript:void(0);"><p class="treatPlan"><img class="titleIcon" src="./../images/zhiliao.png">治疗方案:</p><span class="diseaseName"></span></h4>
                 <div class="conditionMain conditionHintZhiliaoAp">
                   <p class="conditionHintZhiliaoNull pushEmpty">暂无推荐</p>
                   <div class="treatMedicine">

+ 12 - 1
src/js/landscapeDom.js

@@ -127,13 +127,24 @@ function slideToggle(domName){//展开收起
     domName.append('<span class="slideDown"><i></i></span>')
   }
   domName.on('click',".slideDown",function(){   //展开
-    $(this).parent().parent().parent().addClass("topZIndex")
+    $(".conditionHintPub").css({"zIndex": "1"});
+    $(".push .conditionHintPub").find(".conditionMain").css({"height": "20px", "overflow": "hidden"});
+    $('.pushBox').find('ul').css({"height": "20px", "overflow": "hidden"});
     $(".slideUp").removeClass("slideUp").addClass("slideDown")
     domName.append('<span class="slideUp"><i></i></span>')
+    domName.parent().parent().css({"height": "56px"});
+    domName.parent().parent().parent().css({"zIndex": "2"});
+    $(this).parent().css({"height": "56px", "overflow": "auto"})
+    $(".pushBoxBorder").removeClass("pushBoxBorder")
+    $(this).parent().parent().parent().addClass("pushBoxBorder")
     $(this).remove()
   })
   
   domName.on('click',".slideUp",function(){ //收起
+    $(".pushBoxBorder").removeClass("pushBoxBorder")
+    $(this).parent().css({"height": "20px", "overflow": "hidden"})
+    domName.parent().parent().css({"height": "20px", "overflow": "hidden"});
+    domName.parent().parent().parent().css({"zIndex": "1"});
     domName.append('<span class="slideDown"><i></i></span>')
     $(this).remove()
   })